You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@apache.org on 2001/09/17 02:08:56 UTC
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier 01/09/16 17:08:56
Modified: webapp Makefile.in
Log:
New Makefile.
Revision Changes Path
1.18 +45 -90 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 2001/09/05 11:05:47 1.17
+++ Makefile.in 2001/09/17 00:08:56 1.18
@@ -56,97 +56,52 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makefile.in,v 1.17 2001/09/05 11:05:47 jfclere Exp $
+# @version $Id: Makefile.in,v 1.18 2001/09/17 00:08:56 pier Exp $
-include @SRCDIR@/Makedefs
+include @TGTDIR@/Makedefs
-LOCALDIRS = @TGTDIRS@ @TARGET@
-APRDIR = @APRDIR@
-INSTALLDIR = @TARGET@
-
-CFGS = @CONFIGFILES@ \
- @SRCDIR@/lib/pr_warp_defs.h \
- config.cache \
- config.log \
- config.status
-
-all: @APR_BUILD@ local-all
-
-install: local-install
-
-clean: @APR_CLEAN@ local-clean
-
-distclean: clean
- @$(ECHO) ""
- @$(ECHO) Removing configure generated files...
- @$(RM) -f $(CFGS)
-
-cvsclean: distclean
- @$(ECHO) ""
- @$(ECHO) Removing configure script...
- @$(ECHO) -f configure
-
-apr-all:
- @for DIR in $(APRDIR) ; do \
- $(ECHO) "" ; \
- $(ECHO) "Compiling sources in $${DIR}..." ; \
- cd $${DIR} ; \
- $(MAKE) all ; \
- RET=$$? ; \
- cd $(SRCDIR) ; \
- if $(TEST) "$${RET}" != "0" ; then \
- exit $${RET} ; \
- fi ; \
- done
+all: lib-build
+build: @TARGET_BUILD@
+clean: @TARGET_CLEAN@
+
+lib-build:
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="lib" MTGT="build"
+
+lib-clean:
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="lib" MTGT="clean"
+
+apr-build:
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="$(APR_SRCDIR)" MTGT="all"
+ @$(MECHO) "Installing APR library in \"$(APR_LIBDIR)\""
+ @$(APR_SRCDIR)/libtool --silent --mode=install \
+ $(SRCDIR)/support/install.sh -c \
+ $(APR_SRCDIR)/libapr.la \
+ $(APR_LIBDIR) 2>/dev/null
+ @$(APR_SRCDIR)/libtool --silent --mode=finish \
+ $(APR_LIBDIR)
apr-clean:
- @for DIR in $(APRDIR) ; do \
- $(ECHO) "" ; \
- $(ECHO) "Cleaning up $${DIR}..." ; \
- cd $${DIR} ; \
- $(MAKE) clean ; \
- RET=$$? ; \
- cd $(SRCDIR) ; \
- if test "$${RET}" != "0" ; then \
- exit $${RET} ; \
- fi ; \
- done
-
-local-all:
- @for DIR in $(LOCALDIRS) ; do \
- $(ECHO) "" ; \
- $(ECHO) "Compiling sources in $${DIR}..." ; \
- cd $${DIR} ; \
- $(MAKE) all ; \
- RET=$$? ; \
- cd $(SRCDIR) ; \
- if test "$${RET}" != "0" ; then \
- exit $${RET} ; \
- fi ; \
- done
-
-local-clean:
- @for DIR in $(LOCALDIRS) ; do \
- $(ECHO) "" ; \
- $(ECHO) "Cleaning up $${DIR}..." ; \
- cd $${DIR} ; \
- $(MAKE) clean ; \
- RET=$$? ; \
- cd $(SRCDIR) ; \
- if test "$${RET}" != "0" ; then \
- exit $${RET} ; \
- fi ; \
- done
-
-local-install:
- @for DIR in $(INSTALLDIR) ; do \
- $(ECHO) "" ; \
- $(ECHO) "Installing from $${DIR}..." ; \
- cd $${DIR} ; \
- $(MAKE) install ; \
- RET=$$? ; \
- cd $(SRCDIR) ; \
- if test "$${RET}" != "0" ; then \
- exit $${RET} ; \
- fi ; \
- done
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="$(APR_SRCDIR)" MTGT="clean"
+ @$(MECHO) "Cleaning up APR library in \"$(APR_LIBDIR)\""
+ @$(RM) -f $(APR_LIBDIR)/libapr.*
+
+apache-1.3-build:
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-1.3" MTGT="build"
+
+apache-1.3-clean:
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-1.3" MTGT="clean"
+
+template:
+ @ { \
+ $(ECHO) "" ; \
+ $(MECHO) "Entering directory \"$(MDIR)\"" ; \
+ cd $(MDIR) ; \
+ $(MECHO) "Invoking \"$(MAKE) $(MFLG) $(MTGT)\"" ; \
+ $(MAKE) $(MFLG) $(MTGT); \
+ RET=$$? ; \
+ $(MECHO) "Exiting directory \"$(MDIR)\"" ; \
+ cd $(SRCDIR) ; \
+ if test "$${RET}" != "0" ; then \
+ exit $${RET} ; \
+ fi ; \
+ }