From: Ralf Wildenhues Date: Wed, 24 Feb 2010 18:56:26 +0000 (+0100) Subject: Merge branch 'lzip-support' X-Git-Tag: ng-0.5a~441 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4147afc1cfed700fbcbefb797ae98a7ee7e5602a;p=thirdparty%2Fautomake.git Merge branch 'lzip-support' * lzip-support: Add lzip compression support. --- 4147afc1cfed700fbcbefb797ae98a7ee7e5602a diff --cc Makefile.in index e8fb28231,dcca05f78..6a96eb4b1 --- a/Makefile.in +++ b/Makefile.in @@@ -644,14 -600,18 +644,18 @@@ distdir: $(DISTFILES else :; fi dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) + dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -9 -c >$(distdir).tar.lz - $(am__remove_distdir) ++ $(am__post_remove_distdir) + dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz @@@ -854,27 -817,26 +860,27 @@@ ps-am uninstall-am: uninstall-binSCRIPTS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-exec-am install-strip tags-recursive \ - uninstall-am +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am \ + install-exec-am install-strip tags-recursive uninstall-am .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-binSCRIPTS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-exec-hook install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \ - uninstall-hook + all all-am am--refresh check check-am clean clean-cscope \ + clean-generic clean-local cscope cscopelist \ + cscopelist-recursive ctags ctags-recursive dist dist-all \ - dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binSCRIPTS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-hook \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-hook ++ dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \ ++ dist-tarZ dist-xz dist-zip distcheck distclean \ ++ distclean-generic distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-exec-hook install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook install-exec-hook: diff --cc NEWS index ebb52d63d,5374770d2..4f8f8bb12 --- a/NEWS +++ b/NEWS @@@ -15,9 -5,9 +15,11 @@@ New in 1.11a - The `lzma' compression scheme and associated automake option `dist-lzma' is obsoleted by `xz' and `dist-xz' due to upstream changes. + - "make dist" can now create lzip-compressed tarballs. + -Bugs fixed in 1.11.0a: +Bugs fixed in 1.11a: + + - Lots of minor bugfixes. * Bugs introduced by 1.11: diff --cc automake.in index 8029dc91b,0a10abdcc..c0bf14687 mode 100644,100755..100644 --- a/automake.in +++ b/automake.in diff --cc doc/automake.texi index 5e02071e1,185652eb1..7df95ff58 --- a/doc/automake.texi +++ b/doc/automake.texi @@@ -12929,4 -12933,4 +12941,4 @@@ parentheses is the number of generated @c LocalWords: LTALLOCA MALLOC malloc memcmp strdup alloca libcompat xyz DFOO @c LocalWords: unprefixed buildable preprocessed DBAZ DDATADIR WARNINGCFLAGS @c LocalWords: LIBFOOCFLAGS LIBFOOLDFLAGS ftable testSubDir obj LIBTOOLFLAGS - @c LocalWords: barexec Pinard's automatize initialize lzma xz cscope -@c LocalWords: barexec Pinard's automatize initialize lzip lzma xz ++@c LocalWords: barexec Pinard's automatize initialize lzip lzma xz cscope diff --cc lib/am/distdir.am index 4e356b912,ad051c322..9459e7509 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@@ -346,8 -342,14 +346,14 @@@ dist-gzip: distdi .PHONY: dist-bzip2 dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) + ?LZIP?DIST_ARCHIVES += $(distdir).tar.lz + .PHONY: dist-lzip + dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -9 -c >$(distdir).tar.lz - $(am__remove_distdir) ++ $(am__post_remove_distdir) + ?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma .PHONY: dist-lzma dist-lzma: distdir @@@ -377,15 -379,7 +383,16 @@@ dist-shar: distdi dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) + +?LZMA?DIST_TARGETS += dist-lzma ++?LZIP?DIST_TARGETS += dist-lzip +?XZ?DIST_TARGETS += dist-xz +?SHAR?DIST_TARGETS += dist-shar +?BZIP2?DIST_TARGETS += dist-bzip2 +?GZIP?DIST_TARGETS += dist-gzip +?ZIP?DIST_TARGETS += dist-zip +?COMPRESS?DIST_TARGETS += dist-tarZ endif %?TOPDIR_P%