Added top-level makefiles for Cygnus and MingW32 builds to avoid

confusion.

Updated compiler options to include FL_STATIC when building libraries.
Eventually we need to support a DLL build option...


git-svn-id: file:///fltk/svn/fltk/trunk@290 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 164 insertions, 8 deletions

diff --git a/makefiles/Makefile.cygnus b/makefiles/Makefile.cygnus
new file mode 100644
index 000000000..73ad81497
--- /dev/null
+++ b/makefiles/Makefile.cygnus
@@ -0,0 +1,78 @@
+#
+# "$Id: Makefile.cygnus,v 1.1 1999/02/18 14:05:30 mike Exp $"
+#
+# Top-level makefile for the Fast Light Tool Kit (FLTK).
+#
+# Copyright 1998-1999 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@easysw.com".
+#
+
+SHELL=cmd.exe
+
+all: makeinclude config.h
+	echo "=== making src ==="
+	touch src/makedepend
+	cd src & $(MAKE)
+	echo "=== making fluid ==="
+	touch fluid/makedepend
+	cd fluid & $(MAKE)
+	echo "=== making test ==="
+	touch test/makedepend
+	cd test & $(MAKE)
+
+install:
+	echo "=== installing src ==="
+	touch src/makedepend
+	cd src & $(MAKE) install
+	echo "=== installing fluid ==="
+	touch fluid/makedepend
+	cd fluid & $(MAKE) install
+
+depend:
+	echo "=== making src dependencies ==="
+	touch src/makedepend
+	cd src & $(MAKE) depend
+	echo "=== making fluid dependencies ==="
+	touch fluid/makedepend
+	cd fluid & $(MAKE) depend
+	echo "=== making test dependencies ==="
+	touch test/makedepend
+	cd test & $(MAKE) depend
+
+clean:
+	-@ rm -f core config.cache *.o *.bck
+	echo "=== cleaning src ==="
+	touch src/makedepend
+	cd src & $(MAKE) clean
+	echo "=== cleaning fluid ==="
+	touch fluid/makedepend
+	cd fluid & $(MAKE) clean
+	echo "=== cleaning test ==="
+	touch test/makedepend
+	cd test & $(MAKE) clean
+
+config.h: makefiles\config.cygnus
+	copy $< $@
+
+makeinclude: makefiles\makeinclude.cygnus
+	copy $< $@
+
+#
+# End of "$Id: Makefile.cygnus,v 1.1 1999/02/18 14:05:30 mike Exp $".
+#
diff --git a/makefiles/Makefile.mingw32 b/makefiles/Makefile.mingw32
new file mode 100644
index 000000000..3bf8fc998
--- /dev/null
+++ b/makefiles/Makefile.mingw32
@@ -0,0 +1,78 @@
+#
+# "$Id: Makefile.mingw32,v 1.1 1999/02/18 14:05:30 mike Exp $"
+#
+# Top-level makefile for the Fast Light Tool Kit (FLTK).
+#
+# Copyright 1998-1999 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@easysw.com".
+#
+
+SHELL=cmd.exe
+
+all: makeinclude config.h
+	echo "=== making src ==="
+	touch src/makedepend
+	cd src & $(MAKE)
+	echo "=== making fluid ==="
+	touch fluid/makedepend
+	cd fluid & $(MAKE)
+	echo "=== making test ==="
+	touch test/makedepend
+	cd test & $(MAKE)
+
+install:
+	echo "=== installing src ==="
+	touch src/makedepend
+	cd src & $(MAKE) install
+	echo "=== installing fluid ==="
+	touch fluid/makedepend
+	cd fluid & $(MAKE) install
+
+depend:
+	echo "=== making src dependencies ==="
+	touch src/makedepend
+	cd src & $(MAKE) depend
+	echo "=== making fluid dependencies ==="
+	touch fluid/makedepend
+	cd fluid & $(MAKE) depend
+	echo "=== making test dependencies ==="
+	touch test/makedepend
+	cd test & $(MAKE) depend
+
+clean:
+	-@ rm -f core config.cache *.o *.bck
+	echo "=== cleaning src ==="
+	touch src/makedepend
+	cd src & $(MAKE) clean
+	echo "=== cleaning fluid ==="
+	touch fluid/makedepend
+	cd fluid & $(MAKE) clean
+	echo "=== cleaning test ==="
+	touch test/makedepend
+	cd test & $(MAKE) clean
+
+config.h: makefiles\config.mingw32
+	copy $< $@
+
+makeinclude: makefiles\makeinclude.mingw32
+	copy $< $@
+
+#
+# End of "$Id: Makefile.mingw32,v 1.1 1999/02/18 14:05:30 mike Exp $".
+#
diff --git a/makefiles/makeinclude.cygnus b/makefiles/makeinclude.cygnus
index 053115ced..66ea0057f 100644
--- a/makefiles/makeinclude.cygnus
+++ b/makefiles/makeinclude.cygnus
@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.cygnus,v 1.6 1999/02/16 14:28:01 mike Exp $"
+# "$Id: makeinclude.cygnus,v 1.7 1999/02/18 14:05:31 mike Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 #
@@ -35,8 +35,8 @@ CXX		= g++
 CC		= gcc
 
 # flags for C++ compiler:
-CFLAGS		= -Wall -O2 -DCYGNUS -DWIN32 -mno-cygwin -mwindows
-CXXFLAGS	= -Wall -O2 -DCYGNUS -DWIN32 -mno-cygwin -mwindows
+CFLAGS		= -Wall -O2 -DCYGNUS -DWIN32 -mno-cygwin -mwindows -DFL_STATIC
+CXXFLAGS	= -Wall -O2 -DCYGNUS -DWIN32 -mno-cygwin -mwindows -DFL_STATIC
 
 # program to make the archive:
 LIBNAME		= libfltk.a
@@ -47,5 +47,5 @@ RANLIB		= ranlib
 LDLIBS		= -lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm
 
 #
-# End of "$Id: makeinclude.cygnus,v 1.6 1999/02/16 14:28:01 mike Exp $".
+# End of "$Id: makeinclude.cygnus,v 1.7 1999/02/18 14:05:31 mike Exp $".
 #
diff --git a/makefiles/makeinclude.mingw32 b/makefiles/makeinclude.mingw32
index fefba91a3..820ad52c7 100644
--- a/makefiles/makeinclude.mingw32
+++ b/makefiles/makeinclude.mingw32
@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.mingw32,v 1.7 1999/02/16 14:28:01 mike Exp $"
+# "$Id: makeinclude.mingw32,v 1.8 1999/02/18 14:05:31 mike Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 #
@@ -35,8 +35,8 @@ CXX		= g++
 CC		= gcc
 
 # flags for C++ compiler:
-CFLAGS		= -Wall -O2 -DWIN32 -mwindows
-CXXFLAGS	= -Wall -O2 -DWIN32 -mwindows
+CFLAGS		= -Wall -O2 -DWIN32 -mwindows -DFL_STATIC
+CXXFLAGS	= -Wall -O2 -DWIN32 -mwindows -DFL_STATIC
 
 # program to make the archive:
 LIBNAME		= libfltk.a
@@ -47,5 +47,5 @@ RANLIB		= ranlib
 LDLIBS		= -lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm
 
 #
-# End of "$Id: makeinclude.mingw32,v 1.7 1999/02/16 14:28:01 mike Exp $".
+# End of "$Id: makeinclude.mingw32,v 1.8 1999/02/18 14:05:31 mike Exp $".
 #