Updated Cygwin/Mingw makefiles and documentation (STR #1683)

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

1 files changed, 89 insertions, 85 deletions

diff --git a/makefiles/Makefile.mingw b/makefiles/Makefile.mingw
index f1c043d4a..24b9a297b 100644
--- a/makefiles/Makefile.mingw
+++ b/makefiles/Makefile.mingw
@@ -3,7 +3,7 @@
 #
 # Top-level makefile for the Fast Light Tool Kit (FLTK).
 #
-# Copyright 1998-2001 by Bill Spitzak and others.
+# Copyright 1998-2006 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
@@ -20,95 +20,99 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 #
-# Please report all bugs and problems to "fltk-bugs@fltk.org".
+# Please report all bugs and problems on the following page:
 #
-
-# By default use a Un*x-style shell
-#
-# uncomment next line to use NT command shell 
-# SHELL=cmd.exe
-#
-# or uncomment next line to explicitly use a unix-compatible shell
-# SHELL=sh.exe
-#
-# If we are using a Un*x-based make, make sure the environmental var is set
-# set MAKE_MODE=unix
-#
-# By default, a Un*x style make is assumed, so towards the bottom of this
-# file filenames are copied with 'cp' and use forward slashes throughout
-# in filepaths.
+#      http://www.fltk.org/str.php
 #
-# Changing to a Windows-based command line would require 'cp' replaced with
-# a local equivalent ('copy' is OK) and potentially for forward-slashes in
-# filepaths to be replaced by back-slashes.
-
-
-all: makeinclude config.h
-	echo "=== making zlib ==="
-	touch zlib/makedepend
-	cd zlib ; $(MAKE)
-	echo "=== making jpeg ==="
-	touch jpeg/makedepend
-	cd jpeg ; $(MAKE)
-	echo "=== making png ==="
-	touch png/makedepend
-	cd png ; $(MAKE)
-	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 zlib ==="
-	touch zlib/makedepend
-	cd zlib ; $(MAKE) install
-	echo "=== installing jpeg ==="
-	touch jpeg/makedepend
-	cd jpeg ; $(MAKE) install
-	echo "=== installing png ==="
-	touch png/makedepend
-	cd png ; $(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
+
+include makeinclude
+
+DIRS	=	$(IMAGEDIRS) src fluid test documentation
+
+all: makeinclude
+	for dir in $(DIRS); do\
+		echo "=== making $$dir ===";\
+		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
+	done
+
+install: makeinclude
+	-mkdir -p $(DESTDIR)$(bindir)
+	$(RM) $(DESTDIR)$(bindir)/fltk-config
+	$(INSTALL_SCRIPT) fltk-config $(DESTDIR)$(bindir)
+	for dir in FL $(DIRS); do\
+		echo "=== installing $$dir ===";\
+		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
+	done
+
+install-desktop: makeinclude
+	cd documentation; $(MAKE) $(MFLAGS) $(INSTALL_DESKTOP)
+	cd fluid; $(MAKE) $(MFLAGS) $(INSTALL_DESKTOP)
+	cd test; $(MAKE) $(MFLAGS) $(INSTALL_DESKTOP)
+
+uninstall: makeinclude
+	$(RM) $(DESTDIR)$(bindir)/fltk-config
+	for dir in FL $(DIRS); do\
+		echo "=== uninstalling $$dir ===";\
+		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\
+	done
+
+uninstall-desktop: makeinclude
+	cd documentation; $(MAKE) $(MFLAGS) $(UNINSTALL_DESKTOP)
+	cd fluid; $(MAKE) $(MFLAGS) $(UNINSTALL_DESKTOP)
+	cd test; $(MAKE) $(MFLAGS) $(UNINSTALL_DESKTOP)
+
+depend: makeinclude
+	for dir in $(DIRS); do\
+		echo "=== making dependencies in $$dir ===";\
+		(cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\
+	done
 
 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.mingw
-	cp $< $@
-
-makeinclude: makefiles/makeinclude.mingw
-	cp $< $@
+	-$(RM) core *.o
+	for dir in $(DIRS); do\
+		echo "=== cleaning $$dir ===";\
+		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
+	done
+
+distclean: clean
+	$(RM) config.*
+	$(RM) fltk-config fltk.list makeinclude
+	$(RM) fltk.spec
+	$(RM) FL/Makefile
+	$(RM) documentation/*.$(CAT1EXT)
+	$(RM) documentation/*.$(CAT3EXT)
+	$(RM) documentation/*.$(CAT6EXT)
+	$(RM) documentation/fltk.pdf
+	$(RM) documentation/fltk.ps
+	$(RM) -r documentation/fltk.d
+	for file in test/*.fl; do\
+		$(RM) test/`basename $$file .fl`.cxx; \
+		$(RM) test/`basename $$file .fl`.h; \
+	done
+
+makeinclude: configure configh.in makeinclude.in
+	if test -f config.status; then \
+		./config.status --recheck; \
+		./config.status; \
+	else \
+		./configure; \
+	fi
+	touch config.h
+	chmod +x fltk-config
+
+configure: configure.in
+	autoconf
+
+portable-dist:
+	epm -v -s fltk.xpm fltk
+
+native-dist:
+	epm -v -f native fltk
+
+etags:
+	etags FL/*.H FL/*.h src/*.cxx src/*.c src/*.h fluid/*.h fluid/*.cxx test/*.h test/*.cxx
 
 #
 # End of "$Id$".
 #
+