jfclere 01/08/31 03:26:24
Modified: webapp Makefile.in configure.in
webapp/apache-1.3 Makefile.in
webapp/apache-2.0 Makefile.in
Log:
Merge Ryan's changes with mines.
Revision Changes Path
1.16 +17 -1 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 2001/08/06 22:21:52 1.15
+++ Makefile.in 2001/08/31 10:26:24 1.16
@@ -56,12 +56,13 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.15 2001/08/06 22:21:52 pier Exp $
+# @version $Id: Makefile.in,v 1.16 2001/08/31 10:26:24 jfclere Exp $
include @SRCDIR@/Makedefs
LOCALDIRS = @TGTDIRS@ @TARGET@
APRDIR = @APRDIR@
+INSTALLDIR = @TARGET@
CFGS = @CONFIGFILES@ \
@SRCDIR@/lib/pr_warp_defs.h \
@@ -71,6 +72,8 @@
all: apr-all local-all
+install: local-install
+
clean: apr-clean local-clean
distclean: clean
@@ -128,6 +131,19 @@
$(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 \
1.24 +4 -6 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- configure.in 2001/08/29 14:29:29 1.23
+++ configure.in 2001/08/31 10:26:24 1.24
@@ -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.23 2001/08/29 14:29:29 jfclere Exp $
+dnl Version $Id: configure.in,v 1.24 2001/08/31 10:26:24 jfclere Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -206,10 +206,8 @@
AC_SUBST(APXS_LIBS_SHLIB)
AC_SUBST(APXS_PREFIX)
- dnl test apache version (from mod_jk)
- $RM -rf test
- $APXS -n test -g
- APA=`grep STANDARD20 test/mod_test.c`
+ dnl test apache version
+ APA=`${GREP} STANDARD20 ${APXS}`
if ${TEST} -z "$APA" ; then
TARGET="${SRCDIR}/apache-1.3"
makefile="apache-1.3/Makefile"
@@ -262,7 +260,7 @@
LOCAL_HEADER([Configuring APR])
LOCAL_FILTEREXEC(
- [./configure --enable-static --disable-shared --disable-threads],
+ [./configure --enable-static --disable-threads],
["APR configure"])
if ${TEST} "${ret}" -ne "0"
then
1.10 +5 -1 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 2001/08/09 20:06:49 1.9
+++ Makefile.in 2001/08/31 10:26:24 1.10
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.9 2001/08/09 20:06:49 pier Exp $
+# @version $Id: Makefile.in,v 1.10 2001/08/31 10:26:24 jfclere Exp $
include @SRCDIR@/Makedefs
@@ -72,6 +72,7 @@
APXS_SYSCONFDIR = @APXS_SYSCONFDIR@
APXS_LIBS_SHLIB = @APXS_LIBS_SHLIB@
APXS_PREFIX = @APXS_PREFIX@
+APXS = @APXS@
MODULE = mod_webapp.so
@@ -93,6 +94,9 @@
mod_webapp.lo @SRCDIR@/lib/libwebapp.la \
$(LIBTOOL_LIBS) $(EXTRA_LIBS) @APRDIR@/libapr.la \
-o mod_webapp.so
+
+install: mod_webapp.so
+ $(APXS) -i mod_webapp.so
clean:
@for ENTRY in *.o *.lo $(MODULE) .libs ; \
1.2 +3 -20 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 2001/08/29 14:29:29 1.1
+++ Makefile.in 2001/08/31 10:26:24 1.2
@@ -56,36 +56,19 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.1 2001/08/29 14:29:29 jfclere Exp $
+# @version $Id: Makefile.in,v 1.2 2001/08/31 10:26:24 jfclere Exp $
include @SRCDIR@/Makedefs
-APXS_CC = @APXS_CC@
-APXS_TARGET = @APXS_TARGET@
-APXS_CFLAGS = @APXS_CFLAGS@
-APXS_SBINDIR = @APXS_SBINDIR@
-APXS_CFLAGS_SHLIB = @APXS_CFLAGS_SHLIB@
-APXS_INCLUDEDIR = @APXS_INCLUDEDIR@
-APXS_LD_SHLIB = @APXS_LD_SHLIB@
-APXS_LIBEXECDIR = @APXS_LIBEXECDIR@
-APXS_LDFLAGS_SHLIB = @APXS_LDFLAGS_SHLIB@
-APXS_SYSCONFDIR = @APXS_SYSCONFDIR@
-APXS_LIBS_SHLIB = @APXS_LIBS_SHLIB@
-APXS_PREFIX = @APXS_PREFIX@
-
APXS = @APXS@
MODULE = mod_webapp.la
all: $(MODULE)
-mod_webapp.la: mod_webapp.c @SRCDIR@/lib/libwebapp.la @APRDIR@/libapr.la
+mod_webapp.la: mod_webapp.c
@$(ECHO) Compiling and Linking Apache 2.0 WebApp Module
- $(APXS) -c -o $@ \
- -Wc,"$(APXS_CFLAGS) -I$(APXS_INCLUDEDIR) -I../include" \
- @SRCDIR@/lib/libwebapp.la \
- $(LIBTOOL_LIBS) $(EXTRA_LIBS) @APRDIR@/libapr.la \
- mod_webapp.c
+ $(APXS) -I../include -c ../lib/libwebapp.la mod_webapp.c
install: mod_webapp.la
$(APXS) -i mod_webapp.la
