Fix build problems in test directory - no more recursive dependencies for

demos that are partially built using FLUID.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1900 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

8 files changed, 78 insertions, 50 deletions

diff --git a/CHANGES b/CHANGES
index 6b0b1b53b..fa87c9bd3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 CHANGES IN FLTK 1.1.0b9
 
+	- Fixed the make problems in the test directory - some
+	  make programs had trouble handling the recursive
+	  dependencies on the FLUID files...
 	- Now use rint() to round floating-point coordinates.
 	- Demo cleanup - made sure they all worked with schemes.
 	- Fl_Tabs no longer clears the unused area of the tab
diff --git a/test/Makefile b/test/Makefile
index 9d52d8ec0..da3fe639a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.19.2.7.2.23 2001/12/23 03:40:51 easysw Exp $"
+# "$Id: Makefile,v 1.19.2.7.2.24 2001/12/30 05:16:10 easysw Exp $"
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -176,17 +176,15 @@ help$(EXEEXT): help.o
 	echo Linking $@...
 	$(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
 	$(POSTBUILD) $@ ../FL/mac.r
-keyboard$(EXEEXT): keyboard.o
+keyboard$(EXEEXT): keyboard_ui.o keyboard.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) keyboard.o $(LINKFLTK) $(LDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS) -o $@
 	$(POSTBUILD) $@ ../FL/mac.r
-keyboard.o: keyboard.cxx keyboard_ui.cxx
 
-mandelbrot$(EXEEXT): mandelbrot.o
+mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) mandelbrot.o $(LINKFLTK) $(LDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS) -o $@
 	$(POSTBUILD) $@ ../FL/mac.r
-mandlebrot.o: mandelbrot.cxx mandelbrot_ui.cxx
 
 pixmap_browser$(EXEEXT): pixmap_browser.o
 	echo Linking $@...
@@ -222,11 +220,10 @@ gl_overlay$(EXEEXT): gl_overlay.o
 	echo Linking $@...
 	$(CXX) -I.. $(CXXFLAGS) gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 	$(POSTBUILD) $@ ../FL/mac.r
-shiny$(EXEEXT): shiny.o
+shiny$(EXEEXT): shiny_panel.o shiny.o
 	echo Linking $@...
-	$(CXX) -I.. $(CXXFLAGS) shiny.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) shiny.o shiny_panel.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 	$(POSTBUILD) $@ ../FL/mac.r
-shiny.o:	shiny.cxx shiny_panel.cxx
 
 shape$(EXEEXT): shape.o
 	echo Linking $@...
@@ -253,5 +250,5 @@ uninstall:
 	@echo Nothing to uninstall in test directory.
 
 #
-# End of "$Id: Makefile,v 1.19.2.7.2.23 2001/12/23 03:40:51 easysw Exp $".
+# End of "$Id: Makefile,v 1.19.2.7.2.24 2001/12/30 05:16:10 easysw Exp $".
 #
diff --git a/test/keyboard.cxx b/test/keyboard.cxx
index 3a4eb9b7e..1f4cdb3a7 100644
--- a/test/keyboard.cxx
+++ b/test/keyboard.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: keyboard.cxx,v 1.5.2.3.2.3 2001/12/22 07:16:12 matthiaswm Exp $"
+// "$Id: keyboard.cxx,v 1.5.2.3.2.4 2001/12/30 05:16:10 easysw Exp $"
 //
 // Keyboard/event test program for the Fast Light Tool Kit (FLTK).
 //
@@ -38,18 +38,7 @@
 //
 
 
-#include <stdio.h>
-#include <FL/Fl.H>
-#include <FL/Fl_Window.H>
-
-class MyWindow : public Fl_Window {
-  int handle(int);
-public:
-  MyWindow(int w, int h, const char *t=0L) 
-    : Fl_Window( w, h, t ) { }
-};
-
-#include "keyboard_ui.cxx"
+#include "keyboard_ui.h"
 
 // these are used to identify which buttons are which:
 void key_cb(Fl_Button*, void*) {}
