pier 01/07/12 19:06:33 Modified: webapp Makedefs.in Makefile.in configure.in Log: Modified build procedure (now building also Java files). Revision Changes Path 1.6 +3 -3 jakarta-tomcat-connectors/webapp/Makedefs.in Index: Makedefs.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makedefs.in 2001/07/08 23:11:36 1.5 +++ Makedefs.in 2001/07/13 02:06:26 1.6 @@ -56,10 +56,12 @@ # ========================================================================= # # @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> -# @version $Id: Makedefs.in,v 1.5 2001/07/08 23:11:36 pier Exp $ +# @version $Id: Makedefs.in,v 1.6 2001/07/13 02:06:26 pier Exp $ CC = @CC@ CPP = @CPP@ +JAVAC = @JAVAC@ +JAR = @JAR@ SHELL = @SHELL@ LIBTOOL = @LIBTOOL@ @@ -75,8 +77,6 @@ LTFLAGS = --silent -TGTDIRS = @TGTDIRS@ -TARGET = @TARGET@ SRCDIR = @SRCDIR@ .SUFFIXES: .c .lo .o 1.8 +33 -6 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.in 2001/07/08 23:11:37 1.7 +++ Makefile.in 2001/07/13 02:06:27 1.8 @@ -56,11 +56,12 @@ # ========================================================================= # # @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> -# @version $Id: Makefile.in,v 1.7 2001/07/08 23:11:37 pier Exp $ +# @version $Id: Makefile.in,v 1.8 2001/07/13 02:06:27 pier Exp $ include @SRCDIR@/Makedefs -DIRS = $(TGTDIRS) $(TARGET) +LOCALDIRS = @TGTDIRS@ @TARGET@ +APRDIR = @APRDIR@ CFGS = config.cache \ config.log \ @@ -70,8 +71,8 @@ lib/Makefile \ apache-1.3/Makefile -all: - @for DIR in $(DIRS) ; do \ +all: local + @for DIR in $(APRDIR) ; do \ echo "" ; \ echo "Compiling sources in $$DIR..." ; \ $(MAKE) -C $$DIR all ; \ @@ -81,8 +82,8 @@ fi ; \ done -clean: - @for DIR in $(DIRS) ; do \ +clean: localclean + @for DIR in $(APRDIR) ; do \ echo "" ; \ echo "Cleaning up $$DIR..." ; \ $(MAKE) -C $$DIR clean ; \ @@ -92,7 +93,33 @@ fi ; \ done +local: + @for DIR in $(LOCALDIRS) ; do \ + echo "" ; \ + echo "Compiling sources in $$DIR..." ; \ + $(MAKE) -C $$DIR all ; \ + RET=$$? ; \ + if test "$$RET" != "0" ; then \ + exit $$RET ; \ + fi ; \ + done + +localclean: + @for DIR in $(LOCALDIRS) ; do \ + echo "" ; \ + echo "Cleaning up $$DIR..." ; \ + $(MAKE) -C $$DIR clean ; \ + RET=$$? ; \ + if test "$$RET" != "0" ; then \ + exit $$RET ; \ + fi ; \ + done + distclean: clean @echo Removing configure generated files... @rm -f $(CFGS) + +cvsclean: distclean + @echo Removing configure script... + @rm -f configure 1.15 +24 -3 jakarta-tomcat-connectors/webapp/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- configure.in 2001/07/09 22:20:12 1.14 +++ configure.in 2001/07/13 02:06:29 1.15 @@ -58,7 +58,7 @@ dnl -------------------------------------------------------------------------- dnl Author Pier Fumagalli <mailto:[EMAIL PROTECTED]> dnl Author Jon S. Stevens <mailto:[EMAIL PROTECTED]> -dnl Version $Id: configure.in,v 1.14 2001/07/09 22:20:12 pier Exp $ +dnl Version $Id: configure.in,v 1.15 2001/07/13 02:06:29 pier Exp $ dnl -------------------------------------------------------------------------- dnl -------------------------------------------------------------------------- @@ -111,6 +111,7 @@ dnl -------------------------------------------------------------------------- dnl Initialize dnl -------------------------------------------------------------------------- +sinclude(./support/apjava.m4) AC_INIT(Makefile.in) LOCAL_INIT() @@ -129,6 +130,26 @@ AC_SUBST(SRCDIR) dnl -------------------------------------------------------------------------- +dnl Process the --enable-debug[=FILE] command line argument +dnl -------------------------------------------------------------------------- +AC_ARG_ENABLE(debug, + [ --enable-debug Build with full debugging output.], + [ + AC_MSG_RESULT([enabling debug output]) + CFLAGS="$CFLAGS -DDEBUG" + ],[ + AC_MSG_RESULT([disabling debug output]) + ] +) + +dnl ------------------------------------------------------------------------- +dnl Check JAVA environment +dnl ------------------------------------------------------------------------- +AP_JAVA() +AP_PROG_JAVAC() +AP_PROG_JAR() + +dnl -------------------------------------------------------------------------- dnl Process the --with-apxs[=FILE] command line argument dnl -------------------------------------------------------------------------- AC_ARG_WITH(apxs, @@ -271,9 +292,9 @@ dnl -------------------------------------------------------------------------- CFLAGS="-Wall ${CFLAGS}" CPPFLAGS="-I${SRCDIR}/include -I${APRDIR}/include ${CPPFLAGS}" -TGTDIRS="${APRDIR} ${SRCDIR}/lib" +TGTDIRS="${SRCDIR}/java ${SRCDIR}/lib" AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(TGTDIRS) -AC_OUTPUT(Makedefs Makefile lib/Makefile ${makefile}) +AC_OUTPUT(./Makedefs ./Makefile ./lib/Makefile ./java/Makefile ${makefile})
