summaryrefslogtreecommitdiff
path: root/test/Makefile
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2001-12-30 05:16:10 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2001-12-30 05:16:10 +0000
commit988bc9d95f1a4f5b06262fe9b4de9466ab2950f5 (patch)
tree1ab33fd5e17b5db2c53002e38a9ac4cb425edee7 /test/Makefile
parent3a904f07b7669ed7e461c3e5c2e5a8e0dc494461 (diff)
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
Diffstat (limited to 'test/Makefile')
-rw-r--r--test/Makefile19
1 files changed, 8 insertions, 11 deletions
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 $".
#