Moved .fl building rules to test/Makefile.

Added compiling rules to makefiles/makeinclude.*


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

makefiles/makeinclude.cygnus

@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.cygnus,v 1.9.2.2 2000/04/25 22:16:06 mike Exp $"
+# "$Id: makeinclude.cygnus,v 1.9.2.3 2000/06/03 12:04:10 mike Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 #
@@ -50,6 +50,24 @@ LDLIBS		= -lgdi32 -luser32 -lmsvcrt -lwsock32 -lm -mno-cygwin -mwindows
 GLDLIBS		= -lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm \
 		  -mno-cygwin -mwindows
 
+# Be quiet when building...
+.SILENT:
+
+# Build commands and filename extensions...
+.SUFFIXES:	.c .cxx .h .fl .o
+
+.cxx:
+	echo Compiling and linking $@...
+	$(CXX) -I.. $(CXXFLAGS) $< -L../lib -lfltk $(LDLIBS) -o $@
+
+.c.o:
+	echo Compiling $@...
+	$(CC) -I.. $(CXXFLAGS) $< -c
+
+.cxx.o:
+	echo Compiling $@...
+	$(CXX) -I.. $(CXXFLAGS) $< -c
+
 #
-# End of "$Id: makeinclude.cygnus,v 1.9.2.2 2000/04/25 22:16:06 mike Exp $".
+# End of "$Id: makeinclude.cygnus,v 1.9.2.3 2000/06/03 12:04:10 mike Exp $".
 #

makefiles/makeinclude.mingw32

@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.mingw32,v 1.9.2.2 2000/04/25 22:16:06 mike Exp $"
+# "$Id: makeinclude.mingw32,v 1.9.2.3 2000/06/03 12:04:11 mike Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 #
@@ -49,6 +49,24 @@ DSOCOMMAND	= echo
 LDLIBS		= -lgdi32 -luser32 -lmsvcrt -lwsock32 -lm
 GLDLIBS		= -lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm
 
+# Be quiet when building...
+.SILENT:
+
+# Build commands and filename extensions...
+.SUFFIXES:	.c .cxx .h .fl .o
+
+.cxx:
+	echo Compiling and linking $@...
+	$(CXX) -I.. $(CXXFLAGS) $< -L../lib -lfltk $(LDLIBS) -o $@
+
+.c.o:
+	echo Compiling $@...
+	$(CC) -I.. $(CXXFLAGS) $< -c
+
+.cxx.o:
+	echo Compiling $@...
+	$(CXX) -I.. $(CXXFLAGS) $< -c
+
 #
-# End of "$Id: makeinclude.mingw32,v 1.9.2.2 2000/04/25 22:16:06 mike Exp $".
+# End of "$Id: makeinclude.mingw32,v 1.9.2.3 2000/06/03 12:04:11 mike Exp $".
 #

makeinclude.in

@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.in,v 1.7.2.2 2000/04/25 22:15:42 mike Exp $"
+# "$Id: makeinclude.in,v 1.7.2.3 2000/06/03 12:04:08 mike Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 # @configure_input@
@@ -70,15 +70,6 @@ GLDLIBS		=@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
 	echo Compiling $@...
 	$(CXX) -I.. $(CXXFLAGS) $< -c
 
-.fl.cxx .fl.h:
-	echo Generating $<...
-	../fluid/fluid -c $<
-
-.fl:
-	echo Generating, compiling, and linking $@...
-	../fluid/fluid -c $<
-	$(CXX) -I.. $(CXXFLAGS) $@.cxx -L../lib -lfltk $(LDLIBS) -o $@
-
 #
-# End of "$Id: makeinclude.in,v 1.7.2.2 2000/04/25 22:15:42 mike Exp $".
+# End of "$Id: makeinclude.in,v 1.7.2.3 2000/06/03 12:04:08 mike Exp $".
 #

test/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.19.2.4 2000/05/13 20:03:19 bill Exp $"
+# "$Id: Makefile,v 1.19.2.5 2000/06/03 12:04:12 mike Exp $"
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -48,6 +48,17 @@ all:	$(ALL)
 
 include ../makeinclude
 
+# FLUID file rules
+.fl.cxx .fl.h:
+	echo Generating $<...
+	../fluid/fluid -c $<
+
+.fl:
+	echo Generating, compiling, and linking $@...
+	../fluid/fluid -c $<
+	$(CXX) -I.. $(CXXFLAGS) $@.cxx -L../lib -lfltk $(LDLIBS) -o $@
+
+
 $(ALL):  ../lib/$(LIBNAME)
 
 # Other programs needing special "help"...
@@ -102,5 +113,5 @@ install:
 	@echo Nothing to install in test directory.
 
 #
-# End of "$Id: Makefile,v 1.19.2.4 2000/05/13 20:03:19 bill Exp $".
+# End of "$Id: Makefile,v 1.19.2.5 2000/06/03 12:04:12 mike Exp $".
 #