From f29a132dfc67dc670277db2578f67c841bccc910 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Thu, 14 Mar 2013 17:32:15 -0700
Subject: [PATCH] Get rid of FL/FL symlink.

---
 FL/FL                            |  1 -
 mixer/src/Mixer.C                | 10 +++++-----
 mixer/wscript                    |  2 +-
 session-manager/wscript          |  4 ++--
 timeline/src/Annotation_Region.C |  4 ++--
 timeline/src/Cursor_Region.C     |  4 ++--
 timeline/src/TLE.fl              |  8 ++++----
 timeline/wscript                 |  2 +-
 8 files changed, 17 insertions(+), 18 deletions(-)
 delete mode 120000 FL/FL

diff --git a/FL/FL b/FL/FL
deleted file mode 120000
index 945c9b4..0000000
--- a/FL/FL
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/mixer/src/Mixer.C b/mixer/src/Mixer.C
index 450530b..cb3b9d3 100644
--- a/mixer/src/Mixer.C
+++ b/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"
 
diff --git a/mixer/wscript b/mixer/wscript
index 510ef4d..c645ec8 100644
--- a/mixer/wscript
+++ b/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}')
diff --git a/session-manager/wscript b/session-manager/wscript
index 66068ac..f0dd50a 100644
--- a/session-manager/wscript
+++ b/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}')
diff --git a/timeline/src/Annotation_Region.C b/timeline/src/Annotation_Region.C
index dc1b127..80c3e22 100644
--- a/timeline/src/Annotation_Region.C
+++ b/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 )
diff --git a/timeline/src/Cursor_Region.C b/timeline/src/Cursor_Region.C
index d5af5bc..ed7151a 100644
--- a/timeline/src/Cursor_Region.C
+++ b/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 )
diff --git a/timeline/src/TLE.fl b/timeline/src/TLE.fl
index 35dd287..dac02fd 100644
--- a/timeline/src/TLE.fl
+++ b/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
diff --git a/timeline/wscript b/timeline/wscript
index 2afc4cf..6514e32 100644
--- a/timeline/wscript
+++ b/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}')