Re: cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
Pier Fumagalli [EMAIL PROTECTED] wrote: [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: pier02/04/30 17:37:16 Modified:webapp Makedefs.in Makefile.in configure.in webapp/apache-1.3 Makefile.in webapp/lib Makefile.in Log: Reorganization and clean-up of all the autoconf code, with the objective to build Apache 2.0 binaries from APXS/2.0 tomorrow... This works on OS/X great, actually better than before because it's MUCH simpler to debug. Tomorrow I'll try it out @work on some solaris 7 and 8 machines. Can someone try it on Linux (you can also wait when the whole kit will be finished up - but might be great to know of issues right now). It works purrfectly on Solaris 8 as well... Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier02/05/01 14:27:51 Modified:webapp/lib Makefile.in Log: New makefile also for library Revision ChangesPath 1.26 +4 -14 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.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Makefile.in 1 May 2002 00:41:58 - 1.25 +++ Makefile.in 1 May 2002 21:27:51 - 1.26 @@ -56,11 +56,10 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.25 2002/05/01 00:41:58 pier Exp $ +# @version $Id: Makefile.in,v 1.26 2002/05/01 21:27:51 pier Exp $ -LOCAL_INCLUDES = -I$(SRC_DIR)/include -I$(SRC_DIR)/lib -I. -LOCAL_TGT_DIR = $(TGT_DIR)/lib -LOCAL_SRC_DIR = $(SRC_DIR)/lib +LOCAL_TGT_DIR = @TGT_DIR@/lib +LOCAL_SRC_DIR = @SRC_DIR@/lib include @TGT_DIR@/Makedefs OBJS = wa_main.lo \ @@ -72,12 +71,11 @@ pr_warp_network.lo \ pr_warp_config.lo \ pr_warp_socketpool.lo -LIB =libwebapp.la DEFH = pr_warp_defs.h .PHONY: build clean -build: $(DEFH) $(LIB) +build: $(DEFH) $(OBJS) clean: @for FILE in $(OBJS) ; do \ @@ -88,15 +86,7 @@ rm -f $$FILE.o ; \ done rm -f $(DEFH) - rm -f libwebapp.la - rm -f libwebapp.a rm -rf .libs - -$(LIB): $(WARPH) $(OBJS) $(PROVS) - $(LIBTOOL) --mode=link \ - $(CC) -static -o $@ \ - -rpath $(TGT_DIR) \ - $(OBJS) $(DEFH): $(SRC_DIR)/java/org/apache/catalina/connector/warp/Constants.java cat $ | \ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier02/04/30 17:37:16 Modified:webapp Makedefs.in Makefile.in configure.in webapp/apache-1.3 Makefile.in webapp/lib Makefile.in Log: Reorganization and clean-up of all the autoconf code, with the objective to build Apache 2.0 binaries from APXS/2.0 tomorrow... Revision ChangesPath 1.14 +29 -119 jakarta-tomcat-connectors/webapp/Makedefs.in Index: Makedefs.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makedefs.in 1 Nov 2001 22:20:51 - 1.13 +++ Makedefs.in 1 May 2002 00:37:16 - 1.14 @@ -56,126 +56,36 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makedefs.in,v 1.13 2001/11/01 22:20:51 pier Exp $ +# @version $Id: Makedefs.in,v 1.14 2002/05/01 00:37:16 pier Exp $ .SUFFIXES: .c .o .lo -# - -# Programs discovered by configure during initialization -# - - -TEST = @TEST@ -TRUE = @TRUE@ -ECHO = @ECHO@ -GREP = @GREP@ -CAT = @CAT@ -SED = @SED@ -LN = @LN@ -RM = @RM@ - -# - -# Compilation settings and Makefile macros -# - - -# The target module to build -MODULE = @MODULE@ -# The system which built this binary -SYSTEM = @SYSTEM@ -# Wether to build debug information or not -DEBUG = @DEBUG@ -# The WebApp sources directory -SRCDIR = @SRCDIR@ -# The compilation (this) directory -TGTDIR = @TGTDIR@ -# The directory of a Tomcat 4.0 binary distribution -TC4DIR = @TC4DIR@ -# The list of configure-generated files -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)]: - -# - -# APR library values -# - - -# The APR source directory (if needed) -APR_SRCDIR = @APR_SRCDIR@ -# Where libapr.a resides -APR_LIBDIR = @APR_LIBDIR@ -# Where APR include files are located -APR_INCDIR = @APR_INCDIR@ -# Location of APRVARS -APR_VARFIL = @APR_VARFIL@ -# Extra APR C compilation flags -APR_CFLAGS = @APR_CFLAGS@ -# Extra APR C macro pre-processor flags -APR_CPPFLAGS = @APR_CPPFLAGS@ -# Extra APR inclusion flags -APR_INCLUDES = @APR_INCLUDES@ -# Extra APR linker flags -APR_LDFLAGS = @APR_LDFLAGS@ -# Extra APR libraries required for linking -APR_LIBS = @APR_LIBS@ -# Libtool location -LIBTOOL = @LIBTOOL@ - -# - -# C Compiler settings -# - - -# Library archiver -AR = @AR@ -# C compiler -CC = @CC@ -# C macro pre-processor -CPP = @CPP@ -# Library updater -RANLIB = @RANLIB@ -# C compilation flags -CFLAGS = @CFLAGS@ -# C macro pre-processor flags -CPPFLAGS = @CPPFLAGS@ - -# - -# Java Compiler settings -# - - -# The JVM home directory -JAVA_HOME = @JAVA_HOME@ -# Jar archiver -JAR = @JAR@ -# Java compiler -JAVAC = @JAVAC@ -# JavaDoc documentation tool -JAVADOC = @JAVADOC@ -# Java compilation flags -JAVACFLAGS = @JAVACFLAGS@ -# Java Class Path -CLASSPATH = @CLASSPATH@ - -# - -# ScanDoc Documentation tool settings -# - - -# PERL interpreter -PERL = @PERL@ -# ScanDoc documentation tool -SCANDOC = @SCANDOC@ -# Scandoc flags -SCANDOCFLAGS = @SCANDOCFLAGS@ - -# - -# C-Compilation default setting -# - - -ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) \ - $(APR_CFLAGS) $(APR_CPPFLAGS) $(APR_INCLUDES) \ - -I$(APR_INCDIR) -I$(SRCDIR)/include +# Building tools +CC = @CC@ +CPP = @CPP@ +SHELL= @SHELL@ +LIBTOOL = @LIBTOOL@ +APXS = @APXS@ -.c.o: - $(CC) $(ALL_CFLAGS) -c $ -o $@ - -.c.lo: - $(LIBTOOL) $(CC) -static $(ALL_CFLAGS) -c $ +#
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier02/04/30 17:41:58 Modified:webapp/lib Makefile.in Log: Forgot -I. for the generated pr_warp_defs.h Revision ChangesPath 1.25 +2 -2 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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile.in 1 May 2002 00:37:16 - 1.24 +++ Makefile.in 1 May 2002 00:41:58 - 1.25 @@ -56,9 +56,9 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.24 2002/05/01 00:37:16 pier Exp $ +# @version $Id: Makefile.in,v 1.25 2002/05/01 00:41:58 pier Exp $ -LOCAL_INCLUDES = -I$(SRC_DIR)/include -I$(SRC_DIR)/lib +LOCAL_INCLUDES = -I$(SRC_DIR)/include -I$(SRC_DIR)/lib -I. LOCAL_TGT_DIR = $(TGT_DIR)/lib LOCAL_SRC_DIR = $(SRC_DIR)/lib include @TGT_DIR@/Makedefs -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: pier02/04/30 17:37:16 Modified:webapp Makedefs.in Makefile.in configure.in webapp/apache-1.3 Makefile.in webapp/lib Makefile.in Log: Reorganization and clean-up of all the autoconf code, with the objective to build Apache 2.0 binaries from APXS/2.0 tomorrow... This works on OS/X great, actually better than before because it's MUCH simpler to debug. Tomorrow I'll try it out @work on some solaris 7 and 8 machines. Can someone try it on Linux (you can also wait when the whole kit will be finished up - but might be great to know of issues right now). Pier -- I think that it's extremely foolish to name a server after the current U.S. President. B.W. Fitzpatrick -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
jfclere 02/01/30 01:21:29
Modified:webapp configure.in
webapp/lib Makefile.in
Log:
Remove the logic that build warp.jar using make. Please use ant instead.
Revision ChangesPath
1.50 +3 -120jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- configure.in 23 Nov 2001 12:12:59 - 1.49
+++ configure.in 30 Jan 2002 09:21:29 - 1.50
@@ -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.49 2001/11/23 12:12:59 jfclere Exp $
+dnl Version $Id: configure.in,v 1.50 2002/01/30 09:21:29 jfclere Exp $
dnl --
dnl --
@@ -84,7 +84,7 @@
dnl --
MODULE=
TARGET=lib
-CFGFILES=./Makefile ./Makedefs ./lib/Makefile ./java/Constants.java
+CFGFILES=./Makefile ./Makedefs ./lib/Makefile
APR_CFGFLG=
APR_SRCDIR=
APR_LIBDIR=
@@ -143,7 +143,7 @@
AC_MSG_CHECKING([for debug build])
AC_ARG_ENABLE(debug,
[ --enable-debug enable compilation of debug information messages
- within both C and Java code (this will slow down
+ within C code (this will slow down
execution and create huge log files).],
[
AC_MSG_RESULT([yes])
@@ -157,81 +157,6 @@
AC_SUBST(DEBUG)
dnl -
-dnl Check JAVA environment
-dnl
-dnl New vars: JAVA_HOME JAVAC JAVACFLAGS JAR JAVADOC
-dnl Upd vars: N/A
-dnl -
-LOCAL_HEADER([JAVA-Language compilation tools])
-JAVA_INIT()
-JAVA_JAVAC()
-JAVA_JAR()
-JAVA_JAVADOC()
-
-dnl --
-dnl Process the --with-tomcat=... command line argument
-dnl
-dnl This is always processed, and sets the CLASSPATH variable.
-dnl
-dnl New vars: TC4DIR
-dnl Upd vars: N/A
-dnl -
-AC_ARG_WITH(tomcat,
- [ --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.],
- [
-case ${withval} in
-|yes|YES|true|TRUE)
- TC4DIR=/usr/local/tomcat
- ;;
-*)
- TC4DIR=${withval}
- ;;
-esac
- ],[
-TC4DIR=/usr/local/tomcat
- ]
-)
-AC_SUBST(TC4DIR)
-
-dnl --
-dnl Check that we can build all classes depending on Tomcat if Java is enabled
-dnl
-dnl New vars: CLASSPATH
-dnl Upd vars: TC4DIR TARGET CFGFILES
-dnl --
-if ${TEST} $JAVA_ENABLE = true
-then
- LOCAL_RESOLVEDIR(TC4DIR,${TC4DIR},[tomcat distribution directory])
-
- if ${TEST} ! -f ${TC4DIR}/common/lib/servlet.jar
- then
-AC_MSG_ERROR([Cannot find Servlet 2.3 jar in \${TC4DIR}\])
- fi
-
- if ${TEST} ! -f ${TC4DIR}/server/lib/catalina.jar
- then
-AC_MSG_ERROR([Cannot find Catalina jar in \${TC4DIR}\])
- fi
-
- if ${TEST} -z ${CLASSPATH}
- then
-CLASSPATH=${TC4DIR}/common/lib/servlet.jar
- else
-CLASSPATH=${CLASSPATH}:${TC4DIR}/common/lib/servlet.jar
- fi
- CLASSPATH=${CLASSPATH}:${TC4DIR}/server/lib/catalina.jar
-
- TARGET=${TARGET} java
- CFGFILES=${CFGFILES} ./java/Makefile
-else
- CLASSPATH=
- TC4DIR=
-fi
-AC_SUBST(CLASSPATH)
-
-dnl -
dnl Check wether we have to build the C API documentation or not
dnl
dnl New vars: PERL SCANDOC SCANDOCFLAGS
@@ -292,48 +217,6 @@
AC_SUBST(PERL)
AC_SUBST(SCANDOC)
AC_SUBST(SCANDOCFLAGS)
-
-dnl -
-dnl Check wether we have to build the Java API documentation or not
-dnl
-dnl New vars: N/A
-dnl Upd vars: JAVADOC TARGET
-dnl -
-AC_MSG_CHECKING([for Java API documentation])
-AC_ARG_ENABLE(apidocs-java,
- [ --enable-apidocs-java[=JAVADOC]
-
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier01/09/16 16:59:27
Modified:webapp/lib Makefile.in
Log:
Removed dependancies on LibTool for compilation as it's broken on more
platforms than in the ones in which it works (I don't want to include all
libtool hacks used by APR).
Revision ChangesPath
1.14 +47 -37jakarta-tomcat-connectors/webapp/lib/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 2001/08/06 20:23:43 1.13
+++ Makefile.in 2001/09/16 23:59:27 1.14
@@ -56,44 +56,54 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makefile.in,v 1.13 2001/08/06 20:23:43 pier Exp $
+# @version $Id: Makefile.in,v 1.14 2001/09/16 23:59:27 pier Exp $
-include @SRCDIR@/Makedefs
+include @TGTDIR@/Makedefs
-OBJS = wa_main.lo wa_config.lo wa_request.lo
-PROVS = pr_info.lo \
- pr_warp.lo \
- pr_warp_packet.lo \
- pr_warp_network.lo \
- pr_warp_config.lo
-
-LIB = libwebapp.la
-
-all: pr_warp_defs.h $(LIB)
-
-$(LIB): $(OBJS) $(PROVS)
- @$(ECHO) Creating library $(LIB)
- @$(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -static -o $(LIB) \
- $(OBJS) $(PROVS) 1 /dev/null
-
-pr_warp_defs.h: @SRCDIR@/java/Constants.java
- @$(ECHO) Generating pr_warp_defs.h
- @$(CAT) @SRCDIR@/java/Constants.java | \
- grep TYPE_ | \
- sed s/public static final int/#define/g | \
- sed y/=;/ / pr_warp_defs.h
+SRCS = pr_info.c \
+ pr_warp.c \
+ pr_warp.h \
+ pr_warp_config.c \
+ pr_warp_network.c \
+ pr_warp_packet.c \
+ wa_config.c \
+ wa_main.c \
+ wa_request.c \
+
+OBJS = wa_main.o \
+ wa_config.o \
+ wa_request.o
+
+PROVS = pr_info.o \
+ pr_warp.o \
+ pr_warp_packet.o \
+ pr_warp_network.o \
+ pr_warp_config.o
+LIB =libwebapp.a
+
+WARPH = pr_warp_defs.h
+
+build: $(LIB)
+
clean:
- @for ENTRY in *.o *.lo $(LIB) pr_warp_defs.h .libs ; \
- do \
- if $(TEST) -f $${ENTRY} ; \
- then \
- $(ECHO) Removing file $${ENTRY} ; \
- $(RM) -f $${ENTRY} ; \
- fi ; \
- if $(TEST) -d $${ENTRY} ; \
- then \
- $(ECHO) Removing directory $${ENTRY} ; \
- $(RM) -rf $${ENTRY} ; \
- fi ; \
- done
+ @$(MECHO) Cleaning up
+ @$(DEXEC) $(RM) -f $(OBJS) $(PROVS) $(LIB) $(WARPH)
+
+$(LIB): $(SRCS) $(WARPH) $(OBJS) $(PROVS)
+ @$(MECHO) Creating library \$@\
+ @$(DEXEC) $(AR) cr $@ $(OBJS) $(PROVS)
+ @$(DEXEC) $(RANLIB) $@
+
+pr_warp_defs.h: $(SRCDIR)/java/Constants.java
+ @$(MECHO) Generating \$@\
+ @$(CAT) $ | \
+ $(GREP) TYPE_ | \
+ $(SED) s/public static final int/#define/g | \
+ $(SED) y/=;/ / $@
+
+$(SRCS):
+ @$(MECHO) Linking \$@\
+ @$(DEXEC) $(LN) -s $(SRCDIR)/lib/$@ ./$@
+
+
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier01/09/16 17:09:41 Modified:webapp/apache-1.3 Makefile.in webapp/lib Makefile.in Log: Removed DEBUG compilation and enabled verbose. Revision ChangesPath 1.13 +3 -5 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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.in 2001/09/16 23:57:47 1.12 +++ Makefile.in 2001/09/17 00:09:41 1.13 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.12 2001/09/16 23:57:47 pier Exp $ +# @version $Id: Makefile.in,v 1.13 2001/09/17 00:09:41 pier Exp $ include @TGTDIR@/Makedefs @@ -71,8 +71,7 @@ build: $(MOD) clean: - @$(MECHO) Cleaning up - @$(DEXEC) $(RM) -f $(OBJS) $(MOD) + $(RM) -f $(OBJS) $(MOD) $(MOD): $(SRCS) @$(APXS) -c \ @@ -84,5 +83,4 @@ $(SRCS): @$(MECHO) Linking \$@\ - @$(DEXEC) $(LN) -s $(SRCDIR)/apache-1.3/$@ ./$@ - + $(LN) -s $(SRCDIR)/apache-1.3/$@ ./$@ 1.15 +5 -7 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.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.in 2001/09/16 23:59:27 1.14 +++ Makefile.in 2001/09/17 00:09:41 1.15 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.14 2001/09/16 23:59:27 pier Exp $ +# @version $Id: Makefile.in,v 1.15 2001/09/17 00:09:41 pier Exp $ include @TGTDIR@/Makedefs @@ -87,13 +87,12 @@ build: $(LIB) clean: - @$(MECHO) Cleaning up - @$(DEXEC) $(RM) -f $(OBJS) $(PROVS) $(LIB) $(WARPH) + $(RM) -f $(OBJS) $(PROVS) $(LIB) $(WARPH) $(LIB): $(SRCS) $(WARPH) $(OBJS) $(PROVS) @$(MECHO) Creating library \$@\ - @$(DEXEC) $(AR) cr $@ $(OBJS) $(PROVS) - @$(DEXEC) $(RANLIB) $@ + $(AR) cr $@ $(OBJS) $(PROVS) + $(RANLIB) $@ pr_warp_defs.h: $(SRCDIR)/java/Constants.java @$(MECHO) Generating \$@\ @@ -103,7 +102,6 @@ $(SED) y/=;/ / $@ $(SRCS): - @$(MECHO) Linking \$@\ - @$(DEXEC) $(LN) -s $(SRCDIR)/lib/$@ ./$@ + $(LN) -s $(SRCDIR)/lib/$@ ./$@
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier01/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 ChangesPath
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 -10jakarta-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
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier01/08/06 13:23:43
Modified:webapp/lib Makefile.in
Log:
Patching build process.
Revision ChangesPath
1.13 +25 -8 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.in 2001/07/18 19:08:35 1.12
+++ Makefile.in 2001/08/06 20:23:43 1.13
@@ -56,7 +56,7 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makefile.in,v 1.12 2001/07/18 19:08:35 pier Exp $
+# @version $Id: Makefile.in,v 1.13 2001/08/06 20:23:43 pier Exp $
include @SRCDIR@/Makedefs
@@ -69,14 +69,31 @@
LIB = libwebapp.la
-all: $(LIB)
+all: pr_warp_defs.h $(LIB)
-$(LIB): $(OBJS) $(PROVS) @SRCDIR@/Makedefs
- @echo Creating library $(LIB)
- @$(LIBTOOL) --silent --mode=link $(CC) -static -o $(LIB) \
+$(LIB): $(OBJS) $(PROVS)
+ @$(ECHO) Creating library $(LIB)
+ @$(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -static -o $(LIB) \
$(OBJS) $(PROVS) 1 /dev/null
-clean:
- @echo Removing *.o *.lo $(LIB) .libs
- @rm -rf *.o *.lo $(LIB) .libs
+pr_warp_defs.h: @SRCDIR@/java/Constants.java
+ @$(ECHO) Generating pr_warp_defs.h
+ @$(CAT) @SRCDIR@/java/Constants.java | \
+ grep TYPE_ | \
+ sed s/public static final int/#define/g | \
+ sed y/=;/ / pr_warp_defs.h
+clean:
+ @for ENTRY in *.o *.lo $(LIB) pr_warp_defs.h .libs ; \
+ do \
+ if $(TEST) -f $${ENTRY} ; \
+ then \
+ $(ECHO) Removing file $${ENTRY} ; \
+ $(RM) -f $${ENTRY} ; \
+ fi ; \
+ if $(TEST) -d $${ENTRY} ; \
+ then \
+ $(ECHO) Removing directory $${ENTRY} ; \
+ $(RM) -rf $${ENTRY} ; \
+ fi ; \
+ done
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
pier01/07/12 19:08:45 Modified:webapp/lib Makefile.in Log: Build now depends on Makedefs (if we change the file, we rebuild the module) Revision ChangesPath 1.11 +2 -2 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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile.in 2001/07/08 23:11:45 1.10 +++ Makefile.in 2001/07/13 02:08:42 1.11 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.10 2001/07/08 23:11:45 pier Exp $ +# @version $Id: Makefile.in,v 1.11 2001/07/13 02:08:42 pier Exp $ include @SRCDIR@/Makedefs @@ -67,7 +67,7 @@ all: $(LIB) -$(LIB): $(OBJS) $(PROVS) +$(LIB): $(OBJS) $(PROVS) @SRCDIR@/Makedefs @echo Creating library $(LIB) @$(LIBTOOL) --silent --mode=link $(CC) -static -o $(LIB) \ $(OBJS) $(PROVS) 1 /dev/null
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
jfclere 01/06/22 02:45:59 Modified:webapp Makefile.in webapp/apache-1.3 Makefile.in webapp/lib Makefile.in Log: Add make install (via apxs -i). Change the make -C to (cd ; make). Revision ChangesPath 1.5 +14 -3 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.in 2001/05/10 06:05:41 1.4 +++ Makefile.in 2001/06/22 09:45:56 1.5 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.4 2001/05/10 06:05:41 pier Exp $ +# @version $Id: Makefile.in,v 1.5 2001/06/22 09:45:56 jfclere Exp $ include Makedefs @@ -73,7 +73,7 @@ all: @for DIR in $(DIRS) ; do \ echo Compiling sources in $$DIR... ; \ - $(MAKE) -C $$DIR all ; \ + (cd $$DIR; $(MAKE) all) ; \ RET=$$? ; \ if ( test $$RET != 0 ) ; then \ exit $$RET ; \ @@ -83,12 +83,23 @@ clean: @for DIR in $(DIRS) ; do \ echo Cleaning up $$DIR... ; \ - $(MAKE) -C $$DIR clean ; \ + (cd $$DIR; $(MAKE) clean) ; \ RET=$$? ; \ if ( test $$RET != 0 ) ; then \ exit $$RET ; \ fi ; \ done + +install: + @for DIR in $(DIRS) ; do \ + echo Installing $$DIR... ; \ + (cd $$DIR; $(MAKE) install) ; \ + RET=$$? ; \ + if ( test $$RET != 0 ) ; then \ + exit $$RET ; \ + fi ; \ + done + apidocs: include/*.h @echo Generating API documentation... 1.2 +4 -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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 2001/05/10 06:13:29 1.1 +++ Makefile.in 2001/06/22 09:45:57 1.2 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.1 2001/05/10 06:13:29 pier Exp $ +# @version $Id: Makefile.in,v 1.2 2001/06/22 09:45:57 jfclere Exp $ include ../Makedefs @@ -69,6 +69,9 @@ mod_webapp.so: @echo Linking Apache 1.3.x module @$(APXS) -c $(APXSFLAGS) mod_webapp.c +install: mod_webapp.so + @echo Installing Apache 1.3.x module + @$(APXS) -i mod_webapp.so clean: @echo Removing object files $(OBJS) $(MODULE) 1.9 +4 -1 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.in 2001/05/10 21:12:31 1.8 +++ Makefile.in 2001/06/22 09:45:58 1.9 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.8 2001/05/10 21:12:31 pier Exp $ +# @version $Id: Makefile.in,v 1.9 2001/06/22 09:45:58 jfclere Exp $ include ../Makedefs @@ -75,3 +75,6 @@ clean: @echo Removing object files $(OBJS) $(PROVS) $(LIB) @rm -f $(OBJS) $(PROVS) $(LIB) + +install: +
