"make clean" should not delete makedepend, since we now track this

in CVS (makedepend contains local dependencies, not <stdio.h> and
so forth)...

The configure script didn't add -fpermissive or -fno-exceptions to
the CFLAGS and CXXFLAGS variables.


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

8 files changed, 33 insertions, 28 deletions

diff --git a/CHANGES b/CHANGES
index ae39c9c5d..fae8ef60f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 CHANGES IN FLTK 1.1.0b8
 
+	- The configure script wasn't using the -fpermissive or
+	  -fno-exceptions options with GCC.
 	- Fl_JPEG_Image and friends didn't set the depth if the
 	  image file couldn't be loaded; since Fl_RGB_Image
 	  didn't check for this, it could fail when displaying
diff --git a/Makefile b/Makefile
index 93926588f..2c3e15e9d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.12.2.6.2.7 2001/11/19 21:25:34 easysw Exp $"
+# "$Id: Makefile,v 1.12.2.6.2.8 2001/12/19 19:23:30 easysw Exp $"
 #
 # Top-level makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -58,14 +58,14 @@ depend: makeinclude
 	done
 
 clean:
-	-@ rm -f core config.cache *.o *.bck
+	-@ rm -f core *.o
 	@for dir in $(DIRS); do\
 		echo "=== cleaning $$dir ===";\
 		(cd $$dir; $(MAKE) $(MFLAGS) clean) || break;\
 	done
 
 distclean: clean
-	rm -f config.log config.h config.status makeinclude
+	rm -f config.* makeinclude
 
 makeinclude: configure configh.in makeinclude.in
 	if test -f config.status; then \
@@ -79,5 +79,5 @@ configure: configure.in
 	autoconf
 
 #
-# End of "$Id: Makefile,v 1.12.2.6.2.7 2001/11/19 21:25:34 easysw Exp $".
+# End of "$Id: Makefile,v 1.12.2.6.2.8 2001/12/19 19:23:30 easysw Exp $".
 #
diff --git a/configure.in b/configure.in
index 6c258dd87..66b49fa82 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.42 2001/12/17 15:36:28 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.43 2001/12/19 19:23:30 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -526,8 +526,9 @@ if test -n "$GXX"; then
     OLDCFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -fno-exceptions"
     AC_TRY_COMPILE(,,
-	OPTIM="$OPTIM -fno-exceptions"
+	CXXFLAGS="$CXXFLAGS -fno-exceptions"
 	AC_MSG_RESULT(yes),
+	CFLAGS="$OLDCFLAGS"
 	AC_MSG_RESULT(no))
     CFLAGS="$OLDCFLAGS"
 
@@ -538,10 +539,10 @@ if test -n "$GXX"; then
 	OLDCFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fpermissive"
 	AC_TRY_COMPILE(,,
-	    OPTIM="$OPTIM -fpermissive"
+	    CXXFLAGS="$CXXFLAGS -fpermissive"
 	    AC_MSG_RESULT(yes),
+	    CFLAGS="$OLDCFLAGS"
 	    AC_MSG_RESULT(no))
-	CFLAGS="$OLDCFLAGS"
     fi
 else
     case `(uname) 2>/dev/null` in
@@ -632,5 +633,5 @@ AC_OUTPUT(makeinclude fltk.list fltk-config FL/Makefile)
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.42 2001/12/17 15:36:28 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.43 2001/12/19 19:23:30 easysw Exp $".
 dnl
diff --git a/documentation/Makefile b/documentation/Makefile
index 0f7b822e0..b420be6fb 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.9.2.10.2.5 2001/12/14 20:13:36 easysw Exp $"
+# "$Id: Makefile,v 1.9.2.10.2.6 2001/12/19 19:23:30 easysw Exp $"
 #
 # Documentation makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -148,6 +148,7 @@ alldocs:	fltk.ps fltk.pdf fltk.d/index.html $(MANPAGES)
 clean:
 	rm -f fltk.ps
 	rm -f fltk.pdf
+	rm -rf fltk.d
 
 depend:
 
@@ -202,5 +203,5 @@ fltk.pdf: $(HTMLFILES)
 	$(HTMLDOC) --verbose --batch fltk.book -f fltk.pdf
 
 #
-# End of "$Id: Makefile,v 1.9.2.10.2.5 2001/12/14 20:13:36 easysw Exp $".
+# End of "$Id: Makefile,v 1.9.2.10.2.6 2001/12/19 19:23:30 easysw Exp $".
 #
