diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | unix/Makefile.in | 61 |
2 files changed, 63 insertions, 4 deletions
@@ -1,5 +1,11 @@ 2008-12-19 Don Porter <dgp@users.sourceforge.net> + * unix/Makefile.in: Update `make dist` target to include the files + from the compat/zlib directory as well as all the bundled packages + found under the pkgs directory, according to their individual + `make dist` targets. Change includes breaking a `configure-packages` + target out of the `packages` target. + * README: Bump version number to 8.6b1 * generic/tcl.h: * library/init.tcl: diff --git a/unix/Makefile.in b/unix/Makefile.in index 5d4adc2..15babe7 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.252 2008/12/18 15:24:46 dkf Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.253 2008/12/19 07:01:02 dgp Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -1569,18 +1569,30 @@ tclOOStubLib.o: $(GENERIC_DIR)/tclOOStubLib.c PKG_CFG_ARGS = @PKG_CFG_ARGS@ PKG_DIR = ./pkgs -packages: +configure-packages: @builddir=`pwd`; \ for i in $(PKGS_DIR)/*; do \ if [ -d $$i ]; then \ if [ -x $$i/configure ]; then \ pkg=`basename $$i`; \ - echo "Building package '$$pkg'"; \ + echo "Configuring package '$$pkg'"; \ mkdir -p $(PKG_DIR)/$$pkg; \ if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \ ( cd $(PKG_DIR)/$$pkg; \ $$i/configure --with-tcl=$(PWD) --with-tclinclude=$(GENERIC_DIR) $(PKG_CFG_ARGS) --enable-shared --enable-threads; ) \ fi; \ + fi; \ + fi; \ + done; \ + cd $$builddir + +packages: configure-packages ${STUB_LIB_FILE} + @builddir=`pwd`; \ + for i in $(PKGS_DIR)/*; do \ + if [ -d $$i ]; then \ + pkg=`basename $$i`; \ + if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \ + echo "Building package '$$pkg'"; \ ( cd $(PKG_DIR)/$$pkg; $(MAKE); ) \ fi; \ fi; \ @@ -1639,6 +1651,19 @@ distclean-packages: done; \ rm -rf $(PKG_DIR) +dist-packages: configure-packages + @builddir=`pwd`; \ + rm -rf $(DISTROOT)/pkgs; \ + for i in $(PKGS_DIR)/*; do \ + if [ -d $$i ]; then \ + pkg=`basename $$i`; \ + if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \ + ( cd $(PKG_DIR)/$$pkg; $(MAKE) dist "DIST_ROOT=$(DISTROOT)/pkgs"; ) \ + fi; \ + fi; \ + done; \ + cd $$builddir + # # Target to regenerate header files and stub files from the *.decls tables. # @@ -1745,7 +1770,7 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in: $(MAC_OSX_DIR)/configure cd $(MAC_OSX_DIR); autoheader; touch $@ -dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(MAC_OSX_DIR)/configure genstubs +dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(MAC_OSX_DIR)/configure genstubs dist-packages rm -rf $(DISTDIR) mkdir -p $(DISTDIR)/unix cp -p $(UNIX_DIR)/*.[ch] $(DISTDIR)/unix @@ -1790,6 +1815,29 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(MAC_OSX_DIR)/configure mkdir $(DISTDIR)/compat cp -p $(TOP_DIR)/license.terms $(COMPAT_DIR)/*.[ch] \ $(COMPAT_DIR)/README $(DISTDIR)/compat + mkdir $(DISTDIR)/compat/zlib + cp -p $(COMPAT_DIR)/zlib/*.[ch] $(COMPAT_DIR)/zlib/*.txt \ + $(COMPAT_DIR)/zlib/ChangeLog $(COMPAT_DIR)/zlib/configure \ + $(COMPAT_DIR)/zlib/FAQ $(COMPAT_DIR)/zlib/INDEX \ + $(COMPAT_DIR)/zlib/Makefile* $(COMPAT_DIR)/zlib/README \ + $(COMPAT_DIR)/zlib/zlib.3 $(DISTDIR)/compat/zlib + mkdir $(DISTDIR)/compat/zlib/amiga + cp -p $(COMPAT_DIR)/zlib/amiga/Makefile.* $(DISTDIR)/compat/zlib/amiga + mkdir $(DISTDIR)/compat/zlib/as400 + cp -p $(COMPAT_DIR)/zlib/as400/bndsrc \ + $(COMPAT_DIR)/zlib/as400/compile.clp \ + $(COMPAT_DIR)/zlib/as400/readme.txt \ + $(COMPAT_DIR)/zlib/as400/zlib.inc $(DISTDIR)/compat/zlib/as400 + mkdir $(DISTDIR)/compat/zlib/msdos + cp -p $(COMPAT_DIR)/zlib/msdos/Makefile.* $(DISTDIR)/compat/zlib/msdos + mkdir $(DISTDIR)/compat/zlib/qnx + cp $(COMPAT_DIR)/zlib/qnx/package.qpg $(DISTDIR)/compat/zlib/qnx + mkdir $(DISTDIR)/compat/zlib/win32 + cp -p $(COMPAT_DIR)/zlib/win32/Makefile.* \ + $(COMPAT_DIR)/zlib/win32/zlib* \ + $(COMPAT_DIR)/zlib/win32/VisualC.txt \ + $(COMPAT_DIR)/zlib/win32/DLL_FAQ.txt \ + $(DISTDIR)/compat/zlib/win32 mkdir $(DISTDIR)/tests cp -p $(TOP_DIR)/license.terms $(DISTDIR)/tests cp -p $(TOP_DIR)/tests/*.test $(TOP_DIR)/tests/README \ @@ -1845,6 +1893,11 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(MAC_OSX_DIR)/configure mkdir $(DISTDIR)/libtommath cp -p $(TOMMATH_SRCS) $(TOMMATH_DIR)/*.h \ $(DISTDIR)/libtommath + mkdir $(DISTDIR)/pkgs + cp $(TOP_DIR)/pkgs/README $(DISTDIR)/pkgs + for i in $(DISTROOT)/pkgs/*.tar.gz; do \ + tar -C $(DISTDIR)/pkgs -xzf "$$i"; \ + done # # The following target can only be used for non-patch releases. Use the |