RE: cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
All those new things in configure have been tested only on MacOS/X, if someone gets around to do it before tomorrow evening, I'd like to know if I screwed up something on the other systems (J.F., Henri, Punky... Can you just run ./configure with the new options? Make sure you have ANT :) Urg you're using ant now :---) We're getting closer and closer to a more-and-more decent autoconf-style make... :) And closer to a release! :) good, it seems pier does a so decent works on webapp autoconf that I may steal it at a later time for jk/jk2 ;) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
GOMEZ Henri [EMAIL PROTECTED] wrote: All those new things in configure have been tested only on MacOS/X, if someone gets around to do it before tomorrow evening, I'd like to know if I screwed up something on the other systems (J.F., Henri, Punky... Can you just run ./configure with the new options? Make sure you have ANT :) Urg you're using ant now :---) Don't tell me... The most utterly ugly syntax I've ever seen, but... Since the change was pushed into CVS without me knowing it some months ago, what should I do? :) We're getting closer and closer to a more-and-more decent autoconf-style make... :) And closer to a release! :) good, it seems pier does a so decent works on webapp autoconf that I may steal it at a later time for jk/jk2 ;) Call it a 5 years long experience of M4 and POSIX shell scripts? Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
good, it seems pier does a so decent works on webapp autoconf that I may steal it at a later time for jk/jk2 ;) Call it a 5 years long experience of M4 and POSIX shell scripts? Well, I must admin that's one of the clearer autoconf file I ever see (I like the sinclude way). I'll finish my initial dirty autoconf works on jk2 and will see how to use some of your goodies (will need a rename of WA_ in MOD_) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
GOMEZ Henri wrote: good, it seems pier does a so decent works on webapp autoconf that I may steal it at a later time for jk/jk2 ;) Call it a 5 years long experience of M4 and POSIX shell scripts? Well, I must admin that's one of the clearer autoconf file I ever see (I like the sinclude way). I'll finish my initial dirty autoconf works on jk2 and will see how to use some of your goodies (will need a rename of WA_ in MOD_) WA_ in JK_? what MOD_ mean? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
I'll finish my initial dirty autoconf works on jk2 and will see how to use some of your goodies (will need a rename of WA_ in MOD_) WA_ in JK_? ;) what MOD_ mean? module (more generic than just JK_ or JK2_) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
GOMEZ Henri [EMAIL PROTECTED] wrote: good, it seems pier does a so decent works on webapp autoconf that I may steal it at a later time for jk/jk2 ;) Call it a 5 years long experience of M4 and POSIX shell scripts? Well, I must admin that's one of the clearer autoconf file I ever see (I like the sinclude way). Yeah... The latest addition at the bottom are still in configure.in (for the time being), but they'll be rotated out once I test them on the other Oses (gotta go now to see those nifty E4500! TOOOYYSSS!!! :) I'll finish my initial dirty autoconf works on jk2 and will see how to use some of your goodies (will need a rename of WA_ in MOD_) Just use them as WA, also all variables in each M4 macro is localized, and that prefix name will disappear when you build the full configure script. :) (so nobody will know you got them from WebApp! :) Pier -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
I'll finish my initial dirty autoconf works on jk2 and will see how to use some of your goodies (will need a rename of WA_ in MOD_) Just use them as WA, also all variables in each M4 macro is localized, and that prefix name will disappear when you build the full configure script. :) (so nobody will know you got them from WebApp! :) LOL -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
Pier Fumagalli wrote: [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: pier02/05/13 17:22:34 Modified:webapp Makefile.in Log: Added how to invoke ANT from Make (still need to do the clean target) All those new things in configure have been tested only on MacOS/X, if someone gets around to do it before tomorrow evening, I'd like to know if I screwed up something on the other systems (J.F., Henri, Punky... Can you just run ./configure with the new options? Make sure you have ANT :) +++ $ /home/jakarta/jakarta-ant-1.4/bin/ant -version Apache Ant version 1.5Beta1 compiled on April 30 2002 $ /home/jakarta/jakarta-ant-1.5Beta1/bin/ant -version Apache Ant version 1.5Beta1 compiled on April 30 2002 jakarta@vtxclere:~ jakarta-ant-1.3/bin/ant -version Ant version 1.4 compiled on September 3 2001 +++ Strange no? My 1.3 looks a 1.4 ;-) And what about the cut? We're getting closer and closer to a more-and-more decent autoconf-style make... :) And closer to a release! :) Time for a nap, tomorrow I won't be reachable until late afternoon (visiting a couple of new E4500 just arrived at the colo! :) Woohoo, TOYS!!! ) 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] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier02/05/14 14:49:51 Modified:webapp Makefile.in Log: Added comments and C-API docs targets Revision ChangesPath 1.34 +57 -30jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Makefile.in 14 May 2002 00:22:34 - 1.33 +++ Makefile.in 14 May 2002 21:49:51 - 1.34 @@ -56,10 +56,13 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.33 2002/05/14 00:22:34 pier Exp $ +# @version $Id: Makefile.in,v 1.34 2002/05/14 21:49:51 pier Exp $ include @TGT_DIR@/Makedefs +# = # +# Generic/global compilation targets# +# = # all: build distclean: extra-clean @@ -77,48 +80,51 @@ clean: lib-clean $(MODULE)-clean rm -rf $(OBJ_DIR) -dist: $(DST_DIR) build - $(INSTALL) $(SRC_DIR)/LICENSE.txt $(DST_DIR) - $(INSTALL) $(SRC_DIR)/INSTALL.txt $(DST_DIR) - $(INSTALL) $(TGT_DIR)/DETAILS.txt $(DST_DIR) - $(INSTALL) $(TGT_DIR)/$(MODULE)/$(MODFILE) $(DST_DIR) - -tarball: dist - cd $(TGT_DIR) - rm -rf $(TARBALL) - mkdir $(TARBALL) - cp -R $(DST_DIR)/. $(TARBALL) - tar -cf $(TARBALL).tar $(TARBALL) - gzip -9f $(TARBALL).tar - rm -rf $(TARBALL) - -$(LIB_DIR): $(BLD_DIR) - mkdir $(LIB_DIR) - -$(OBJ_DIR): $(BLD_DIR) - mkdir $(OBJ_DIR) - -$(BLD_DIR): - mkdir $(BLD_DIR) - -$(DST_DIR): - mkdir $(DST_DIR) - -$(MODULE)-build: +# = # +# Build the MODULE module, and copy the resulting file in the build dir.# +# = # +$(MODULE)-build: $(BLD_DIR) @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/$(MODULE) SUBT=build subdir + @$(INSTALL) $(TGT_DIR)/$(MODULE)/$(MODFILE) $(BLD_DIR) $(MODULE)-clean: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/$(MODULE) SUBT=clean subdir + @rm -f $(BLD_DIR)/$(MODFILE) +# = # +# Build all WebApp library files# +# = # lib-build: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/lib SUBT=build subdir lib-clean: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/lib SUBT=clean subdir +# = # +# Run ANT to generate all stuff it generates (jar,docs,javadocs)# +# = # ant-build: - @$(ANT) -buildfile $(SRC_DIR)/build.xml init $(ANT_TGT) + $(ANT) -buildfile $(SRC_DIR)/build.xml init $(ANT_TARGETS) + +ant-clean: + $(ANT) -buildfile $(SRC_DIR)/build.xml clean +# = # +# Run PERL to generate our C-API documentation with scandoc # +# = # +capi-build: $(API_DIR) + $(PERL) $(SRC_DIR)/support/scandoc.pl \ + -i $(SRC_DIR)/support/template.pl \ + -p $(API_DIR)/ \ + $(SRC_DIR)/include/*.h + +capi-clean: + @echo Cleaning up generated C-API documentation + @rm -rf $(API_DIR)/* + +# = # +# Call APR and generate the library when we are building for Apache 1.3 # +# = # apr-build: $(LIB_DIR) @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(APR_DIR) SUBT=all subdir $(LIBTOOL) --mode=install \ @@ -128,8 +134,29 @@ apr-clean: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(APR_DIR) SUBT=clean subdir +# = # +# Invoke MAKE into a subdir (nicely notified by some messages) # +# = # subdir: @echo @echo $(MAKE)[$(MAKELEVEL)]: Entering directory \$(SUBD)\ @$(MAKE) -C $(SUBD) $(SUBF) $(SUBT) @echo $(MAKE)[$(MAKELEVEL)]: Exiting directory \$(SUBD)\ + +# = # +# Targets to
Re: cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
Pier, All those new things in configure have been tested only on MacOS/X, if someone gets around to do it before tomorrow evening, I'd like to know if I screwed up something on the other systems (J.F., Henri, Punky... Can you just run ./configure with the new options? Make sure you have ANT :) Pier Yeh, I will try. These days, I has been monitoring the cvs commit on webapp. It seems that there are so many changes. For example, the adding of invoking ant from make, removal of dist target and blah blah blah. And I may need some time to make it build in freebsd because I want my build system work in my linux box before moving to freebsd. We're getting closer and closer to a more-and-more decent autoconf-style make... :) And closer to a release! :) good. Actually I'm still learning autoconf. Time for a nap, tomorrow I won't be reachable until late afternoon (visiting a couple of new E4500 just arrived at the colo! :) Woohoo, TOYS!!! ) cool. What about your Mac now? Punky -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier02/05/13 17:22:34 Modified:webapp Makefile.in Log: Added how to invoke ANT from Make (still need to do the clean target) Revision ChangesPath 1.33 +4 -1 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Makefile.in 13 May 2002 23:25:09 - 1.32 +++ Makefile.in 14 May 2002 00:22:34 - 1.33 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.32 2002/05/13 23:25:09 pier Exp $ +# @version $Id: Makefile.in,v 1.33 2002/05/14 00:22:34 pier Exp $ include @TGT_DIR@/Makedefs @@ -115,6 +115,9 @@ lib-clean: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/lib SUBT=clean subdir + +ant-build: + @$(ANT) -buildfile $(SRC_DIR)/build.xml init $(ANT_TGT) apr-build: $(LIB_DIR) @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(APR_DIR) SUBT=all subdir -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: pier02/05/13 17:22:34 Modified:webapp Makefile.in Log: Added how to invoke ANT from Make (still need to do the clean target) All those new things in configure have been tested only on MacOS/X, if someone gets around to do it before tomorrow evening, I'd like to know if I screwed up something on the other systems (J.F., Henri, Punky... Can you just run ./configure with the new options? Make sure you have ANT :) We're getting closer and closer to a more-and-more decent autoconf-style make... :) And closer to a release! :) Time for a nap, tomorrow I won't be reachable until late afternoon (visiting a couple of new E4500 just arrived at the colo! :) Woohoo, TOYS!!! ) 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 Makefile.in
pier02/05/01 08:27:51 Modified:webapp Makefile.in Log: Wrong dependancy. Revision ChangesPath 1.28 +2 -2 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile.in 1 May 2002 00:37:16 - 1.27 +++ Makefile.in 1 May 2002 15:27:51 - 1.28 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.27 2002/05/01 00:37:16 pier Exp $ +# @version $Id: Makefile.in,v 1.28 2002/05/01 15:27:51 pier Exp $ include @TGT_DIR@/Makedefs @@ -73,7 +73,7 @@ build: lib-build $(MODULE)-build clean: lib-clean $(MODULE)-clean -$(MODULE)-build: libapr.la +$(MODULE)-build: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/$(MODULE) SUBT=build subdir $(MODULE)-clean: -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier02/05/01 14:26:28 Modified:webapp Makefile.in Log: Reorganized how we make dependancies on libraries... Revision ChangesPath 1.29 +14 -16jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Makefile.in 1 May 2002 15:27:51 - 1.28 +++ Makefile.in 1 May 2002 21:26:28 - 1.29 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.28 2002/05/01 15:27:51 pier Exp $ +# @version $Id: Makefile.in,v 1.29 2002/05/01 21:26:28 pier Exp $ include @TGT_DIR@/Makedefs @@ -68,10 +68,17 @@ rm -f Makedefs rm -f Makefile -extra-build: @EXTRA_BUILD@ build -extra-clean: @EXTRA_BUILD@ clean -build: lib-build $(MODULE)-build +extra-build: $(OBJ_DIR) @EXTRA_BUILD@ build + +extra-clean: @EXTRA_CLEAN@ clean + +build: $(OBJ_DIR) lib-build $(MODULE)-build + clean: lib-clean $(MODULE)-clean + rm -rf $(OBJ_DIR)/* + +$(OBJ_DIR): + mkdir $(OBJ_DIR) $(MODULE)-build: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/$(MODULE) SUBT=build subdir @@ -81,27 +88,18 @@ lib-build: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/lib SUBT=build subdir - @echo $(MAKE): Installing library libwebapp.la - $(LIBTOOL) --mode=install cp \ - $(TGT_DIR)/lib/libwebapp.la \ - $(TGT_DIR)/libwebapp.la /dev/null lib-clean: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(TGT_DIR)/lib SUBT=clean subdir - rm -f libwebapp.la - rm -f libwebapp.a apr-build: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(APR_DIR) SUBT=all subdir - @echo $(MAKE): Installing library libapr.la - $(LIBTOOL) --mode=install cp \ - $(APR_DIR)/libapr.la \ - $(TGT_DIR)/libapr.la /dev/null + $(LIBTOOL) --mode=install \ + cp $(APR_DIR)/libapr.la $(OBJ_DIR)/libapr.la + $(LIBTOOL) --mode=finish $(OBJ_DIR) apr-clean: @$(MAKE) SUBF=$(MAKEFLAGS) SUBD=$(APR_DIR) SUBT=clean subdir - rm -f libapr.la - rm -f libapr.a subdir: @echo -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
jfclere 02/01/22 03:05:06
Modified:webapp Makefile.in
Log:
Add javadoc and scandoc generation.
Revision ChangesPath
1.25 +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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in 1 Nov 2001 22:20:51 - 1.24
+++ Makefile.in 22 Jan 2002 11:05:06 - 1.25
@@ -56,7 +56,7 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makefile.in,v 1.24 2001/11/01 22:20:51 pier Exp $
+# @version $Id: Makefile.in,v 1.25 2002/01/22 11:05:06 jfclere Exp $
include @TGTDIR@/Makedefs
@@ -114,9 +114,15 @@
@$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=apache-2.0 MTGT=clean
apidocs-c-build:
+ mkdir docs/api-c
+ support/scandoc.pl -i support/template.pl -p docs/api-c/ */*.h
apidocs-c-clean:
+ $(RM) -rf docs/api-c
apidocs-java-build:
+ mkdir docs/api-java
+ javadoc java/*.java -d docs/api-java
apidocs-java-clean:
+ $(RM) -rf docs/api-java
template:
@ { \
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier01/09/16 17:08:56
Modified:webapp Makefile.in
Log:
New Makefile.
Revision ChangesPath
1.18 +45 -90jakarta-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 mailto:[EMAIL PROTECTED]
-# @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 ; \
+ }
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier01/09/16 22:06:27 Modified:webapp Makefile.in Log: Added local (non APR) targets. Revision ChangesPath 1.20 +10 -3 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile.in 2001/09/17 00:42:59 1.19 +++ Makefile.in 2001/09/17 05:06:27 1.20 @@ -56,17 +56,18 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.19 2001/09/17 00:42:59 pier Exp $ +# @version $Id: Makefile.in,v 1.20 2001/09/17 05:06:27 pier Exp $ include @TGTDIR@/Makedefs all: build - build: @TARGET_BUILD@ - clean: @TARGET_CLEAN@ +lbuild: @TARGET_LBUILD@ +lclean: @TARGET_LCLEAN@ distclean: clean + @$(ECHO) $(LSTFILE) @$(MECHO) Removing makefile generated files $(RM) -f `$(CAT) $(LSTFILE)` $(RM) -f $(LSTFILE) @@ -93,6 +94,12 @@ lib-clean: @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=lib MTGT=clean + +java-build: + @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=java MTGT=build + +java-clean: + @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=java MTGT=clean apache-1.3-build: @$(MAKE) template MFLG=$(MAKEFLAGS) MDIR=apache-1.3 MTGT=build
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in configure.in
pier01/08/06 15:21:52
Modified:webapp Makefile.in configure.in
Log:
Finishing touch to build process. Re-enabling APR configure calls and
modified global Makefile to use the right discovered binaries.
Revision ChangesPath
1.15 +28 -26jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.in 2001/08/06 02:47:21 1.14
+++ Makefile.in 2001/08/06 22:21:52 1.15
@@ -56,7 +56,7 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makefile.in,v 1.14 2001/08/06 02:47:21 pier Exp $
+# @version $Id: Makefile.in,v 1.15 2001/08/06 22:21:52 pier Exp $
include @SRCDIR@/Makedefs
@@ -64,7 +64,7 @@
APRDIR = @APRDIR@
CFGS = @CONFIGFILES@ \
- ./lib/pr_warp_defs.h \
+ @SRCDIR@/lib/pr_warp_defs.h \
config.cache \
config.log \
config.status
@@ -74,61 +74,63 @@
clean: apr-clean local-clean
distclean: clean
- @echo Removing configure generated files...
- @rm -f $(CFGS)
+ @$(ECHO)
+ @$(ECHO) Removing configure generated files...
+ @$(RM) -f $(CFGS)
cvsclean: distclean
- @echo Removing configure script...
- @rm -f configure
+ @$(ECHO)
+ @$(ECHO) Removing configure script...
+ @$(ECHO) -f configure
apr-all:
@for DIR in $(APRDIR) ; do \
- echo ; \
- echo Compiling sources in $$DIR... ; \
- cd $$DIR ; \
+ $(ECHO) ; \
+ $(ECHO) Compiling sources in $${DIR}... ; \
+ cd $${DIR} ; \
$(MAKE) all ; \
RET=$$? ; \
cd $(SRCDIR) ; \
- if test $$RET != 0 ; then \
- exit $$RET ; \
+ if $(TEST) $${RET} != 0 ; then \
+ exit $${RET} ; \
fi ; \
done
apr-clean:
@for DIR in $(APRDIR) ; do \
- echo ; \
- echo Cleaning up $$DIR... ; \
- cd $$DIR ; \
+ $(ECHO) ; \
+ $(ECHO) Cleaning up $${DIR}... ; \
+ cd $${DIR} ; \
$(MAKE) clean ; \
RET=$$? ; \
cd $(SRCDIR) ; \
- if test $$RET != 0 ; then \
- exit $$RET ; \
+ if test $${RET} != 0 ; then \
+ exit $${RET} ; \
fi ; \
done
local-all:
@for DIR in $(LOCALDIRS) ; do \
- echo ; \
- echo Compiling sources in $$DIR... ; \
- cd $$DIR ; \
+ $(ECHO) ; \
+ $(ECHO) Compiling sources in $${DIR}... ; \
+ cd $${DIR} ; \
$(MAKE) all ; \
RET=$$? ; \
cd $(SRCDIR) ; \
- if test $$RET != 0 ; then \
- exit $$RET ; \
+ if test $${RET} != 0 ; then \
+ exit $${RET} ; \
fi ; \
done
local-clean:
@for DIR in $(LOCALDIRS) ; do \
- echo ; \
- echo Cleaning up $$DIR... ; \
- cd $$DIR ; \
+ $(ECHO) ; \
+ $(ECHO) Cleaning up $${DIR}... ; \
+ cd $${DIR} ; \
$(MAKE) clean ; \
RET=$$? ; \
cd $(SRCDIR) ; \
- if test $$RET != 0 ; then \
- exit $$RET ; \
+ if test $${RET} != 0 ; then \
+ exit $${RET} ; \
fi ; \
done
1.21 +6 -6 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure.in 2001/08/06 21:02:27 1.20
+++ configure.in 2001/08/06 22:21:52 1.21
@@ -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.20 2001/08/06 21:02:27 pier Exp $
+dnl Version $Id: configure.in,v 1.21 2001/08/06 22:21:52 pier Exp $
dnl --
dnl --
@@ -245,17 +245,17 @@
cd ${APRDIR}
LOCAL_HEADER([Building APR configure
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier01/07/18 11:45:05 Modified:webapp Makefile.in Log: Updated (local/apr)_(clean/all) to be (local/apr)-(clean/all) as APR does. Revision ChangesPath 1.13 +7 -7 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.in 2001/07/18 18:28:43 1.12 +++ Makefile.in 2001/07/18 18:45:05 1.13 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.12 2001/07/18 18:28:43 pier Exp $ +# @version $Id: Makefile.in,v 1.13 2001/07/18 18:45:05 pier Exp $ include @SRCDIR@/Makedefs @@ -68,9 +68,9 @@ config.log \ config.status -all: apr_all local_all +all: apr-all local-all -clean: apr_clean local_clean +clean: apr-clean local-clean distclean: clean @echo Removing configure generated files... @@ -80,7 +80,7 @@ @echo Removing configure script... @rm -f configure -apr_all: +apr-all: @for DIR in $(APRDIR) ; do \ echo ; \ echo Compiling sources in $$DIR... ; \ @@ -93,7 +93,7 @@ fi ; \ done -apr_clean: +apr-clean: @for DIR in $(APRDIR) ; do \ echo ; \ echo Cleaning up $$DIR... ; \ @@ -106,7 +106,7 @@ fi ; \ done -local_all: +local-all: @for DIR in $(LOCALDIRS) ; do \ echo ; \ echo Compiling sources in $$DIR... ; \ @@ -119,7 +119,7 @@ fi ; \ done -local_clean: +local-clean: @for DIR in $(LOCALDIRS) ; do \ echo ; \ echo Cleaning up $$DIR... ; \
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in README.txt configure.in
pier01/07/15 01:44:50
Modified:webapp Makefile.in README.txt configure.in
Log:
Fixes in build process (and documented).
Revision ChangesPath
1.11 +4 -8 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 2001/07/13 02:27:47 1.10
+++ Makefile.in 2001/07/15 08:44:49 1.11
@@ -56,21 +56,17 @@
# = #
# @author Pier Fumagalli mailto:[EMAIL PROTECTED]
-# @version $Id: Makefile.in,v 1.10 2001/07/13 02:27:47 pier Exp $
+# @version $Id: Makefile.in,v 1.11 2001/07/15 08:44:49 pier Exp $
include @SRCDIR@/Makedefs
LOCALDIRS = @TGTDIRS@ @TARGET@
APRDIR = @APRDIR@
-CFGS = config.cache \
+CFGS = @CONFIGFILES@ \
+ config.cache \
config.log \
- config.status \
- Makedefs \
- Makefile \
- lib/Makefile \
- apache-1.3/Makefile \
- java/Makefile
+ config.status
all: apr_all local_all
1.7 +1 -1 jakarta-tomcat-connectors/webapp/README.txt
Index: README.txt
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/README.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- README.txt2001/07/13 02:05:43 1.6
+++ README.txt2001/07/15 08:44:49 1.7
@@ -42,7 +42,7 @@
want to use them instead of checking them out from CVS, you can
specify where these can be found.
---with-java=DIR
+--with-jdk=DIR
If the JAVA_HOME environment variable has not been set, you will
need to specify this option on the command line for the configure
script in order to compile the Java portion of WebApp.
1.17 +14 -4 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in 2001/07/13 02:51:36 1.16
+++ configure.in 2001/07/15 08:44:49 1.17
@@ -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.16 2001/07/13 02:51:36 pier Exp $
+dnl Version $Id: configure.in,v 1.17 2001/07/15 08:44:49 pier Exp $
dnl --
dnl --
@@ -137,10 +137,13 @@
[
AC_MSG_RESULT([enabling debug output])
CFLAGS=$CFLAGS -DDEBUG
+DEBUG=true
],[
AC_MSG_RESULT([disabling debug output])
+DEBUG=false
]
)
+AC_SUBST(DEBUG)
dnl -
dnl Check JAVA environment
@@ -291,10 +294,17 @@
dnl Defining variables used by Make
dnl --
CFLAGS=-Wall ${CFLAGS}
-CPPFLAGS=-I${SRCDIR}/include -I${APRDIR}/include ${CPPFLAGS}
-TGTDIRS=${SRCDIR}/java ${SRCDIR}/lib
AC_SUBST(CFLAGS)
+
+CPPFLAGS=-I${SRCDIR}/include -I${APRDIR}/include ${CPPFLAGS}
AC_SUBST(CPPFLAGS)
+
+TGTDIRS=${SRCDIR}/java ${SRCDIR}/lib
AC_SUBST(TGTDIRS)
+
+CONFIGFILES=./Makedefs ./Makefile ./lib/Makefile ./java/Makefile
+CONFIGFILES=$CONFIGFILES ./java/Constants.java ${makefile}
+AC_SUBST(CONFIGFILES)
+
+AC_OUTPUT(${CONFIGFILES})
-AC_OUTPUT(./Makedefs ./Makefile ./lib/Makefile ./java/Makefile ${makefile})
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier01/07/12 19:10:25 Modified:webapp Makefile.in Log: Little forgotted file that needed to be deleted when we call make distclean Revision ChangesPath 1.9 +3 -2 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.in 2001/07/13 02:06:27 1.8 +++ Makefile.in 2001/07/13 02:10:18 1.9 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.8 2001/07/13 02:06:27 pier Exp $ +# @version $Id: Makefile.in,v 1.9 2001/07/13 02:10:18 pier Exp $ include @SRCDIR@/Makedefs @@ -69,7 +69,8 @@ Makedefs \ Makefile \ lib/Makefile \ - apache-1.3/Makefile + apache-1.3/Makefile \ + java/Makefile all: local @for DIR in $(APRDIR) ; do \
cvs commit: jakarta-tomcat-connectors/webapp Makefile.in
pier01/07/12 19:27:50 Modified:webapp Makefile.in Log: Wrong compilation order. Revision ChangesPath 1.10 +17 -14jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.in 2001/07/13 02:10:18 1.9 +++ Makefile.in 2001/07/13 02:27:47 1.10 @@ -56,7 +56,7 @@ # = # # @author Pier Fumagalli mailto:[EMAIL PROTECTED] -# @version $Id: Makefile.in,v 1.9 2001/07/13 02:10:18 pier Exp $ +# @version $Id: Makefile.in,v 1.10 2001/07/13 02:27:47 pier Exp $ include @SRCDIR@/Makedefs @@ -72,7 +72,19 @@ apache-1.3/Makefile \ java/Makefile -all: local +all: apr_all local_all + +clean: apr_clean local_clean + +distclean: clean + @echo Removing configure generated files... + @rm -f $(CFGS) + +cvsclean: distclean + @echo Removing configure script... + @rm -f configure + +apr_all: @for DIR in $(APRDIR) ; do \ echo ; \ echo Compiling sources in $$DIR... ; \ @@ -83,7 +95,7 @@ fi ; \ done -clean: localclean +apr_clean: @for DIR in $(APRDIR) ; do \ echo ; \ echo Cleaning up $$DIR... ; \ @@ -94,7 +106,7 @@ fi ; \ done -local: +local_all: @for DIR in $(LOCALDIRS) ; do \ echo ; \ echo Compiling sources in $$DIR... ; \ @@ -105,7 +117,7 @@ fi ; \ done -localclean: +local_clean: @for DIR in $(LOCALDIRS) ; do \ echo ; \ echo Cleaning up $$DIR... ; \ @@ -115,12 +127,3 @@ exit $$RET ; \ fi ; \ done - -distclean: clean - @echo Removing configure generated files... - @rm -f $(CFGS) - -cvsclean: distclean - @echo Removing configure script... - @rm -f configure -
