Get rid of FL/FL symlink.

FL/FL

@@ -1 +0,0 @@
-.

mixer/src/Mixer.C

@@ -28,15 +28,15 @@
 #include <FL/Fl_Menu_Bar.H>
 #include <FL/fl_ask.H>
 #include <FL/Fl.H>
-#include <New_Project_Dialog.H>
+#include <FL/New_Project_Dialog.H>
 #include "Engine/Engine.H"
-#include <Fl_Flowpack.H>
+#include <FL/Fl_Flowpack.H>
 #include "Project.H"
-#include <Fl_Menu_Settings.H>
-#include <About_Dialog.H>
+#include <FL/Fl_Menu_Settings.H>
+#include <FL/About_Dialog.H>
 #include <FL/Fl_File_Chooser.H>
 #include <FL/Fl_Theme_Chooser.H>
-#include <Fl_Value_SliderX.H>
+#include <FL/Fl_Value_SliderX.H>
 
 #include "file.h"
 

mixer/wscript

@@ -64,7 +64,7 @@ src/Project.C
 src/main.C
 ''',
               target       = 'non-mixer',
-              includes     = ['.', 'src', '../FL', '../nonlib'],
+              includes     = ['.', 'src', '..', '../nonlib'],
               use = ['nonlib', 'fl_widgets'],
               uselib = [ 'JACK', 'LIBLO', 'LRDF', 'XPM', 'NTK', 'NTK_IMAGES', 'PTHREAD', 'DL', 'M' ],
               install_path = '${BINDIR}')

session-manager/wscript

@@ -42,7 +42,7 @@ def build(bld):
 src/session-manager.C
 ''',
               target       = 'non-session-manager',
-              includes     = ['.', 'src', '../nonlib', '../FL' ],
+              includes     = ['.', 'src', '../nonlib', '..' ],
               uselib = [  'LIBLO', 'XPM', 'NTK', 'NTK_IMAGES' ],
               use = [ 'fl_widgets', 'nonlib'],
               install_path = '${BINDIR}')
@@ -60,7 +60,7 @@ src/nsmd.C
 src/nsm-proxy.C
 ''',
               target       = 'nsm-proxy',
-              includes     = ['.', 'src', '../nonlib', '../FL' ],
+              includes     = ['.', 'src', '../nonlib', '..' ],
               uselib = [ 'LIBLO' ],
               use = [ 'nonlib'],
               install_path = '${BINDIR}')

timeline/src/Annotation_Region.C

@@ -88,8 +88,8 @@ Annotation_Region::draw ( void )
     draw_label( _label, (Fl_Align)(FL_ALIGN_LEFT | FL_ALIGN_INSIDE | FL_ALIGN_TOP | FL_ALIGN_CLIP ) );
 }
 
-#include <Fl_Text_Edit_Window.H>
-#include <test_press.H>
+#include <FL/Fl_Text_Edit_Window.H>
+#include <FL/test_press.H>
 
 int
 Annotation_Region::handle ( int m )

timeline/src/Cursor_Region.C

@@ -118,8 +118,8 @@ Cursor_Region::draw ( void )
     draw_label( _label, (Fl_Align)(FL_ALIGN_LEFT | FL_ALIGN_INSIDE | FL_ALIGN_TOP | FL_ALIGN_CLIP ) );
 }
 
-#include <Fl_Text_Edit_Window.H>
-#include <test_press.H>
+#include <FL/Fl_Text_Edit_Window.H>
+#include <FL/test_press.H>
 
 int
 Cursor_Region::handle ( int m )

timeline/src/TLE.fl

@@ -31,7 +31,7 @@ decl {class Fl_Flowpack;} {public global
 decl {\#include <FL/Fl_Overlay_Window.H>} {private local
 } 
 
-decl {\#include <Fl_Menu_Settings.H>} {private local
+decl {\#include <FL/Fl_Menu_Settings.H>} {private local
 } 
 
 decl {\#include "Timeline.H"} {private local
@@ -49,10 +49,10 @@ decl {\#include "Project.H"} {private local
 decl {\#include "Clock.H"} {public local
 } 
 
-decl {\#include <Fl_Flowpack.H>} {private local
+decl {\#include <FL/Fl_Flowpack.H>} {private local
 } 
 
-decl {\#include <New_Project_Dialog.H>} {private local
+decl {\#include <FL/New_Project_Dialog.H>} {private local
 } 
 
 decl {\#include "Track.H" // for capture_format} {private local
@@ -85,7 +85,7 @@ decl {\#include "Engine/Engine.H"} {private local
 decl {\#include "Engine/Audio_File.H" // for supported formats} {private local
 } 
 
-decl {\#include <About_Dialog.H>} {private local
+decl {\#include <FL/About_Dialog.H>} {private local
 } 
 
 decl {extern char project_display_name[256];} {private global

timeline/wscript

@@ -90,7 +90,7 @@ src/Waveform.C
 src/main.C
 ''',
               target       = 'non-timeline',
-              includes     = ['.', 'src', '../FL', '../nonlib'],
+              includes     = ['.', 'src', '..', '../nonlib'],
               uselib = [ 'JACK', 'LIBLO', 'SNDFILE', 'XPM', 'NTK', 'NTK_IMAGES', 'PTHREAD'],
               use = [ 'fl_widgets', 'nonlib'],
               install_path = '${BINDIR}')