diff --git a/fluid/Makefile b/fluid/Makefile
index 174b46515..fe1b7b94e 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.10.2.6.2.7 2001/12/14 19:34:29 easysw Exp $"
+# "$Id: Makefile,v 1.10.2.6.2.8 2001/12/19 19:23:30 easysw Exp $"
 #
 # FLUID makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -47,6 +47,8 @@ CPPFILES = \
 
 OBJECTS = $(CPPFILES:.cxx=.o)
 
+CLEAN	= core
+
 include ../makeinclude
 
 $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
@@ -56,11 +58,9 @@ $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
 	$(POSTBUILD) $@ ../FL/mac.r
 
 clean :
-	-@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend
-	@touch makedepend
+	-@ rm -f *.o $(PROGRAM) $(CLEAN)
 
-depend:
-#	$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) $(CFILES) > makedepend
+depend:	$(CPPFILES)
 	makedepend -Y -I.. -f makedepend $(CPPFILES)
 
 include makedepend
@@ -87,5 +87,5 @@ rebuild:
 	./fluid -c widget_panel.fl
 
 #
-# End of "$Id: Makefile,v 1.10.2.6.2.7 2001/12/14 19:34:29 easysw Exp $".
+# End of "$Id: Makefile,v 1.10.2.6.2.8 2001/12/19 19:23:30 easysw Exp $".
 #
diff --git a/src/Makefile b/src/Makefile
index 4592154a6..77b1d8176 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.18.2.14.2.26 2001/12/10 14:46:04 easysw Exp $"
+# "$Id: Makefile,v 1.18.2.14.2.27 2001/12/19 19:23:31 easysw Exp $"
 #
 # Library makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -168,7 +168,7 @@ GLCPPFILES = \
 
 CFILES = fl_call_main.c scandir.c numericsort.c vsnprintf.c
 
-CLEAN =
+CLEAN =	core cmap
 
 ################################################################
 
@@ -216,11 +216,9 @@ libfltk_gl_s.a: $(GLOBJECTS)
 	chmod +x libfltk_gl_s.a
 
 clean :
-	-@ rm -f *.o *.do $(DSONAME) $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap
-	touch makedepend
+	-@ rm -f *.o $(DSONAME) $(LIBRARY) $(CLEAN)
 
-depend:
-#	$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) $(CFILES) > makedepend
+depend:	$(CPPFILES) $(GLCPPFILES) $(CFILES)
 	makedepend -Y -I.. -f makedepend $(CPPFILES) $(GLCPPFILES) $(CFILES)
 
 # Automatically generated dependencies...
@@ -346,5 +344,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile,v 1.18.2.14.2.26 2001/12/10 14:46:04 easysw Exp $".
+# End of "$Id: Makefile,v 1.18.2.14.2.27 2001/12/19 19:23:31 easysw Exp $".
 #
diff --git a/test/Makefile b/test/Makefile
index 5522b67ca..19fc06c8e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.19.2.7.2.21 2001/12/14 21:02:24 easysw Exp $"
+# "$Id: Makefile,v 1.19.2.7.2.22 2001/12/19 19:23:31 easysw Exp $"
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -239,8 +239,7 @@ jpeg_image$(EXEEXT): jpeg_image.o
 	$(CXX) -I.. $(CXXFLAGS) jpeg_image.o $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@
 	$(POSTBUILD) $@ ../FL/mac.r
 
-depend:
-#	$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend
+depend:	$(CPPFILES)
 	makedepend -Y -I.. -f makedepend $(CPPFILES)
 
 clean:
@@ -253,5 +252,5 @@ uninstall:
 	@echo Nothing to uninstall in test directory.
 
 #
-# End of "$Id: Makefile,v 1.19.2.7.2.21 2001/12/14 21:02:24 easysw Exp $".
+# End of "$Id: Makefile,v 1.19.2.7.2.22 2001/12/19 19:23:31 easysw Exp $".
 #
diff --git a/test/makedepend b/test/makedepend
index e5a60a1c6..249337c78 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -302,6 +302,10 @@ subwindow.o: ../FL/fl_draw.H
 symbols.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 symbols.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 symbols.o: ../FL/Fl_Widget.H ../FL/Fl_Box.H ../FL/fl_draw.H
+tabs.o: tabs.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
+tabs.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Tabs.H
+tabs.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Button.H
+tabs.o: ../FL/Fl_Clock.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
 threads.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 threads.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 threads.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H