Move header installs to new FL/Makefile, which is generated by

configure.

Comment out symlink stuff for Cygwin, and (hopefully) soon for OSX, too.

Add uninstall targets where needed.


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

8 files changed, 122 insertions, 33 deletions

diff --git a/CHANGES b/CHANGES
index 56ff98a28..f65894124 100644
--- a/CHANGES
+++ b/CHANGES
@@ -48,6 +48,8 @@ CHANGES IN FLTK 1.1.0b6
 	- Added new fl_create_bitmask() and fl_delete_bitmask()
 	  functions that create bitmap objects for masking and
 	  bitmap drawing.
+	- Was sending FL_RELEASE events for buttons 4 and 5
+	  under X11, which are only for FL_MOUSEWHEEL.
 
 
 CHANGES IN FLTK 1.1.0b5
diff --git a/FL/Makefile.in b/FL/Makefile.in
new file mode 100644
index 000000000..b71b1c57e
--- /dev/null
+++ b/FL/Makefile.in
@@ -0,0 +1,56 @@
+#
+# "$Id: Makefile.in,v 1.1.2.1 2001/11/19 21:25:35 easysw Exp $"
+#
+# Header makefile for the Fast Light Tool Kit (FLTK).
+#
+# Copyright 1998-2001 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@fltk.org".
+#
+
+include ../makeinclude
+
+all:
+
+install:
+	echo "Installing include files..."
+	-mkdir -p $(includedir)
+	rm -rf $(includedir)/FL
+	mkdir $(includedir)/FL
+	cp ../FL/*.[hH] $(includedir)/FL
+@HLINKS@	cd $(includedir)/FL;\
+@HLINKS@	for file in *.H; do\
+@HLINKS@		rm -f "`basename $$file H`h";\
+@HLINKS@		ln -s $$file "`basename $$file H`h";\
+@HLINKS@	done
+@HLINKS@	rm -f $(includedir)/FL/fl_file_chooser.H
+@HLINKS@	ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.H
+@HLINKS@	rm -f $(includedir)/FL/fl_file_chooser.h
+@HLINKS@	ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.h
+@HLINKS@	rm -f $(includedir)/Fl
+@HLINKS@	ln -s FL $(includedir)/Fl
+
+uninstall:
+	echo "Uninstalling include files..."
+	rm -rf $(includedir)/FL
+@HLINKS@	rm -f $(includedir)/Fl
+
+
+#
+# End of "$Id: Makefile.in,v 1.1.2.1 2001/11/19 21:25:35 easysw Exp $".
+#
diff --git a/Makefile b/Makefile
index 60f0c5be4..93926588f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.12.2.6.2.6 2001/09/30 12:30:13 easysw Exp $"
+# "$Id: Makefile,v 1.12.2.6.2.7 2001/11/19 21:25:34 easysw Exp $"
 #
 # Top-level makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -35,16 +35,22 @@ all: makeinclude
 	done
 
 install: makeinclude
-	@for dir in $(DIRS); do\
+	@for dir in FL $(DIRS) documentation; do\
 		echo "=== installing $$dir ===";\
 		(cd $$dir; $(MAKE) $(MFLAGS) install) || break;\
 	done
-	(cd documentation; $(MAKE) $(MFLAGS) install)
 	-mkdir -p $(bindir)
 	rm -f $(bindir)/fltk-config
 	-cp fltk-config $(bindir)
 	-chmod +x $(bindir)/fltk-config
 
+uninstall: makeinclude
+	@for dir in FL $(DIRS) documentation; do\
+		echo "=== uninstalling $$dir ===";\
+		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\
+	done
+	rm -f $(bindir)/fltk-config
+
 depend: makeinclude
 	@for dir in $(DIRS); do\
 		echo "=== making dependencies in $$dir ===";\
@@ -73,5 +79,5 @@ configure: configure.in
 	autoconf
 
 #
-# End of "$Id: Makefile,v 1.12.2.6.2.6 2001/09/30 12:30:13 easysw Exp $".
+# End of "$Id: Makefile,v 1.12.2.6.2.7 2001/11/19 21:25:34 easysw Exp $".
 #
diff --git a/configure.in b/configure.in
index fbbb79252..f994af2c2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl -*- sh -*-
 dnl the "configure" script is made from this by running GNU "autoconf"
 dnl
-dnl "$Id: configure.in,v 1.33.2.31.2.23 2001/11/18 12:48:38 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.24 2001/11/19 21:25:35 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -209,6 +209,8 @@ dnl Restore original LIBS settings...
 LIBS="$SAVELIBS"
 
 EXEEXT=
+HLINKS=
+
 case $uname in
     CYGWIN*)
 	dnl Cygwin environment...
@@ -216,6 +218,7 @@ case $uname in
 	CFLAGS="$CFLAGS -DWIN32"
 	CXXFLAGS="$CXXFLAGS -DWIN32"
 	EXEEXT=".exe"
+	HLINKS="#"
 	if test x$enable_gl != xno; then
 	    AC_CHECK_HEADER(GL/gl.h,
 	        AC_DEFINE(HAVE_GL)
@@ -305,6 +308,7 @@ case $uname in
 esac
 
 AC_SUBST(EXEEXT)
+AC_SUBST(HLINKS)
 AC_SUBST(GLDEMOS)
 AC_SUBST(GLLIB)
 
@@ -516,10 +520,10 @@ else
 fi
 
 AC_CONFIG_HEADER(config.h:configh.in)
-AC_OUTPUT(makeinclude fltk-config)
+AC_OUTPUT(makeinclude fltk-config FL/Makefile)
 
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.23 2001/11/18 12:48:38 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.24 2001/11/19 21:25:35 easysw Exp $".
 dnl
diff --git a/documentation/Makefile b/documentation/Makefile
index 522418dae..d8ab502da 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.9.2.10.2.1 2001/10/24 17:04:30 easysw Exp $"
+# "$Id: Makefile,v 1.9.2.10.2.2 2001/11/19 21:25:35 easysw Exp $"
 #
 # Documentation makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -113,6 +113,7 @@ HTMLFILES	= \
 		glut.html \
 		forms.html \
 		osissues.html \
+		migration.html \
 		license.html
 
 MANPAGES =	fltk.$(CAT3EXT) fluid.$(CAT1EXT)
@@ -150,6 +151,15 @@ install: $(MANPAGES)
 	cp fltk.man $(mandir)/man3/fltk.3
 	chmod 644 $(mandir)/man3/fltk.3
 
+
+uninstall:
+	rm -rf $(docdir)
+	rm -f $(mandir)/cat1/fluid.$(CAT1EXT)
+	rm -f $(mandir)/man1/fluid.1
+	rm -f $(mandir)/cat3/fltk.$(CAT3EXT)
+	rm -f $(mandir)/man3/fltk.3
+
+
 # Base html files are now the readable ones, so this target is not make by
 # default...
 fltk.d/index.html: $(HTMLFILES)
@@ -168,5 +178,5 @@ fltk.pdf: $(HTMLFILES)
 	$(HTMLDOC) -f fltk.pdf --jpeg --compression=9 --duplex --verbose --toclevels 2 --titleimage FL.gif $(HTMLFILES)
 
 #
-# End of "$Id: Makefile,v 1.9.2.10.2.1 2001/10/24 17:04:30 easysw Exp $".
+# End of "$Id: Makefile,v 1.9.2.10.2.2 2001/11/19 21:25:35 easysw Exp $".
 #
diff --git a/fluid/Makefile b/fluid/Makefile
index e814f10af..08b509658 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,7 +1,7 @@
 #
-# "$Id: Makefile,v 1.10.2.6.2.4 2001/11/18 12:48:38 easysw Exp $"
+# "$Id: Makefile,v 1.10.2.6.2.5 2001/11/19 21:25:35 easysw Exp $"
 #
-# Fluid makefile for the Fast Light Tool Kit (FLTK).
+# FLUID makefile for the Fast Light Tool Kit (FLTK).
 #
 # Copyright 1998-2001 by Bill Spitzak and others.
 #
@@ -72,7 +72,7 @@ install: $(PROGRAM)
 	chmod 755 $(bindir)/$(PROGRAM)
 
 uninstall:
-	-rm -f $(bindir)/$(PROGRAM)
+	rm -f $(bindir)/$(PROGRAM)
 
 #
 # Note: The rebuild target can only be used if you have the original .fl
@@ -86,5 +86,5 @@ rebuild:
 	./fluid -c widget_panel.fl
 
 #
-# End of "$Id: Makefile,v 1.10.2.6.2.4 2001/11/18 12:48:38 easysw Exp $".
+# End of "$Id: Makefile,v 1.10.2.6.2.5 2001/11/19 21:25:35 easysw Exp $".
 #
diff --git a/src/Makefile b/src/Makefile
index 44b851c84..af00130da 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.18.2.14.2.17 2001/11/19 01:06:45 easysw Exp $"
+# "$Id: Makefile,v 1.18.2.14.2.18 2001/11/19 21:25:35 easysw Exp $"
 #
 # Library makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -253,23 +253,31 @@ install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME)
 		rm -f $(libdir)/libfltk_gl_s.a;\
 		cp libfltk_gl_s.a $(libdir); \
 	fi
-	echo "Installing include files..."
-	-mkdir -p $(includedir)
-	rm -rf $(includedir)/FL
-	mkdir $(includedir)/FL
-	cp ../FL/*.[hH] $(includedir)/FL
-	cd $(includedir)/FL;\
-	for file in *.H; do\
-		rm -f "`basename $$file H`h";\
-		ln -s $$file "`basename $$file H`h";\
-	done
-	rm -f $(includedir)/FL/fl_file_chooser.H
-	ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.H
-	rm -f $(includedir)/FL/fl_file_chooser.h
-	ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.h
-	rm -f $(includedir)/Fl
-	ln -s FL $(includedir)/Fl
+
+
+uninstall:
+	echo "Uninstalling libraries..."
+	rm -f $(libdir)/$(LIBNAME)
+	if test x$(DSONAME) = xlibfltk.so.1.1; then\
+		rm -f $(libdir)/libfltk.so*;\
+	fi
+	if test x$(DSONAME) = xlibfltk.sl.1.1; then\
+		rm -f $(libdir)/libfltk.sl*;\
+	fi
+	if test x$(DSONAME) = xlibfltk_s.a; then\
+		rm -f $(libdir)/libfltk_s.a;\
+	fi
+	if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
+		rm -f $(libdir)/libfltk_gl.so*;\
+	fi
+	if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
+		rm -f $(libdir)/libfltk_gl.sl*;\
+	fi
+	if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
+		rm -f $(libdir)/libfltk_gl_s.a;\
+	fi
+
 
 #
-# End of "$Id: Makefile,v 1.18.2.14.2.17 2001/11/19 01:06:45 easysw Exp $".
+# End of "$Id: Makefile,v 1.18.2.14.2.18 2001/11/19 21:25:35 easysw Exp $".
 #
diff --git a/test/Makefile b/test/Makefile
index 4d622fb35..e65c5bf96 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.19.2.7.2.9 2001/11/19 01:06:45 easysw Exp $"
+# "$Id: Makefile,v 1.19.2.7.2.10 2001/11/19 21:25:35 easysw Exp $"
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -185,6 +185,9 @@ clean:
 install:
 	@echo Nothing to install in test directory.
 
+uninstall:
+	@echo Nothing to uninstall in test directory.
+
 #
-# End of "$Id: Makefile,v 1.19.2.7.2.9 2001/11/19 01:06:45 easysw Exp $".
+# End of "$Id: Makefile,v 1.19.2.7.2.10 2001/11/19 21:25:35 easysw Exp $".
 #