dist-all.patch

[Akim Demaille]

Quite straightforward (oh, how I love *.am only patches :).  The only
question is whether we want to factor tar too or not.

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * distdir.am (dist-all): Build all the flavors using a single
        distdir.

Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.163
diff -u -u -r1.163 Makefile.am
--- Makefile.am 2001/05/03 08:21:05 1.163
+++ Makefile.am 2001/05/04 08:25:41
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in

-AUTOMAKE_OPTIONS = gnits 1.4
+AUTOMAKE_OPTIONS = gnits 1.4 dist-bzip2
 MAINT_CHARSET = latin1

 ## We need `.' in SUBDIRS because we want `check' to build `.' before
Index: Makefile.in
===================================================================
RCS file: /cvs/automake/automake/Makefile.in,v
retrieving revision 1.314
diff -u -u -r1.314 Makefile.in
--- Makefile.in 2001/05/03 08:21:05 1.314
+++ Makefile.in 2001/05/04 08:25:42
@@ -73,7 +73,7 @@
 _am_quote = @_am_quote@
 install_sh = @install_sh@

-AUTOMAKE_OPTIONS = gnits 1.4
+AUTOMAKE_OPTIONS = gnits 1.4 dist-bzip2
 MAINT_CHARSET = latin1

 SUBDIRS = . m4 lib tests
@@ -468,6 +468,10 @@
        $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)

+dist-bzip2: distdir
+       $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+       -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
+
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
@@ -534,9 +538,11 @@
 clean: clean-recursive

 clean-am: clean-generic mostlyclean-am
-
-dist-all: dist

+dist-all: distdir
+       $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+       $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+       -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 distclean: distclean-recursive
        -rm -f config.status
 distclean-am: clean-am distclean-generic distclean-tags
@@ -599,11 +605,12 @@
 uninstall-info: uninstall-info-recursive

 .PHONY: $(RECURSIVE_TARGETS) all all-am check check-am clean \
-       clean-generic clean-recursive dist dist-all dist-info distcheck \
-       distclean distclean-generic distclean-recursive distclean-tags \
-       distdir dvi dvi-am dvi-recursive info info-am info-recursive \
-       install install-am install-binSCRIPTS install-data \
-       install-data-am install-data-recursive install-dist_amDATA \
+       clean-generic clean-recursive dist dist-all dist-bzip2 \
+       dist-info distcheck distclean distclean-generic \
+       distclean-recursive distclean-tags distdir dvi dvi-am \
+       dvi-recursive info info-am info-recursive install install-am \
+       install-binSCRIPTS install-data install-data-am \
+       install-data-recursive install-dist_amDATA \
        install-dist_pkgdataDATA install-dist_scriptDATA install-exec \
        install-exec-am install-exec-recursive install-info \
        install-info-recursive install-man install-recursive \
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.141
diff -u -u -r1.141 NEWS
--- NEWS 2001/02/21 08:20:40 1.141
+++ NEWS 2001/05/04 08:25:43
@@ -1,5 +1,6 @@
 New in 1.4e:
 * Support for `configure.ac'.
+* `make dist-all' is much faster.

 New in 1.4b:
 * Faster AM_INIT_AUTOMAKE (requires update of `missing' script)
Index: distdir.am
===================================================================
RCS file: /cvs/automake/automake/distdir.am,v
retrieving revision 1.15
diff -u -u -r1.15 distdir.am
--- distdir.am 2001/04/10 12:41:04 1.15
+++ distdir.am 2001/05/04 08:25:45
@@ -148,14 +148,13 @@
 if %?TOPDIR_P%

 GZIP_ENV = --best
-.PHONY: dist-all dist
-dist-all: dist
+.PHONY: dist
 dist: distdir
        $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)

 if  %?BZIP2%
-.PHONY dist-all: dist-bzip2
+.PHONY: dist-bzip2
 dist-bzip2: distdir
        $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
@@ -163,7 +162,7 @@


 if  %?COMPRESS%
-.PHONY dist-all: dist-tarZ
+.PHONY: dist-tarZ
 dist-tarZ: distdir
        $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
@@ -171,7 +170,7 @@


 if  %?SHAR%
-.PHONY dist-all: dist-shar
+.PHONY: dist-shar
 dist-shar: distdir
        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
@@ -179,12 +178,35 @@


 if  %?ZIP%
-.PHONY dist-all: dist-zip
+.PHONY: dist-zip
 dist-zip: distdir
        -rm -f $(distdir).zip
        zip -rq $(distdir).zip $(distdir)
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 endif  %?ZIP%
+
+endif %?TOPDIR_P%
+
+
+
+## ------------------------------------------------- ##
+## Building all the requested distribution flavors.  ##
+## ------------------------------------------------- ##
+
+## Currently we cannot use if/endif inside a rule.  The file_contents
+## parser needs work.
+
+if %?TOPDIR_P%
+
+.PHONY: dist-all
+dist-all: distdir
+       $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+?BZIP2?        $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+?COMPRESS?     $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+?SHAR? shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+?ZIP?  -rm -f $(distdir).zip
+?ZIP?  zip -rq $(distdir).zip $(distdir)
+       -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)

 endif %?TOPDIR_P%