More changes to top-level makefile and configuration files.

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

Makefile

@@ -27,25 +27,34 @@ SHELL=/bin/sh
 
 DIRS	=	src fluid test
 
-all:
+all:	depend
 	for dir in $(DIRS); do\
 		echo "=== making $$dir ===";\
-		cd $$dir && $(MAKE);\
+		(cd $$dir;$(MAKE));\
 	done
 
 install: all
 	for dir in $(DIRS); do\
 		echo "=== installing $$dir ===";\
-		cd $$dir && $(MAKE) install;\
+		(cd $$dir;$(MAKE) install);\
+	done
+
+depend:
+	for dir in $(DIRS); do\
+		echo "=== making dependencies in $$dir ===";\
+		if test ! -f $$dir/makedepend; then\
+			touch 0101000070 $$dir/makedepend;\
+		fi;\
+		(cd $$dir;$(MAKE) depend);\
 	done
 
 clean:
 	-@ rm -f core config.cache *.o *.bck
 	for dir in $(DIRS); do\
 		echo "=== cleaning $$dir ===";\
-		cd $$dir && $(MAKE) clean;\
+		(cd $$dir;$(MAKE) clean);\
 	done
 
 #
-# End of "$Id: Makefile,v 1.2 1998/10/20 21:06:17 mike Exp $".
+# End of "$Id: Makefile,v 1.3 1998/10/21 14:00:51 mike Exp $".
 #

configh.in

@@ -2,9 +2,7 @@
  * "$Id"
  *
  * Configuration file for the Fast Light Tool Kit (FLTK).
- *
- * THIS FILE IS READ BY CONFIGURE TO PRODUCE A PLATFORM-SPECIFIC CONFIG.H
- * FILE.  EDIT ONLY IF YOU CAN'T RUN CONFIGURE!
+ * @configure_input@
  *
  * Copyright 1998 by Bill Spitzak and others.
  *
@@ -141,5 +139,5 @@
 #define HAVE_LIBJPEG 0
 
 /*
- * End of "$Id: configh.in,v 1.2 1998/10/20 16:41:17 mike Exp $".
+ * End of "$Id: configh.in,v 1.3 1998/10/21 14:00:52 mike Exp $".
  */

configure.in

@@ -41,7 +41,11 @@ DEBUGFLAG=""
 AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],if eval "test x$enable_debug = xyes"; then
   DEBUGFLAG="-g"
 fi)
-AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [default=no]],if eval "test x$enable_shared = xyes"; then
+AC_ARG_ENABLE(debug, [  --enable-production     turn off debugging [default=yes]],if eval "test x$enable_production != xno"; then
+  DEBUGFLAG="-O2"
+fi)
+AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [default=no]],[
+if eval "test x$enable_shared = xyes"; then
   RANLIB=":"
   case `uname` in
       SunOS* | UNIX_S*)
@@ -52,15 +56,18 @@ AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [defau
           LIBNAME="libfltk.sl.1"
 	  LIBCOMMAND="ld -b -z +h libfltk.sl.1 $DEBUGFLAGS -o"
 	  ;;
-      *)
-          echo "Warning: shared libraries may not be supported.  Trying -shared"
-	  echo "         option to compiler."
       OSF1* | IRIX*)
           LIBNAME="libfltk.so.1"
           LIBCOMMAND="\$(CXX) -shared $DEBUGFLAG -o"
 	  ;;
+      *)
+          echo "Warning: shared libraries may not be supported.  Trying -shared"
+	  echo "         option to compiler."
+          LIBNAME="libfltk.so.1"
+          LIBCOMMAND="\$(CXX) -shared $DEBUGFLAG -o"
+	  ;;
   esac
-fi)
+fi])
 
 if test -n "$DEBUGFLAG"; then
   CFLAGS="$DEBUGFLAG $CFLAGS"
@@ -124,10 +131,6 @@ if test "$ac_cv_have_overlay" = yes; then
     AC_DEFINE(HAVE_OVERLAY)
 fi
 
-dnl Check for other libraries...
-
-AC_CHECK_LIB(jpeg,jpeg_destroy_decompress)
-
 MAKEDEPEND="\$(CXX) -M"
 
 AC_SUBST(LIBNAME)
@@ -137,5 +140,5 @@ AC_CONFIG_HEADER(config.h:configh.in)
 AC_OUTPUT(makeinclude)
 
 dnl#
-dnl# End of "$Id: configure.in,v 1.2 1998/10/20 16:41:18 mike Exp $".
+dnl# End of "$Id: configure.in,v 1.3 1998/10/21 14:00:53 mike Exp $".
 dnl#

makeinclude.in

@@ -1,7 +1,8 @@
 #
 # "$Id"
 #
-# for the Fast Light Tool Kit (FLTK).
+# Make include file for the Fast Light Tool Kit (FLTK).
+# @configure_input@
 #
 # Copyright 1998 by Bill Spitzak and others.
 #
@@ -23,8 +24,6 @@
 # Please report all bugs and problems to "fltk-bugs@easysw.com".
 #
 
-# @configure_input@
-
 prefix		=@prefix@
 exec_prefix	=@exec_prefix@
 bindir		=@bindir@
@@ -54,5 +53,5 @@ LDLIBS		=@LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
 GLDLIBS		=@LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
 
 #
-# End of "$Id: makeinclude.in,v 1.2 1998/10/20 16:41:20 mike Exp $".
+# End of "$Id: makeinclude.in,v 1.3 1998/10/21 14:00:53 mike Exp $".
 #