pier 01/05/09 23:05:42 Modified: connectors Makedefs.in Makefile.in Log: Update Makefile to halt on error without processing further subdirectories Added Make definitions for 1.3 APXS Revision Changes Path 1.2 +5 -2 jakarta-tomcat-4.0/connectors/Makedefs.in Index: Makedefs.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/connectors/Makedefs.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makedefs.in 2001/04/17 13:07:40 1.1 +++ Makedefs.in 2001/05/10 06:05:40 1.2 @@ -56,14 +56,17 @@ # ========================================================================= # # @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> -# @version $Id: Makedefs.in,v 1.1 2001/04/17 13:07:40 pier Exp $ +# @version $Id: Makedefs.in,v 1.2 2001/05/10 06:05:40 pier Exp $ CC = @CC@ AR = @AR@ +APXS = @APXS@ +APXSFLAGS = -I@SRCDIR@/include -I@APRDIR@/include \ + -L@SRCDIR@/lib -lwebapp \ + -L@APRDIR@/lib -lapr RANLIB = @RANLIB@ CFLAGS = -Wall @CFLAGS@ CPPFLAGS = -I@SRCDIR@/include -I@APRDIR@/include @CPPFLAGS@ -LDFLAGS = @TGTDIR@/webapp/libwebapp.la @APRDIR@/libapr.la @LDFLAGS@ SRCDIR = @SRCDIR@ TGTDIR = @TGTDIR@ 1.4 +14 -4 jakarta-tomcat-4.0/connectors/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/connectors/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.in 2001/04/24 16:31:34 1.3 +++ Makefile.in 2001/05/10 06:05:41 1.4 @@ -56,7 +56,7 @@ # ========================================================================= # # @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> -# @version $Id: Makefile.in,v 1.3 2001/04/24 16:31:34 pier Exp $ +# @version $Id: Makefile.in,v 1.4 2001/05/10 06:05:41 pier Exp $ include Makedefs @@ -67,26 +67,36 @@ config.status \ Makedefs \ Makefile \ - lib/Makefile + lib/Makefile \ + apache-1.3/Makefile all: @for DIR in $(DIRS) ; do \ echo "Compiling sources in $$DIR..." ; \ $(MAKE) -C $$DIR all ; \ + RET=$$? ; \ + if ( test "$$RET" != "0" ) ; then \ + exit $$RET ; \ + fi ; \ done clean: @for DIR in $(DIRS) ; do \ echo "Cleaning up $$DIR..." ; \ $(MAKE) -C $$DIR clean ; \ + RET=$$? ; \ + if ( test "$$RET" != "0" ) ; then \ + exit $$RET ; \ + fi ; \ done apidocs: include/*.h + @echo "Generating API documentation..." @if ! test -d docs/api ; then mkdir docs/api ; fi @./scandoc/scandoc.pl -i ./scandoc/template.pl -p ./docs/api/ include/*.h -allclean: clean +dist: all apidocs -distclean: allclean +distclean: clean @echo Removing configure generated files... @rm -f $(CFGS)
