pier 02/05/03 09:16:23 Modified: webapp Makedefs.in Makefile.in Log: Added the "dist" target to create a binary distribution directory (now the default when calling "make") and a "tarball" target to create a binary distribution tarball. Revision Changes Path 1.16 +13 -2 jakarta-tomcat-connectors/webapp/Makedefs.in Index: Makedefs.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makedefs.in 1 May 2002 21:25:40 -0000 1.15 +++ Makedefs.in 3 May 2002 16:16:23 -0000 1.16 @@ -56,7 +56,7 @@ # ========================================================================= # # @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> -# @version $Id: Makedefs.in,v 1.15 2002/05/01 21:25:40 pier Exp $ +# @version $Id: Makedefs.in,v 1.16 2002/05/03 16:16:23 pier Exp $ .SUFFIXES: .c .o .lo @@ -65,6 +65,7 @@ CPP = @CPP@ SHELL = @SHELL@ LIBTOOL = @LIBTOOL@ +INSTALL = $(SHELL) $(SRC_DIR)/support/install.sh -c APXS = @APXS@ # Build flags @@ -87,6 +88,14 @@ SRC_DIR = @SRC_DIR@ TGT_DIR = @TGT_DIR@ OBJ_DIR = @TGT_DIR@/objects +DST_DIR = @TGT_DIR@/distrib +TARBALL = webapp-module-$(WEBAPP_VERSION) + +# Versions +APACHE_VERSION = @APACHE_VERSION@ +WEBAPP_VERSION = @WEBAPP_VERSION@ +HOST = @HOST@ +DATE = @DATE@ # Compilation template %.lo: $(LOCAL_SRC_DIR)/%.c @@ -96,4 +105,6 @@ $(CPPFLAGS) \ $(CFLAGS) $(LIBTOOL) --mode=install \ - cp $@ $(OBJ_DIR) + $(INSTALL) \ + $@ \ + $(OBJ_DIR) 1.30 +24 -3 jakarta-tomcat-connectors/webapp/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Makefile.in 1 May 2002 21:26:28 -0000 1.29 +++ Makefile.in 3 May 2002 16:16:23 -0000 1.30 @@ -56,17 +56,19 @@ # ========================================================================= # # @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> -# @version $Id: Makefile.in,v 1.29 2002/05/01 21:26:28 pier Exp $ +# @version $Id: Makefile.in,v 1.30 2002/05/03 16:16:23 pier Exp $ include @TGT_DIR@/Makedefs -all: extra-build +all: dist distclean: extra-clean rm -f $(MODULE)/Makefile rm -f lib/Makefile rm -f Makedefs rm -f Makefile + rm -f DETAILS.txt + rm -fr $(DST_DIR) extra-build: $(OBJ_DIR) @EXTRA_BUILD@ build @@ -75,10 +77,29 @@ build: $(OBJ_DIR) lib-build $(MODULE)-build clean: lib-clean $(MODULE)-clean - rm -rf $(OBJ_DIR)/* + rm -rf $(OBJ_DIR) + +dist: $(DST_DIR) extra-build + cp $(SRC_DIR)/LICENSE.txt $(DST_DIR) + cp $(SRC_DIR)/README.txt $(DST_DIR) + cp $(SRC_DIR)/INSTALL.txt $(DST_DIR) + cp $(TGT_DIR)/DETAILS.txt $(DST_DIR) + @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/$(MODULE)" SUBT="dist" subdir + +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) $(OBJ_DIR): mkdir $(OBJ_DIR) + +$(DST_DIR): + mkdir $(DST_DIR) $(MODULE)-build: @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/$(MODULE)" SUBT="build" subdir
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>