diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-29 21:24:49 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-29 21:24:49 +0000 |
| commit | bc925b34c3ffcc8559b26667d4a73698229d8a28 (patch) | |
| tree | 99a5c98e00a70d3cbf30a356a749bc1852c676ce | |
| parent | 02d869450d28233e9509cdc1c8034cc5e8712ef1 (diff) | |
Tweek makeinclude.in so that we build from .o files instead of .cxx -> .exe
Same for .fl -> .exe in test/Makefile.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1788 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Enumerations.H | 4 | ||||
| -rw-r--r-- | makeinclude.in | 8 | ||||
| -rw-r--r-- | test/Makefile | 12 | ||||
| -rw-r--r-- | test/fractals.cxx | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 7f82669e8..291ee1edd 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -1,5 +1,5 @@ // -// "$Id: Enumerations.H,v 1.18.2.14.2.12 2001/11/29 21:12:15 easysw Exp $" +// "$Id: Enumerations.H,v 1.18.2.14.2.13 2001/11/29 21:24:49 easysw Exp $" // // Enumerations for the Fast Light Tool Kit (FLTK). // @@ -372,5 +372,5 @@ enum Fl_Damage { #endif // -// End of "$Id: Enumerations.H,v 1.18.2.14.2.12 2001/11/29 21:12:15 easysw Exp $". +// End of "$Id: Enumerations.H,v 1.18.2.14.2.13 2001/11/29 21:24:49 easysw Exp $". // diff --git a/makeinclude.in b/makeinclude.in index 1fb3d526c..59ba9db88 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -1,5 +1,5 @@ # -# "$Id: makeinclude.in,v 1.7.2.11.2.8 2001/11/20 20:10:59 easysw Exp $" +# "$Id: makeinclude.in,v 1.7.2.11.2.9 2001/11/29 21:24:49 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). # @configure_input@ @@ -80,8 +80,8 @@ CAT3EXT =@CAT3EXT@ # Build commands and filename extensions... .SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT) -.cxx$(EXEEXT): - echo Compiling and linking $@... +.o$(EXEEXT): + echo Linking $@... $(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ .c.o: @@ -105,5 +105,5 @@ CAT3EXT =@CAT3EXT@ mv t.z $@ # -# End of "$Id: makeinclude.in,v 1.7.2.11.2.8 2001/11/20 20:10:59 easysw Exp $". +# End of "$Id: makeinclude.in,v 1.7.2.11.2.9 2001/11/29 21:24:49 easysw Exp $". # diff --git a/test/Makefile b/test/Makefile index 84b4b554f..2d59fc5e6 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.19.2.7.2.12 2001/11/24 18:07:57 easysw Exp $" +# "$Id: Makefile,v 1.19.2.7.2.13 2001/11/29 21:24:49 easysw Exp $" # # Test/example program makefile for the Fast Light Tool Kit (FLTK). # @@ -158,10 +158,10 @@ gldemos: $(GLALL) echo Generating $<... ../fluid/fluid -c $< -.fl$(EXEEXT): - echo Generating, compiling, and linking $@... - ../fluid/fluid -c $< - $(CXX) -I.. $(CXXFLAGS) $@.cxx $(LINKFLTK) $(LDLIBS) -o $@ +#.fl$(EXEEXT): +# echo Generating, compiling, and linking $@... +# ../fluid/fluid -c $< +# $(CXX) -I.. $(CXXFLAGS) $@.cxx $(LINKFLTK) $(LDLIBS) -o $@ $(ALL): ../lib/$(LIBNAME) @@ -236,5 +236,5 @@ uninstall: @echo Nothing to uninstall in test directory. # -# End of "$Id: Makefile,v 1.19.2.7.2.12 2001/11/24 18:07:57 easysw Exp $". +# End of "$Id: Makefile,v 1.19.2.7.2.13 2001/11/29 21:24:49 easysw Exp $". # diff --git a/test/fractals.cxx b/test/fractals.cxx index bbe87ea34..a351eb1e5 100644 --- a/test/fractals.cxx +++ b/test/fractals.cxx @@ -1,5 +1,5 @@ // -// "$Id: fractals.cxx,v 1.5.2.6 2001/04/30 17:17:01 easysw Exp $" +// "$Id: fractals.cxx,v 1.5.2.6.2.1 2001/11/29 21:24:49 easysw Exp $" // // Fractal drawing demo for the Fast Light Tool Kit (FLTK). // @@ -32,7 +32,7 @@ #include <FL/Fl.H> #include <FL/fl_message.H> int main(int, char**) { - fl_alert("This demo does not work without GL and GLU"); + fl_alert("This demo does not work without GL and GLU (%d)"); return 1; } #else @@ -806,5 +806,5 @@ int main(int argc, char** argv) #endif // -// End of "$Id: fractals.cxx,v 1.5.2.6 2001/04/30 17:17:01 easysw Exp $". +// End of "$Id: fractals.cxx,v 1.5.2.6.2.1 2001/11/29 21:24:49 easysw Exp $". // |