You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2001/10/03 14:35:14 UTC
cvs commit: jakarta-tomcat-connectors/webapp/apache-2.0 Makefile.in
jfclere 01/10/03 05:35:14
Modified: webapp Makefile.in configure.in
webapp/apache-2.0 Makefile.in
Log:
mod_webapp build cleanups
Submitted by: Justin Erenkrantz jerenkrantz@ebuilt.com
Revision Changes Path
1.21 +7 -1 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.in 2001/09/17 05:06:27 1.20
+++ Makefile.in 2001/10/03 12:35:14 1.21
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makefile.in,v 1.20 2001/09/17 05:06:27 pier Exp $
+# @version $Id: Makefile.in,v 1.21 2001/10/03 12:35:14 jfclere Exp $
include @TGTDIR@/Makedefs
@@ -106,6 +106,12 @@
apache-1.3-clean:
@$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-1.3" MTGT="clean"
+
+apache-2.0-build:
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-2.0" MTGT="build"
+
+apache-2.0-clean:
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-2.0" MTGT="clean"
template:
@ { \
1.40 +9 -9 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- configure.in 2001/09/17 05:07:01 1.39
+++ configure.in 2001/10/03 12:35:14 1.40
@@ -58,7 +58,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
dnl Author Jon S. Stevens <ma...@latchkey.com>
-dnl Version $Id: configure.in,v 1.39 2001/09/17 05:07:01 pier Exp $
+dnl Version $Id: configure.in,v 1.40 2001/10/03 12:35:14 jfclere Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -177,7 +177,7 @@
dnl Upd vars: N/A
dnl -------------------------------------------------------------------------
AC_ARG_WITH(tomcat,
- [ --with-tomcat[=DIR] path of a Tomcat 4.0 distribution. (DIR defaults
+ [ --with-tomcat[=DIR] path of a Tomcat 4.0 distribution. (DIR defaults
to \"/usr/local/tomcat\"). Not required and ignored
when the --enable-java option is not specified.],
[
@@ -241,7 +241,7 @@
AC_MSG_CHECKING([for C API documentation])
AC_ARG_ENABLE(apidocs-c,
[ --enable-apidocs-c[=PERL]
- enbale generation of C API documentation using
+ enable generation of C API documentation using
ScanDoc (PERL is the name of the Perl interpreter
used to run ScanDoc. If not specified this is
looked up in your current path).],
@@ -302,7 +302,7 @@
AC_MSG_CHECKING([for Java API documentation])
AC_ARG_ENABLE(apidocs-java,
[ --enable-apidocs-java[=JAVADOC]
- enbale generation of Java API documentation using
+ enable generation of Java API documentation using
JavaDoc (If JAVADOC is not set its value will be
discovered by \"--enable-java\").],
[
@@ -347,10 +347,10 @@
dnl Upd vars: APR_SRCDIR
dnl --------------------------------------------------------------------------
AC_ARG_WITH(apr,
- [ --with-apr[=DIR] path of an APR (Apache Portable Runtime) source
+ [ --with-apr[=DIR] path of an APR (Apache Portable Runtime) source
distribution or CVS snapshot. (DIR defaults to
- \"./apr\"). Not required and ignored when the
- --with-apxs2 option is specified.],
+ \"./apr\"). Not required and ignored when an
+ Apache 2.0 apxs is specified (--with-apxs).],
[
case "${withval}" in
""|"yes"|"YES"|"true"|"TRUE")
@@ -382,7 +382,7 @@
dnl --------------------------------------------------------------------------
AC_MSG_CHECKING([for Apache apxs])
AC_ARG_WITH(apxs,
- [ --with-apxs[=FILE] build a shared Apache module. If FILE was not
+ [ --with-apxs[=FILE] build a shared Apache module. If FILE was not
specified, then APXS will be searched within the
current PATH. The Apache server version (1.3 or 2.0)
will be automatically detected.],
@@ -425,7 +425,7 @@
dnl Upd vars: APR_CFGFLG APR_VARFIL APR_LIBDIR APR_INCDIR
dnl -----------------------------------------------------
MODULE="apache-2.0"
- local_prefix="`apxs -q PREFIX`"
+ local_prefix="`${APXS} -q PREFIX`"
APR_CFGFLG=""
APR_VARFIL="${local_prefix}/lib/APRVARS"
APR_LIBDIR="${local_prefix}/lib"
1.3 +2 -1 jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-2.0/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 2001/08/31 10:26:24 1.2
+++ Makefile.in 2001/10/03 12:35:14 1.3
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makefile.in,v 1.2 2001/08/31 10:26:24 jfclere Exp $
+# @version $Id: Makefile.in,v 1.3 2001/10/03 12:35:14 jfclere Exp $
include @SRCDIR@/Makedefs
@@ -65,6 +65,7 @@
MODULE = mod_webapp.la
all: $(MODULE)
+build: $(MODULE)
mod_webapp.la: mod_webapp.c
@$(ECHO) Compiling and Linking Apache 2.0 WebApp Module