From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 12 Oct 2008 20:22:39 +0000 (+0200)
Subject: Nicer 'make dist' output.
X-Git-Tag: v1.10b~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c0bda6240dce5262fc4b4b28b26db8cd840cd57;p=thirdparty%2Fautomake.git

Nicer 'make dist' output.

* lib/am/distdir.am (distdir): Hide the complex script
used for computing the relative subdirs; echo the sub-make
command.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 3dfadc6d9..946aef794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Nicer 'make dist' output.
+	* lib/am/distdir.am (distdir): Hide the complex script
+	used for computing the relative subdirs; echo the sub-make
+	command.
+
 2008-10-12  William Pursell <bill.pursell@gmail.com>  (tiny patch)
 
 	* tests/defs.in: Fix comment typo.
diff --git a/Makefile.in b/Makefile.in
index c2f487057..4215572ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -485,7 +485,7 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
@@ -496,6 +496,8 @@ distdir: $(DISTFILES)
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 7a20ca307..c74094bb8 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -468,7 +468,7 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
@@ -479,6 +479,8 @@ distdir: $(DISTFILES)
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 2ecc780f2..00e358bc5 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -444,7 +444,7 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
@@ -455,6 +455,8 @@ distdir: $(DISTFILES)
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 41e9b2bda..6f482935c 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -195,7 +195,7 @@ endif %?TOPDIR_P%
 ## us work correctly with an enclosing package.
 ##
 if %?SUBDIRS%
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
@@ -206,6 +206,8 @@ if %?SUBDIRS%
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \