pier 01/09/16 17:42:59
Modified: webapp Makedefs.in Makefile.in configure.in
webapp/apache-1.3 Makefile.in
webapp/lib Makefile.in
Log:
Revised how "distclean" works.
Revision Changes Path
1.11 +10 -6 jakarta-tomcat-connectors/webapp/Makedefs.in
Index: Makedefs.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makedefs.in 2001/09/17 00:08:22 1.10
+++ Makedefs.in 2001/09/17 00:42:59 1.11
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makedefs.in,v 1.10 2001/09/17 00:08:22 pier Exp $
+# @version $Id: Makedefs.in,v 1.11 2001/09/17 00:42:59 pier Exp $
.SUFFIXES: .c .o
@@ -90,7 +90,9 @@
# The directory of a Tomcat 4.0 binary distribution
TC4DIR = @TC4DIR@
# The list of configure-generated files
-CFGFILES = @CFCFILES@ ./config.cache ./config.log ./config.status
+CFGFILES = @CFGFILES@ ./config.cache ./config.log ./config.status
+# The file holding the list of makefile-generated files
+LSTFILE = $(TGTDIR)/config.list
# GNU-Make style echo
MECHO = $(ECHO) "$(MAKE)[$(MAKELEVEL)]:"
@@ -165,9 +167,11 @@
# -------------------------------------------------------------------------
# C-Compilation default setting
# -------------------------------------------------------------------------
+
+ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) \
+ $(APR_CFLAGS) $(APR_CPPFLAGS) $(APR_INCLUDES) \
+ -I$(APR_INCDIR) -I$(SRCDIR)/include
+
.c.o:
- $(CC) $(CFLAGS) $(CPPFLAGS) \
- $(APR_CFLAGS) $(APR_CPPFLAGS) $(APR_INCLUDES) \
- -I$(APR_INCDIR) -I$(SRCDIR)/include \
- -c "$<" -o "$@"
+ $(CC) $(ALL_CFLAGS) -c "$<" -o "$@"
1.19 +16 -7 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 2001/09/17 00:08:56 1.18
+++ Makefile.in 2001/09/17 00:42:59 1.19
@@ -56,19 +56,22 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.18 2001/09/17 00:08:56 pier Exp $
+# @version $Id: Makefile.in,v 1.19 2001/09/17 00:42:59 pier Exp $
include @TGTDIR@/Makedefs
-all: lib-build
+all: build
+
build: @TARGET_BUILD@
-clean: @TARGET_CLEAN@
-lib-build:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="lib" MTGT="build"
+clean: @TARGET_CLEAN@
-lib-clean:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="lib" MTGT="clean"
+distclean: clean
+ @$(MECHO) "Removing makefile generated files"
+ $(RM) -f `$(CAT) $(LSTFILE)`
+ $(RM) -f $(LSTFILE)
+ @$(MECHO) "Removing configure generated files"
+ $(RM) -f $(CFGFILES)
apr-build:
@$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="$(APR_SRCDIR)" MTGT="all"
@@ -84,6 +87,12 @@
@$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="$(APR_SRCDIR)" MTGT="clean"
@$(MECHO) "Cleaning up APR library in \"$(APR_LIBDIR)\""
@$(RM) -f $(APR_LIBDIR)/libapr.*
+
+lib-build:
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="lib" MTGT="build"
+
+lib-clean:
+ @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="lib" MTGT="clean"
apache-1.3-build:
@$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-1.3" MTGT="build"
1.38 +12 -10 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- configure.in 2001/09/17 00:08:22 1.37
+++ configure.in 2001/09/17 00:42:59 1.38
@@ -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.37 2001/09/17 00:08:22 pier Exp $
+dnl Version $Id: configure.in,v 1.38 2001/09/17 00:42:59 pier Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -124,6 +124,7 @@
AC_SUBST(AR)
AC_SUBST(RANLIB)
AC_PROG_CC()
+LOCAL_CHECK_PROG(CC,${CC})
AC_PROG_CC_C_O()
AC_PROG_CPP()
AC_SUBST(CPPFLAGS)
@@ -483,10 +484,10 @@
dnl Build the APR configure script
dnl ------------------------------
LOCAL_HEADER([Building APR configure script])
-dnl LOCAL_FILTEREXEC(local_return,
-dnl [./buildconf],
-dnl [APR buildconf],
-dnl [${APR_SRCDIR}])
+ LOCAL_FILTEREXEC(local_return,
+ [./buildconf],
+ [APR buildconf],
+ [${APR_SRCDIR}])
if ${TEST} "${local_return}" -ne "0"
then
@@ -497,10 +498,10 @@
dnl Run the APR configure script
dnl ----------------------------
LOCAL_HEADER([Configuring APR])
-dnl LOCAL_FILTEREXEC(local_return,
-dnl [./configure ${APR_CFGFLG}],
-dnl ["APR configure"],
-dnl [${APR_SRCDIR}])
+ LOCAL_FILTEREXEC(local_return,
+ [./configure ${APR_CFGFLG}],
+ ["APR configure"],
+ [${APR_SRCDIR}])
if ${TEST} "${local_return}" -ne "0"
then
@@ -561,7 +562,8 @@
dnl New vars: CFGFILES
dnl Upd vars: N/A
dnl --------------------------------------------------------------------------
-CFGFILES="./Makefile ./Makedefs ./lib/Makefile ./${MODULE}/Makefile"
+CFGFILES="./Makefile ./Makedefs ./lib/Makefile"
+CFGFILES="${CFGFILES} ./${MODULE}/Makefile ./java/Constants.java"
AC_SUBST(CFGFILES)
AC_OUTPUT(${CFGFILES})
LOCAL_HEADER([All done. Now you can issue \"make\". Good luck.])
1.14 +3 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 2001/09/17 00:09:41 1.13
+++ Makefile.in 2001/09/17 00:42:59 1.14
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.13 2001/09/17 00:09:41 pier Exp $
+# @version $Id: Makefile.in,v 1.14 2001/09/17 00:42:59 pier Exp $
include @TGTDIR@/Makedefs
@@ -82,5 +82,6 @@
-lapr -lwebapp -o "$@" $<
$(SRCS):
- @$(MECHO) "Linking \"$@\""
$(LN) -s $(SRCDIR)/apache-1.3/$@ ./$@
+ @$(ECHO) $(TGTDIR)/apache-1.3/$@ >> $(LSTFILE)
+
1.16 +3 -3 jakarta-tomcat-connectors/webapp/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 2001/09/17 00:09:41 1.15
+++ Makefile.in 2001/09/17 00:42:59 1.16
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.15 2001/09/17 00:09:41 pier Exp $
+# @version $Id: Makefile.in,v 1.16 2001/09/17 00:42:59 pier Exp $
include @TGTDIR@/Makedefs
@@ -94,7 +94,7 @@
$(AR) cr $@ $(OBJS) $(PROVS)
$(RANLIB) $@
-pr_warp_defs.h: $(SRCDIR)/java/Constants.java
+pr_warp_defs.h: $(TGTDIR)/java/Constants.java
@$(MECHO) "Generating \"$@\""
@$(CAT) "$<" | \
$(GREP) "TYPE_" | \
@@ -103,5 +103,5 @@
$(SRCS):
$(LN) -s $(SRCDIR)/lib/$@ ./$@
-
+ @$(ECHO) $(TGTDIR)/lib/$@ >> $(LSTFILE)