@@ -150,5 +139,5 @@ int main(int argc, char** argv) {
 }
 
 //
-// End of "$Id: keyboard.cxx,v 1.5.2.3.2.3 2001/12/22 07:16:12 matthiaswm Exp $".
+// End of "$Id: keyboard.cxx,v 1.5.2.3.2.4 2001/12/30 05:16:10 easysw Exp $".
 //
diff --git a/test/keyboard.h b/test/keyboard.h
new file mode 100644
index 000000000..7281672e2
--- /dev/null
+++ b/test/keyboard.h
@@ -0,0 +1,44 @@
+//
+// "$Id: keyboard.h,v 1.1.2.1 2001/12/30 05:16:10 easysw Exp $"
+//
+// Keyboard/event test header for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2001 by Bill Spitzak and others.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems to "fltk-bugs@fltk.org".
+//
+
+#ifndef keyboard_h
+#  define keyboard_h
+#  include <stdio.h>
+#  include <FL/Fl.H>
+#  include <FL/Fl_Window.H>
+
+class MyWindow : public Fl_Window {
+  int handle(int);
+public:
+  MyWindow(int w, int h, const char *t=0L) 
+    : Fl_Window( w, h, t ) { }
+};
+
+#endif // !keyboard_h
+
+
+//
+// End of "$Id: keyboard.h,v 1.1.2.1 2001/12/30 05:16:10 easysw Exp $".
+//
diff --git a/test/keyboard_ui.fl b/test/keyboard_ui.fl
index 207e33bb3..00ba46fd0 100644
--- a/test/keyboard_ui.fl
+++ b/test/keyboard_ui.fl
@@ -7,8 +7,9 @@ gridy 5
 snap 3
 Function {make_window()} {open
 } {
-  Fl_Window my_window {open
+  Fl_Window my_window {selected
     xywh {461 296 494 203}
+    code0 {\#include "keyboard.h"}
     class MyWindow visible
   } {
     Fl_Button {} {
@@ -709,12 +710,12 @@ Function {make_window()} {open
     }
     Fl_Dial roller_x {
       label {x:}
-      callback wheel_cb selected
+      callback wheel_cb
       xywh {440 60 20 20} box ROUND_UP_BOX selection_color 49 labelsize 9 align 5 step 0.1
     }
     Fl_Dial roller_y {
       label {y:}
-      callback wheel_cb selected
+      callback wheel_cb
       xywh {460 60 20 20} box ROUND_UP_BOX selection_color 49 labelsize 9 align 5 step 0.1
     }
   }
diff --git a/test/makedepend b/test/makedepend
index 249337c78..3dc7c926e 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -197,11 +197,9 @@ input.o: ../FL/Fl_Multiline_Input.H ../FL/Fl_Button.H
 input.o: ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H ../FL/Fl_Color_Chooser.H
 input.o: ../FL/Fl_Group.H ../FL/Fl_Box.H ../FL/Fl_Return_Button.H
 input.o: ../FL/Fl_Choice.H ../FL/Fl_Value_Input.H ../FL/Fl_Valuator.H
-keyboard.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-keyboard.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-keyboard.o: keyboard_ui.cxx keyboard_ui.h ../FL/Fl_Button.H ../FL/Fl_Output.H
-keyboard.o: ../FL/Fl_Input_.H ../FL/Fl_Box.H ../FL/Fl_Roller.H
-keyboard.o: ../FL/Fl_Valuator.H
+keyboard.o: keyboard_ui.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
+keyboard.o: ../FL/Fl_Button.H ../FL/Fl_Output.H ../FL/Fl_Input_.H
+keyboard.o: ../FL/Fl_Box.H ../FL/Fl_Dial.H ../FL/Fl_Valuator.H
 label.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 label.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 label.o: ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Hor_Value_Slider.H
@@ -213,11 +211,7 @@ line_style.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 line_style.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
 line_style.o: ../FL/fl_draw.H ../FL/Fl_Choice.H
 list_visuals.o: ../config.h
-mandelbrot.o: mandelbrot_ui.cxx mandelbrot_ui.h ../FL/Fl.H
-mandelbrot.o: ../FL/Enumerations.H ../FL/Fl_Export.H mandelbrot.h
-mandelbrot.o: ../FL/Fl_Box.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-mandelbrot.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
-mandelbrot.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_draw.H
+mandelbrot.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H
 menubar.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Box.H
 menubar.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 menubar.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Item.H
@@ -287,12 +281,12 @@ shape.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 shape.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 shape.o: ../FL/Fl_Hor_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
 shape.o: ../FL/math.h ../FL/gl.h ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H
-shiny.o: ../config.h shiny_panel.cxx shiny_panel.h ../FL/Fl.H
-shiny.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
-shiny.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Group.H
-shiny.o: ../FL/Fl_Button.H ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H
-shiny.o: ../FL/Fl_Valuator.H ../FL/Fl_Slider.H ../FL/fl_message.H
-shiny.o: ../FL/fl_ask.H ../FL/fl_draw.H ../FL/gl.h
+shiny.o: ../config.h shiny_panel.h ../FL/Fl.H ../FL/Enumerations.H
+shiny.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H
+shiny.o: ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/Fl_Group.H ../FL/Fl_Button.H
+shiny.o: ../FL/Fl_Value_Slider.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
+shiny.o: ../FL/Fl_Slider.H ../FL/fl_message.H ../FL/fl_ask.H ../FL/fl_draw.H
+shiny.o: ../FL/gl.h
 subwindow.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 subwindow.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 subwindow.o: ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H
diff --git a/test/mandelbrot.cxx b/test/mandelbrot.cxx
index 67c866818..eea40845b 100644
--- a/test/mandelbrot.cxx
+++ b/test/mandelbrot.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: mandelbrot.cxx,v 1.8.2.4 2001/04/13 19:07:40 easysw Exp $"
+// "$Id: mandelbrot.cxx,v 1.8.2.4.2.1 2001/12/30 05:16:10 easysw Exp $"
 //
 // Mandelbrot set demo for the Fast Light Tool Kit (FLTK).
 //
@@ -23,7 +23,7 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //
 
-#include "mandelbrot_ui.cxx"
+#include "mandelbrot_ui.h"
 #include <FL/fl_draw.H>
 #include <stdio.h>
 #include <stdlib.h>
@@ -197,5 +197,5 @@ void Drawing_Area::resize(int XX,int YY,int WW,int HH) {
 }
 
 //
-// End of "$Id: mandelbrot.cxx,v 1.8.2.4 2001/04/13 19:07:40 easysw Exp $".
+// End of "$Id: mandelbrot.cxx,v 1.8.2.4.2.1 2001/12/30 05:16:10 easysw Exp $".
 //
diff --git a/test/shiny.cxx b/test/shiny.cxx
index ecc392053..fb4cb7218 100644
--- a/test/shiny.cxx
+++ b/test/shiny.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: shiny.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: shiny.cxx,v 1.5.2.3.2.1 2001/12/30 05:16:10 easysw Exp $"
 //
 // OpenGL "shiny buttons" test program for the Fast Light Tool Kit (FLTK).
 //
@@ -24,7 +24,7 @@
 //
 
 #include <config.h>
-#include "shiny_panel.cxx"
+#include "shiny_panel.h"
 #include <FL/fl_message.H>
 #include <stdio.h>
 
@@ -303,5 +303,5 @@ int main(int argc, char **argv) {
 }
 
 //
-// End of "$Id: shiny.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: shiny.cxx,v 1.5.2.3.2.1 2001/12/30 05:16:10 easysw Exp $".
 //