diff -Nru automake-1.9.6-orig/automake.in automake-1.9.6/automake.in
--- automake-1.9.6-orig/automake.in	2005-06-30 23:17:13.000000000 +0200
+++ automake-1.9.6/automake.in	2006-06-16 22:16:13.000000000 +0200
@@ -1182,6 +1182,7 @@
 			     LTOBJ     => '$@',
 
 			     COMPILE   => '$(' . $lang->compiler . ')',
+			     COMPLANG  => uc($lang->name) . (' ' x (10 - length($lang->name))),
 			     LTCOMPILE => '$(LT' . $lang->compiler . ')',
 			     -o        => $output_flag,
 			     SUBDIROBJ => !! option 'subdir-objects');
@@ -1316,6 +1317,7 @@
 				     COMPILE   => $obj_compile,
 				     LTCOMPILE => $obj_ltcompile,
 				     -o        => $output_flag,
+				     COMPLANG  => uc($lang->name) . (' ' x (10 - length($lang->name))),
 				     %file_transform);
 		    $obj =~ s/\$U//g;
 		    $depbase =~ s/\$U//g;
@@ -1342,6 +1344,7 @@
 			     COMPILE   => $obj_compile,
 			     LTCOMPILE => $obj_ltcompile,
 			     -o        => $output_flag,
+			     COMPLANG  => uc($lang->name) . (' ' x (10 - length($lang->name))),
 			     %file_transform);
 	}
 
@@ -1690,6 +1693,10 @@
             # This is probably the result of a direct suffix rule.
             # In this case we just accept the rewrite.
             $object = "$base$extension";
+            if ($directory ne '')
+            {
+                $object = $directory . '/' . $object;
+            }
             $linker = '';
         }
         else
@@ -1759,7 +1766,7 @@
 
 		# For Java, the way we're handling it right now, a
 		# `..' component doesn't make sense.
-                if ($lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
+                if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
 		  {
 		    err_am "`$full' should not contain a `..' component";
 		  }
@@ -2156,11 +2163,11 @@
     {
 	if ($compile_clean_files{$item} == MOSTLY_CLEAN)
 	{
-	    push (@mostly_rms, "\t-rm -f $item");
+	    push (@mostly_rms, "\t\@\@AMPRETTYECHO\@ '  [RM        ]  $item'\n\t\@AMSHOWCMDSAT\@-rm -f $item");
 	}
 	elsif ($compile_clean_files{$item} == DIST_CLEAN)
 	{
-	    push (@dist_rms, "\t-rm -f $item");
+	    push (@dist_rms, "\t\@\@AMPRETTYECHO\@ '  [RM        ]  $item'\n\t\@AMSHOWCMDSAT\@-rm -f $item");
 	}
 	else
 	{
@@ -2225,7 +2232,7 @@
     {
       my $dir = ($item eq '.') ? '' : "$item/";
       # .libs is for Unix, _libs for DOS.
-      push (@libtool_rms, "\t-rm -rf ${dir}.libs ${dir}_libs");
+      push (@libtool_rms, "\t\@\@AMPRETTYECHO\@ '  [RM        ]  ${dir}.libs ${dir}_libs'\n\t\@AMSHOWCMDSAT\@-rm -rf ${dir}.libs ${dir}_libs");
     }
 
   # Output the libtool compilation rules.
@@ -4313,7 +4320,8 @@
       $rm ="test -z \"$file\" || $rm"
 	if ($file =~ /^\s*\$(\(.*\)|\{.*\})\s*$/);
 
-      push @{$rms{$when}}, "\t-$rm\n";
+      $rm = "\@\@AMPRETTYECHO\@ '  [RM        ]  $file'\n\t-$rm";
+      push @{$rms{$when}}, "\t$rm\n";
     }
 
   $output_rules .= &file_contents
diff -Nru automake-1.9.6-orig/lib/am/ansi2knr.am automake-1.9.6/lib/am/ansi2knr.am
--- automake-1.9.6-orig/lib/am/ansi2knr.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/ansi2knr.am	2006-06-16 18:38:11.000000000 +0200
@@ -29,7 +29,7 @@
 
 ANSI2KNR = %ANSI2KNR-DIR%/ansi2knr
 %ANSI2KNR-DIR%/ansi2knr:
-	cd %ANSI2KNR-DIR% && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
+	@AMSHOWCMDSAT@cd %ANSI2KNR-DIR% && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 else !%?ANSI2KNR-DIR%
 
@@ -37,7 +37,8 @@
 ## necessary.
 ANSI2KNR = @ANSI2KNR@
 ansi2knr: ansi2knr.$(OBJEXT)
-	$(LINK) ansi2knr.$(OBJEXT) $(LIBS)
+	@@AMPRETTYECHO@ '  [LD        ]  $@'
+	@AMSHOWCMDSAT@$(LINK) ansi2knr.$(OBJEXT) $(LIBS)
 ansi2knr.$(OBJEXT): $(CONFIG_HEADER)
 
 endif !%?ANSI2KNR-DIR%
@@ -59,7 +60,8 @@
 ## `clean' should delete it; if `configure' built it, then `distclean'
 ## should remove it (and if the maintainer built it, then
 ## maintainer-clean should remove it).
-	-rm -f ansi2knr
+	@@AMPRETTYECHO@ '  [RM        ]  ansi2knr'
+	@AMSHOWCMDSAT@-rm -f ansi2knr
 endif !%?ANSI2KNR-DIR%
 
 
@@ -75,4 +77,5 @@
 ## Only delete *_.c when ansi2knr is actually in use, so as to avoid
 ## deleting sources that happen to end in "_" after being truncated on a DOS
 ## 8.3 filesystem with srcdir==builddir.
-	-test "$U" = "" || rm -f *_.c
+	@@AMPRETTYECHO@ '  [RM        ]  K&R Sources'
+	@AMSHOWCMDSAT@-test "$U" = "" || rm -f *_.c
diff -Nru automake-1.9.6-orig/lib/am/clean.am automake-1.9.6/lib/am/clean.am
--- automake-1.9.6-orig/lib/am/clean.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/clean.am	2006-06-16 18:38:11.000000000 +0200
@@ -30,7 +30,8 @@
 
 distclean-am: distclean-generic clean-am
 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	@@AMPRETTYECHO@ '  [RM        ]  $(CONFIG_CLEAN_FILES)'
+	@AMSHOWCMDSAT@-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 %DISTCLEAN_RMS%
 
 ## Makefiles and their dependencies cannot be cleaned by
@@ -41,7 +42,8 @@
 ## If you change distclean here, you probably also want to change
 ## maintainer-clean below.
 distclean:
-	-rm -f %MAKEFILE%
+	@@AMPRETTYECHO@ '  [RM        ]  %MAKEFILE%'
+	@AMSHOWCMDSAT@-rm -f %MAKEFILE%
 
 maintainer-clean-am: maintainer-clean-generic distclean-am
 maintainer-clean-generic:
@@ -53,7 +55,8 @@
 
 ## See comment for distclean.
 maintainer-clean:
-	-rm -f %MAKEFILE%
+	@@AMPRETTYECHO@ '  [RM        ]  %MAKEFILE%'
+	@AMSHOWCMDSAT@-rm -f %MAKEFILE%
 
 .PHONY: clean mostlyclean distclean maintainer-clean \
 clean-generic mostlyclean-generic distclean-generic maintainer-clean-generic
diff -Nru automake-1.9.6-orig/lib/am/clean-hdr.am automake-1.9.6/lib/am/clean-hdr.am
--- automake-1.9.6-orig/lib/am/clean-hdr.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/clean-hdr.am	2006-06-16 18:38:11.000000000 +0200
@@ -20,4 +20,5 @@
 .PHONY: distclean-hdr
 distclean-am: distclean-hdr
 distclean-hdr:
-	-rm -f %FILES%
+	@@AMPRETTYECHO@ '  [RM        ]  %FILES%'
+	@AMSHOWCMDSAT@-rm -f %FILES%
diff -Nru automake-1.9.6-orig/lib/am/compile.am automake-1.9.6/lib/am/compile.am
--- automake-1.9.6-orig/lib/am/compile.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/compile.am	2006-06-16 18:38:11.000000000 +0200
@@ -21,12 +21,14 @@
 
 mostlyclean-am: mostlyclean-compile
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
+	@@AMPRETTYECHO@ '  [RM        ]  *.$(OBJEXT)'
+	@AMSHOWCMDSAT@-rm -f *.$(OBJEXT)
 ?MOSTLYRMS?%MOSTLYRMS%
 
 distclean-am: distclean-compile
 distclean-compile:
-	-rm -f *.tab.c
+	@@AMPRETTYECHO@ '  [RM        ]  *.tab.c'
+	@AMSHOWCMDSAT@-rm -f *.tab.c
 ?DISTRMS?%DISTRMS%
 
 .PHONY: mostlyclean-compile distclean-compile
diff -Nru automake-1.9.6-orig/lib/am/configure.am automake-1.9.6/lib/am/configure.am
--- automake-1.9.6-orig/lib/am/configure.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/configure.am	2006-06-16 18:38:11.000000000 +0200
@@ -40,7 +40,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-?TOPDIR_P?	      echo ' cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS%'; \
+?TOPDIR_P?	      @AMPRETTYECHO@ '  [AUTOMAKE  ]  rebuild all'; \
+?TOPDIR_P?	      @AMCMDECHO@ ' cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS%'; \
 ?TOPDIR_P?	      cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% \
 ?!TOPDIR_P?	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 		&& exit 0; \
@@ -48,7 +49,8 @@
 	  esac; \
 	done; \
 ## Otherwise, rebuild only this file.
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES%'; \
+	@AMPRETTYECHO@ '  [AUTOMAKE  ]  %MAKEFILE-AM-SOURCES%'; \
+	@AMCMDECHO@ ' cd $(top_srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES%'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES%
 
@@ -68,13 +70,15 @@
 ## Don't prefix $(top_builddir), because GNU make will strip it out
 ## when it's `.'.
 	  *config.status*) \
-?TOPDIR_P?	    echo ' $(SHELL) ./config.status'; \
+?TOPDIR_P?	    @AMPRETTYECHO@ '  [SH        ]  config.status'; \
+?TOPDIR_P?	    @AMCMDECHO@ ' $(SHELL) ./config.status'; \
 ?TOPDIR_P?	    $(SHELL) ./config.status;; \
 ?!TOPDIR_P?	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
 ## FIXME: $(am__depfiles_maybe) lets us re-run the rule to create the
 ## .P files.  Ideally we wouldn't have to do this by hand.
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__depfiles_maybe)'; \
+	    @AMPRETTYECHO@ '  [SH        ]  config.status %CONFIG-MAKEFILE%'; \
+	    @AMCMDECHO@ ' cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__depfiles_maybe);; \
 	esac;
 
@@ -94,12 +98,14 @@
 endif %?TOPDIR_P%
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-?TOPDIR_P?	$(SHELL) ./config.status --recheck
-?!TOPDIR_P?	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+	@@AMPRETTYECHO@ '  [SH        ]  config.status'
+?TOPDIR_P?	@AMSHOWCMDSAT@$(SHELL) ./config.status --recheck
+?!TOPDIR_P?	@AMSHOWCMDSAT@cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure: %MAINTAINER-MODE% $(am__configure_deps)
-?TOPDIR_P?	cd $(srcdir) && $(AUTOCONF)
-?!TOPDIR_P?	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+	@@AMPRETTYECHO@ '  [AUTOCONF  ]  Regenerate'
+?TOPDIR_P?	@AMSHOWCMDSAT@cd $(srcdir) && $(AUTOCONF)
+?!TOPDIR_P?	@AMSHOWCMDSAT@cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 
 ## ------------ ##
@@ -115,8 +121,9 @@
 ## the $(am__configure_deps) dependency.
 if %?REGEN-ACLOCAL-M4%
 $(ACLOCAL_M4): %MAINTAINER-MODE% $(am__aclocal_m4_deps)
-?TOPDIR_P?	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-?!TOPDIR_P?	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+	@@AMPRETTYECHO@ '  [ACLOCAL   ]  Regenerate'
+?TOPDIR_P?	@AMSHOWCMDSAT@cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+?!TOPDIR_P?	@AMSHOWCMDSAT@cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 endif %?REGEN-ACLOCAL-M4%
 
 
@@ -133,20 +140,23 @@
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
 distclean:
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	@@AMPRETTYECHO@ '  [RM        ]  $(am__CONFIG_DISTCLEAN_FILES)'
+	@AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 
 ## Note: you might think we should remove Makefile.in, configure, or
 ## aclocal.m4 here in a maintainer-clean rule.  However, the GNU
 ## Coding Standards explicitly prohibit this.
 
 maintainer-clean:
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	@@AMPRETTYECHO@ '  [RM        ]  $(am__CONFIG_DISTCLEAN_FILES)'
+	@AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 ## autom4te.cache is created by Autoconf; the only valid target to
 ## remove it is maintainer-clean, not distclean.
 ## If you have an autom4te.cache that cause distcheck to fail, then
 ## it is good news: you finally discovered that autoconf and/or
 ## autoheader is needed to use your tarball, which is wrong.
-	-rm -rf $(top_srcdir)/autom4te.cache
+	@@AMPRETTYECHO@ '  [RM        ]  autom4te.cache/'
+	@AMSHOWCMDSAT@-rm -rf $(top_srcdir)/autom4te.cache
 
 
 endif %?TOPDIR_P%
diff -Nru automake-1.9.6-orig/lib/am/data.am automake-1.9.6/lib/am/data.am
--- automake-1.9.6-orig/lib/am/data.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/data.am	2006-06-16 18:38:11.000000000 +0200
@@ -33,7 +33,8 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%%PRIMARY%
 install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%)
 	@$(NORMAL_INSTALL)
-	test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+	@@AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(%NDIR%dir)'
+	@AMSHOWCMDSAT@test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
 ?!BASE?	@$(am__vpath_adj_setup) \
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
@@ -46,7 +47,8 @@
 ## new dir variable or use a nobase_ target for the latter case.
 ?BASE?	  f=$(am__strip_dir) \
 ?!BASE?	  $(am__vpath_adj) \
-	  echo " $(%DIR%%PRIMARY%_INSTALL) '$$d$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	  @AMPRETTYECHO@ "  [INSTALL   ]  '$$d$$p' -> '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	  @AMCMDECHO@ " $(%DIR%%PRIMARY%_INSTALL) '$$d$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 	  $(%DIR%%PRIMARY%_INSTALL) "$$d$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \
 	done
 endif %?INSTALL%
@@ -61,11 +63,12 @@
 uninstall-%DIR%%PRIMARY%:
 	@$(NORMAL_UNINSTALL)
 ?!BASE?	@$(am__vpath_adj_setup) \
-?!BASE?	list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
+?!BASE?	@AMSHOWCMDSAT@list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
 ?BASE?	@list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
 ?BASE?	  f=$(am__strip_dir) \
 ?!BASE?	  $(am__vpath_adj) \
-	  echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(%NDIR%dir)/$$f"; \
+	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \
 	done
 endif %?INSTALL%
diff -Nru automake-1.9.6-orig/lib/am/dejagnu.am automake-1.9.6/lib/am/dejagnu.am
--- automake-1.9.6-orig/lib/am/dejagnu.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/dejagnu.am	2006-06-16 18:38:11.000000000 +0200
@@ -46,7 +46,8 @@
 .PHONY: check-DEJAGNU
 check-DEJAGNU: site.exp
 ## Life is easiest with an absolute srcdir, so do that.
-	srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
+	@@AMPRETTYECHO@ "  [TEST      ]  $(RUNTEST)"
+	@AMSHOWCMDSAT@srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
 	EXPECT=$(EXPECT); export EXPECT; \
 ## Allow this to work when expect and DejaGnu are in tree.
 ## Only required when --cygnus in force.
@@ -103,7 +104,9 @@
 ## Any other cleaning must be done by the user or by the test suite
 ## itself.  We can't predict what dejagnu or the test suite might
 ## generate.
-	-rm -f site.exp site.bak
-	-l='$(DEJATOOL)'; for tool in $$l; do \
+	@@AMPRETTYECHO@ '  [RM        ]  site.exp site.bak'
+	@AMSHOWCMDSAT@-rm -f site.exp site.bak
+	@AMSHOWCMDSAT@-l='$(DEJATOOL)'; for tool in $$l; do \
+	@AMPRETTYECHO@ "  [RM        ]  $$tool.sum $$tool.log"; \
 	  rm -f $$tool.sum $$tool.log; \
 	done
diff -Nru automake-1.9.6-orig/lib/am/depend2.am automake-1.9.6/lib/am/depend2.am
--- automake-1.9.6-orig/lib/am/depend2.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/depend2.am	2006-06-16 20:31:12.000000000 +0200
@@ -62,49 +62,51 @@
 if %?NONLIBTOOL%
 ?GENERIC?%EXT%.o:
 ?!GENERIC?%OBJ%: %SOURCE%
+	@@AMPRETTYECHO@ '  [%COMPLANG%]  %SOURCE%'
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?	if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
+?!GENERIC?	@AMSHOWCMDSAT@if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
 ?SUBDIROBJ??GENERIC?	depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
-?GENERIC?	if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJ% %SOURCE%; \
+?GENERIC?	@AMSHOWCMDSAT@if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJ% %SOURCE%; \
 	then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Po"; else rm -f "%DEPBASE%.Tpo"; exit 1; fi
 else !%FASTDEP%
 if %AMDEP%
-	source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
+	@AMSHOWCMDSAT@source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
 	DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
 if %?GENERIC%
-?-o?	%COMPILE% %-c% %-o% %OBJ% %SOURCE%
-?!-o?	%COMPILE% %-c% %SOURCE%
+?-o?	@AMDEPSHOWCMDSAT@%COMPILE% %-c% %-o% %OBJ% %SOURCE%
+?!-o?	@AMDEPSHOWCMDSAT@%COMPILE% %-c% %SOURCE%
 else !%?GENERIC%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o?	%COMPILE% %-c% %-o% %OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?!-o?	%COMPILE% %-c% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?-o?	@AMDEPSHOWCMDSAT@%COMPILE% %-c% %-o% %OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?!-o?	@AMDEPSHOWCMDSAT@%COMPILE% %-c% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
 endif !%?GENERIC%
 endif !%FASTDEP%
 
 ?GENERIC?%EXT%.obj:
 ?!GENERIC?%OBJOBJ%: %SOURCE%
+	@@AMPRETTYECHO@ '  [%COMPLANG%]  %SOURCE%'
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?	if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`; \
+?!GENERIC?	@AMSHOWCMDSAT@if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`; \
 ?SUBDIROBJ??GENERIC?	depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
-?GENERIC?	if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`; \
+?GENERIC?	@AMSHOWCMDSAT@if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`; \
 	then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Po"; else rm -f "%DEPBASE%.Tpo"; exit 1; fi
 else !%FASTDEP%
 if %AMDEP%
-	source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
+	@AMSHOWCMDSAT@source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
 	DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
 if %?GENERIC%
-?-o?	%COMPILE% %-c% %-o% %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`
-?!-o?	%COMPILE% %-c% `$(CYGPATH_W) '%SOURCE%'`
+?-o?	@AMDEPSHOWCMDSAT@%COMPILE% %-c% %-o% %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`
+?!-o?	@AMDEPSHOWCMDSAT@%COMPILE% %-c% `$(CYGPATH_W) '%SOURCE%'`
 else !%?GENERIC%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o?	%COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-?!-o?	%COMPILE% %-c% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?-o?	@AMDEPSHOWCMDSAT@%COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?!-o?	@AMDEPSHOWCMDSAT@%COMPILE% %-c% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
 endif !%?GENERIC%
 endif !%FASTDEP%
 endif %?NONLIBTOOL%
@@ -112,21 +114,22 @@
 if %?LIBTOOL%
 ?GENERIC?%EXT%.lo:
 ?!GENERIC?%LTOBJ%: %SOURCE%
+	@@AMPRETTYECHO@ '  [%COMPLANG%]  %SOURCE%'
 if %FASTDEP%
 ## In fast-dep mode, we can always use -o.
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?	if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
+?!GENERIC?	@AMSHOWCMDSAT@if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
 ?SUBDIROBJ??GENERIC?	depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-?GENERIC?	if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %LTOBJ% %SOURCE%; \
+?GENERIC?	@AMSHOWCMDSAT@if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o %LTOBJ% %SOURCE%; \
 	then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Plo"; else rm -f "%DEPBASE%.Tpo"; exit 1; fi
 else !%FASTDEP%
 if %AMDEP%
-	source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
+	@AMSHOWCMDSAT@source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
 	DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
 ## We can always use `-o' with Libtool.
-?GENERIC?	%LTCOMPILE% %-c% -o %LTOBJ% %SOURCE%
+?GENERIC?	@AMDEPSHOWCMDSAT@%LTCOMPILE% %-c% -o %LTOBJ% %SOURCE%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?	%LTCOMPILE% %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?!GENERIC?	@AMDEPSHOWCMDSAT@%LTCOMPILE% %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
 endif !%FASTDEP%
 endif %?LIBTOOL%
diff -Nru automake-1.9.6-orig/lib/am/depend.am automake-1.9.6/lib/am/depend.am
--- automake-1.9.6-orig/lib/am/depend.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/depend.am	2006-06-16 18:38:11.000000000 +0200
@@ -22,7 +22,9 @@
 ## rules from being recursive (for instance multilib clean rules are
 ## recursive).
 distclean:
-	-rm -rf %DEPDIRS%
+	@@AMPRETTYECHO@ '  [RM        ]  %DEPDIRS%'
+	@AMSHOWCMDSAT@-rm -rf %DEPDIRS%
 
 maintainer-clean:
-	-rm -rf %DEPDIRS%
+	@@AMPRETTYECHO@ '  [RM        ]  %DEPDIRS%'
+	@AMSHOWCMDSAT@-rm -rf %DEPDIRS%
diff -Nru automake-1.9.6-orig/lib/am/distdir.am automake-1.9.6/lib/am/distdir.am
--- automake-1.9.6-orig/lib/am/distdir.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/distdir.am	2006-06-16 18:38:11.000000000 +0200
@@ -49,12 +49,14 @@
 ## Only for the top dir.
 ##
 if %?TOPDIR_P%
-	$(am__remove_distdir)
-	mkdir $(distdir)
+	@AMSHOWCMDSAT@$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [MKDIR     ]  $(distdir)'
+	@AMSHOWCMDSAT@mkdir $(distdir)
 endif %?TOPDIR_P%
 ##
 ##
-?DISTDIRS?	$(mkdir_p) %DISTDIRS%
+	@@AMPRETTYECHO@ '  [MKDIR     ]  %DISTDIRS%'
+?DISTDIRS?	@AMSHOWCMDSAT@$(mkdir_p) %DISTDIRS%
 ##
 ##
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -164,7 +166,7 @@
 ## us work correctly with an enclosing package.
 ##
 if %?SUBDIRS%
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@AMSHOWCMDSAT@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(mkdir_p) "$(distdir)/$$subdir" \
@@ -186,7 +188,7 @@
 ## We must explicitly set distdir and top_distdir for these sub-makes.
 ##
 if %?DIST-TARGETS%
-	$(MAKE) $(AM_MAKEFLAGS) \
+	@AMSHOWCMDSAT@$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  %DIST-TARGETS%
 endif %?DIST-TARGETS%
@@ -209,11 +211,11 @@
 ## the file in place in the source tree.
 ##
 if %?TOPDIR_P%
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	@AMSHOWCMDSAT@-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	|| ( @AMPRETTYECHO@ '  [CHMOD     ]  a+r $(distdir)'; chmod -R a+r $(distdir) )
 if %?FILENAME_FILTER%
 	@if find $(distdir) -type f -print | \
 	  grep '^%FILENAME_FILTER%' 1>&2; then \
@@ -246,33 +248,38 @@
 GZIP_ENV = --best
 .PHONY: dist-gzip
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [TAR.GZ    ]  $(distdir).tar.gz'
+	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 
 ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2
 .PHONY: dist-bzip2
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [TAR.BZ2   ]  $(distdir).tar.bz2'
+	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 
 ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
 .PHONY: dist-tarZ
 dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [TAR.Z     ]  $(distdir).tar.Z'
+	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 
 ?SHAR?DIST_ARCHIVES += $(distdir).shar.gz
 .PHONY: dist-shar
 dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [SHAR.GZ   ]  $(distdir).shar.gz'
+	@AMSHOWCMDSAT@shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 
 ?ZIP?DIST_ARCHIVES += $(distdir).zip
 .PHONY: dist-zip
 dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [ZIP       ]  $(distdir).zip'
+	@AMSHOWCMDSAT@-rm -f $(distdir).zip
+	@AMSHOWCMDSAT@zip -rq $(distdir).zip $(distdir)
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 
 endif %?TOPDIR_P%
 
@@ -289,13 +296,18 @@
 
 .PHONY: dist dist-all
 dist dist-all: distdir
-?GZIP?	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-?BZIP2?	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-?COMPRESS?	tardir=$(distdir) && $(am__tar) | 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)
-	$(am__remove_distdir)
+?GZIP?	@@AMPRETTYECHO@ '  [TAR.GZ    ]  $(distdir).tar.gz'
+?GZIP?	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+?BZIP2?	@@AMPRETTYECHO@ '  [TAR.BZ2   ]  $(distdir).tar.bz2'
+?BZIP2?	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+?COMPRESS?	@@AMPRETTYECHO@ '  [TAR.Z     ]  $(distdir).tar.Z'
+?COMPRESS?	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+?SHAR?	@@AMPRETTYECHO@ '  [SHAR.GZ   ]  $(distdir).shar.gz'
+?SHAR?	@AMSHOWCMDSAT@shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+?ZIP?	@@AMPRETTYECHO@ '  [ZIP       ]  $(distdir).zip'
+?ZIP?	@AMSHOWCMDSAT@-rm -f $(distdir).zip
+?ZIP?	@AMSHOWCMDSAT@zip -rq $(distdir).zip $(distdir)
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 
 endif %?TOPDIR_P%
 
@@ -311,26 +323,31 @@
 # tarfile.
 .PHONY: distcheck
 distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
+	@AMSHOWCMDSAT@case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
+	  @AMPRETTYECHO@ '  [UNTAR.GZ  ]  $(distdir).tar.gz'; \
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
+	  @AMPRETTYECHO@ '  [UNTAR.BZ2 ]  $(distdir).tar.bz2'; \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.Z*) \
+	  @AMPRETTYECHO@ '  [UNTAR.Z   ]  $(distdir).tar.Z'; \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
+	  @AMPRETTYECHO@ '  [UNSHAR.GZ ]  $(distdir).shar.gz'; \
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
+	  @AMPRETTYECHO@ '  [UNZIP     ]  $(distdir).zip'; \
 	  unzip $(distdir).zip ;;\
 	esac
 ## Make the new source tree read-only.  Distributions ought to work in
 ## this case.  However, make the top-level directory writable so we
 ## can make our new subdirs.
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	@AMSHOWCMDSAT@chmod -R a-w $(distdir); chmod a+w $(distdir)
+	@AMSHOWCMDSAT@mkdir $(distdir)/_build
+	@AMSHOWCMDSAT@mkdir $(distdir)/_inst
 ## Undo the write access.
-	chmod a-w $(distdir)
+	@AMSHOWCMDSAT@chmod a-w $(distdir)
 ## Compute the absolute path of `_inst'.  Strip any leading DOS drive
 ## to allow DESTDIR installations.  Otherwise "$(DESTDIR)$(prefix)" would
 ## expand to "c:/temp/am-dc-5668/c:/src/package/package-1.0/_inst".
diff -Nru automake-1.9.6-orig/lib/am/install.am automake-1.9.6/lib/am/install.am
--- automake-1.9.6-orig/lib/am/install.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/install.am	2006-06-16 18:38:11.000000000 +0200
@@ -31,14 +31,14 @@
 RECURSIVE_TARGETS += installdirs-recursive
 installdirs: installdirs-recursive
 installdirs-am:%installdirs-local%
-?am__installdirs?	for dir in %am__installdirs%; do \
-?am__installdirs?	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+?am__installdirs?	@AMSHOWCMDSAT@for dir in %am__installdirs%; do \
+?am__installdirs?	  test -z "$$dir" || ( @AMPRETTYECHO@ "  [MKDIR     ]  $$dir"; $(mkdir_p) "$$dir" ); \
 ?am__installdirs?	done
 else !%?SUBDIRS%
 .PHONY: installdirs
 installdirs:%installdirs-local%
-?am__installdirs?	for dir in %am__installdirs%; do \
-?am__installdirs?	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+?am__installdirs?	@AMSHOWCMDSAT@for dir in %am__installdirs%; do \
+?am__installdirs?	  test -z "$$dir" || ( @AMPRETTYECHO@ "  [MKDIR     ]  $$dir"; $(mkdir_p) "$$dir" ); \
 ?am__installdirs?	done
 endif !%?SUBDIRS%
 
@@ -89,7 +89,7 @@
 ##
 ## Use double quotes here because we might need to interpolate some
 ## backquotes at runtime.
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	@AMSHOWCMDSAT@$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
diff -Nru automake-1.9.6-orig/lib/am/java.am automake-1.9.6/lib/am/java.am
--- automake-1.9.6-orig/lib/am/java.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/java.am	2006-06-16 18:38:11.000000000 +0200
@@ -31,7 +31,7 @@
 	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
 	else :; fi
-	echo timestamp > class%DIR%.stamp
+	@AMSHOWCMDSAT@echo timestamp > class%DIR%.stamp
 
 
 ## ------------ ##
@@ -44,12 +44,13 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%JAVA
 install-%DIR%JAVA: class%DIR%.stamp
 	@$(NORMAL_INSTALL)
-	test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+	@AMSHOWCMDSAT@test -z "$(%NDIR%dir)" || ( @AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(%NDIR%dir)'; $(mkdir_p) "$(DESTDIR)$(%NDIR%dir) )"
 ## A single .java file can be compiled into multiple .class files.  So
 ## we just install all the .class files that got built into this
 ## directory.  This is not optimal, but will have to do for now.
 	@test -z "$(%DIR%_JAVA)" || for p in *.class; do \
-	  echo " $(INSTALL_DATA) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
+	  @AMPRETTYECHO@ "  [INSTALL   ]  $$p -> $(DESTDIR)$(%NDIR%dir)"; \
+	  @AMCMDECHO@ " $(INSTALL_DATA) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
 	  $(INSTALL_DATA) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$p"; \
 	done
 endif %?INSTALL%
@@ -64,7 +65,8 @@
 uninstall-%DIR%JAVA:
 	@$(NORMAL_UNINSTALL)
 	@test -z "$(%DIR%_JAVA)" || for p in *.class; do \
-	  echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
+	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(%NDIR%dir)/$$p"; \
+	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
 	  rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \
 	done
 endif %?INSTALL%
@@ -76,7 +78,8 @@
 
 .PHONY clean-am: clean-%DIR%JAVA
 clean-%DIR%JAVA:
-	-rm -f *.class class%DIR%.stamp
+	@@AMPRETTYECHO@ '  [RM        ]  *.class class%DIR%.stamp'
+	@AMSHOWCMDSAT@-rm -f *.class class%DIR%.stamp
 
 
 ## -------------- ##
diff -Nru automake-1.9.6-orig/lib/am/lang-compile.am automake-1.9.6/lib/am/lang-compile.am
--- automake-1.9.6-orig/lib/am/lang-compile.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/lang-compile.am	2006-06-16 18:38:11.000000000 +0200
@@ -25,7 +25,8 @@
 ## We also handle the case of preprocessing `.F' files into `.f' files.
 if %?PPF77%
 .F.f:
-	$(F77COMPILE) -F $<
+	@@AMPRETTYECHO@ '  [F77       ]  $<'
+	@AMSHOWCMDSAT@$(F77COMPILE) -F $<
 endif %?PPF77%
 
 
@@ -37,5 +38,6 @@
 ## We also handle the case of preprocessing `.r' files into `.f' files.
 if %?RATFOR%
 .r.f:
-	$(RCOMPILE) -F $<
+	@@AMPRETTYECHO@ '  [RATFOR    ]  $<'
+	@AMSHOWCMDSAT@$(RCOMPILE) -F $<
 endif %?RATFOR%
diff -Nru automake-1.9.6-orig/lib/am/lex.am automake-1.9.6/lib/am/lex.am
--- automake-1.9.6-orig/lib/am/lex.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/lex.am	2006-06-16 18:38:11.000000000 +0200
@@ -19,14 +19,15 @@
 ?GENERIC?%EXT%%DERIVED-EXT%:
 ?!GENERIC?%OBJ%: %SOURCE%
 if %?MORE-THAN-ONE%
-?GENERIC?	$(SHELL) $(YLWRAP) %SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
+	@@AMPRETTYECHO@ '  [LEX       ]  %SOURCE%'
+?GENERIC?	@AMSHOWCMDSAT@$(SHELL) $(YLWRAP) %SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?	$(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
+?!GENERIC?	@AMSHOWCMDSAT@$(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE%
 else !%?MORE-THAN-ONE%
-?GENERIC?	%COMPILE% %SOURCE%
+?GENERIC?	@AMSHOWCMDSAT@%COMPILE% %SOURCE%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?	%COMPILE% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
+?!GENERIC?	@AMSHOWCMDSAT@%COMPILE% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
 ## Edit out `#line' or `#' directives.
-	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|%OBJ%|' $(LEX_OUTPUT_ROOT).c >%OBJ%
-	rm -f $(LEX_OUTPUT_ROOT).c
+	@AMSHOWCMDSAT@sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|%OBJ%|' $(LEX_OUTPUT_ROOT).c >%OBJ%
+	@AMSHOWCMDSAT@rm -f $(LEX_OUTPUT_ROOT).c
 endif !%?MORE-THAN-ONE%
diff -Nru automake-1.9.6-orig/lib/am/library.am automake-1.9.6/lib/am/library.am
--- automake-1.9.6-orig/lib/am/library.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/library.am	2006-06-16 18:38:11.000000000 +0200
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 %LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) %DIRSTAMP%
-	-rm -f %LIBRARY%
-	$(%XLIBRARY%_AR) %LIBRARY% $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD)
-	$(RANLIB) %LIBRARY%
+	@@AMPRETTYECHO@ '  [AR        ]  %LIBRARY%'
+	@AMSHOWCMDSAT@-rm -f %LIBRARY%
+	@AMSHOWCMDSAT@$(%XLIBRARY%_AR) %LIBRARY% $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD)
+	@AMSHOWCMDSAT@$(RANLIB) %LIBRARY%
diff -Nru automake-1.9.6-orig/lib/am/libs.am automake-1.9.6/lib/am/libs.am
--- automake-1.9.6-orig/lib/am/libs.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/libs.am	2006-06-16 18:38:11.000000000 +0200
@@ -33,7 +33,7 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%LIBRARIES
 install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+	@AMSHOWCMDSAT@test -z "$(%NDIR%dir)" || ( @AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(%NDIR%dir)'; $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)" )
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
 	@list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
@@ -43,7 +43,8 @@
 ## not '$(DESTDIR)$(%NDIR%dir)/python/foo.yo'.
 ?BASE?	    f=$(am__strip_dir) \
 ?!BASE?	    f=$$p; \
-	    echo " $(%DIR%LIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	    @AMPRETTYECHO@ "  [INSTALL   ]  $$p -> $(DESTDIR)$(%NDIR%dir)/$$f"; \
+	    @AMCMDECHO@ " $(%DIR%LIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 	    $(%DIR%LIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \
 	  else :; fi; \
 	done
@@ -57,7 +58,8 @@
 	  if test -f $$p; then \
 ?BASE?	    p=$(am__strip_dir) \
 ## Must ranlib after installing because mod time changes.
-	    echo " $(RANLIB) '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
+	    @AMPRETTYECHO@ "  [RANLIB    ]  $(DESTDIR)$(%NDIR%dir)/$$p"; \
+	    @AMCMDECHO@ " $(RANLIB) '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
 	    $(RANLIB) "$(DESTDIR)$(%NDIR%dir)/$$p"; \
 	  else :; fi; \
 	done
@@ -74,7 +76,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
 ?BASE?	  p=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
+	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(%NDIR%dir)/$$p"; \
+	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
 	  rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \
 	done
 endif %?INSTALL%
@@ -86,4 +89,4 @@
 
 .PHONY clean-am: clean-%DIR%LIBRARIES
 clean-%DIR%LIBRARIES:
-	-test -z "$(%DIR%_LIBRARIES)" || rm -f $(%DIR%_LIBRARIES)
+	@AMSHOWCMDSAT@-test -z "$(%DIR%_LIBRARIES)" || ( @AMPRETTYECHO@ '  [RM        ]  $(%DIR%_LIBRARIES)'; rm -f $(%DIR%_LIBRARIES) )
diff -Nru automake-1.9.6-orig/lib/am/libtool.am automake-1.9.6/lib/am/libtool.am
--- automake-1.9.6-orig/lib/am/libtool.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/libtool.am	2006-06-16 18:38:11.000000000 +0200
@@ -20,7 +20,8 @@
 .PHONY: mostlyclean-libtool clean-libtool distclean-libtool
 mostlyclean-am: mostlyclean-libtool
 mostlyclean-libtool:
-	-rm -f *.lo
+	@@AMPRETTYECHO@ '  [RM        ]  *.lo'
+	@AMSHOWCMDSAT@-rm -f *.lo
 
 clean-am: clean-libtool
 clean-libtool:
@@ -28,4 +29,5 @@
 
 ?TOPDIR?distclean-am: distclean-libtool
 ?TOPDIR?distclean-libtool:
-?TOPDIR?	-rm -f libtool
+	@@AMPRETTYECHO@ '  [RM        ]  libtool'
+?TOPDIR?	@AMSHOWCMDSAT@-rm -f libtool
diff -Nru automake-1.9.6-orig/lib/am/lisp.am automake-1.9.6/lib/am/lisp.am
--- automake-1.9.6-orig/lib/am/lisp.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/lisp.am	2006-06-16 18:38:11.000000000 +0200
@@ -28,7 +28,7 @@
 elc-stamp: $(LISP)
 	@echo 'WARNING: Warnings can be ignored. :-)'
 	@rm -f elc-temp && touch elc-temp
-	if test "$(EMACS)" != no; then \
+	@AMSHOWCMDSAT@if test "$(EMACS)" != no; then \
 ## Make sure "$@" isn't empty initially.
 	  set x; \
 ## Populate "$@" with elisp files (found in the current directory
@@ -39,6 +39,7 @@
 	  done; \
 ## Finally call elisp-comp for all files.
 	  shift; \
+	  @AMPRETTYECHO@ "  [ELC]  $$@"; \
 	  EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \
 	else : ; fi
 	@mv -f elc-temp $@
@@ -99,11 +100,13 @@
 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 ?BASE?	    f=$(am__strip_dir) \
 ?!BASE?	    $(am__vpath_adj) \
-	    echo " $(%DIR%LISP_INSTALL) '$$d$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	    @AMPRETTYECHO@ "  [INSTALL]  $$d$$p -> $(DESTDIR)$(%NDIR%dir)/$$f"; \
+	    @AMCMDECHO@ " $(%DIR%LISP_INSTALL) '$$d$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 	    $(%DIR%LISP_INSTALL) "$$d$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \
 ## Only install .elc file if it exists.
 	    if test -f $${p}c; then \
-	      echo " $(%DIR%LISP_INSTALL) '$${p}c' '$(DESTDIR)$(%NDIR%dir)/$${f}c'"; \
+	      @AMPRETTYECHO@ "  [INSTALL]  $${p}c -> $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
+	      @AMCMDECHO@ " $(%DIR%LISP_INSTALL) '$${p}c' '$(DESTDIR)$(%NDIR%dir)/$${f}c'"; \
 	      $(%DIR%LISP_INSTALL) "$${p}c" "$(DESTDIR)$(%NDIR%dir)/$${f}c"; \
 	    else : ; fi; \
 	  done; \
@@ -125,7 +128,8 @@
 	  list='$(%DIR%_LISP)'; for p in $$list; do \
 ?BASE?	    f=$(am__strip_dir) \
 ?!BASE?	    $(am__vpath_adj) \
-	    echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f' '$(DESTDIR)$(%NDIR%dir)/$${f}c'"; \
+	    @AMPRETTYECHO@ "  [RM]  $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
+	    @AMCMDECHO@ " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f' '$(DESTDIR)$(%NDIR%dir)/$${f}c'"; \
 	    rm -f "$(DESTDIR)$(%NDIR%dir)/$$f" "$(DESTDIR)$(%NDIR%dir)/$${f}c"; \
 	  done; \
 	else : ; fi
@@ -138,7 +142,8 @@
 
 .PHONY clean-am: clean-lisp
 clean-lisp:
-	-rm -f elc-stamp $(ELCFILES)
+	@@AMPRETTYECHO@ '  [RM]  elc-stamp $(ELCFILES)'
+	@AMSHOWCMDSAT@-rm -f elc-stamp $(ELCFILES)
 
 
 ## -------------- ##
diff -Nru automake-1.9.6-orig/lib/am/ltlib.am automake-1.9.6/lib/am/ltlib.am
--- automake-1.9.6-orig/lib/am/ltlib.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/ltlib.am	2006-06-16 18:38:11.000000000 +0200
@@ -33,7 +33,7 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%LTLIBRARIES
 install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+	@AMSHOWCMDSAT@test -z "$(%NDIR%dir)" || ( @AMPRETTYECHO@ '  [MKDIR     ]  "$(DESTDIR)$(%NDIR%dir)"'; $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)" )
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
 	@list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
@@ -47,9 +47,10 @@
 ## if the program doesn't have a name that libtool expects.
 ## Use INSTALL and not INSTALL_DATA because libtool knows the right
 ## permissions to use.
-?LIBTOOL?	    echo " $(LIBTOOL) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	    @AMPRETTYECHO@ "  [INSTALL   ]  $$p -> $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?LIBTOOL?	    @AMCMDECHO@ " $(LIBTOOL) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 ?LIBTOOL?	    $(LIBTOOL) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \
-?!LIBTOOL?	    echo " $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+?!LIBTOOL?	    @AMCMDECHO@ " $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 ?!LIBTOOL?	    $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \
 	  else :; fi; \
 	done
@@ -66,9 +67,10 @@
 	@$(NORMAL_UNINSTALL)
 	@set -x; list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
 ?BASE?	  p=$(am__strip_dir) \
-?LIBTOOL?	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
+	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?LIBTOOL?	  @AMCMDECHO@ " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
 ?LIBTOOL?	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \
-?!LIBTOOL?	  echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
+?!LIBTOOL?	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(%NDIR%dir)/$$p'"; \
 ?!LIBTOOL?	  rm -f "$(DESTDIR)$(%NDIR%dir)/$$p"; \
 	done
 endif %?INSTALL%
@@ -80,13 +82,16 @@
 
 .PHONY clean-am: clean-%DIR%LTLIBRARIES
 clean-%DIR%LTLIBRARIES:
-	-test -z "$(%DIR%_LTLIBRARIES)" || rm -f $(%DIR%_LTLIBRARIES)
+	@AMSHOWCMDSAT@-test -z "$(%DIR%_LTLIBRARIES)" || ( \
+	  @AMPRETTYECHO@ '  [RM        ]  $(%DIR%_LTLIBRARIES)'; \
+	  rm -f $(%DIR%_LTLIBRARIES) )
 ## `so_locations' files are created by some linkers (IRIX, OSF) when
 ## building a shared object.  Libtool places these files in the
 ## directory where the shared object is created.
 	@list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
+	  @AMPRETTYECHO@ "  [RM        ] $${dir}/so_locations"; \
+	  @AMCMDECHO@ "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
diff -Nru automake-1.9.6-orig/lib/am/ltlibrary.am automake-1.9.6/lib/am/ltlibrary.am
--- automake-1.9.6-orig/lib/am/ltlibrary.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/ltlibrary.am	2006-06-16 18:38:11.000000000 +0200
@@ -16,4 +16,5 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 %LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP%
-	$(%XLINK%) %RPATH% $(%XLTLIBRARY%_LDFLAGS) $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS)
+	@@AMPRETTYECHO@ '  [LD        ]  %LTLIBRARY%'
+	@AMSHOWCMDSAT@$(%XLINK%) %RPATH% $(%XLTLIBRARY%_LDFLAGS) $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS)
diff -Nru automake-1.9.6-orig/lib/am/mans.am automake-1.9.6/lib/am/mans.am
--- automake-1.9.6-orig/lib/am/mans.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/mans.am	2006-06-16 18:38:11.000000000 +0200
@@ -31,7 +31,7 @@
 .PHONY install-man: install-man%SECTION%
 install-man%SECTION%: $(man%SECTION%_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man%SECTION%dir)" || $(mkdir_p) "$(DESTDIR)$(man%SECTION%dir)"
+	test -z "$(man%SECTION%dir)" || ( @AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(man%SECTION%dir)'; $(mkdir_p) "$(DESTDIR)$(man%SECTION%dir)" )
 	@list='$(man%SECTION%_MANS) $(dist_man%SECTION%_MANS) $(nodist_man%SECTION%_MANS)'; \
 ## Extract all items from man_MANS that should go in this section.
 ## This must be done dynamically to support conditionals.
@@ -57,7 +57,8 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man%SECTION%dir)/$$inst'"; \
+	  @AMPRETTYECHO@ "  [INSTALL   ]  $$file -> $(DESTDIR)$(man%SECTION%dir)/$$inst"; \
+	  @AMCMDECHO@ " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man%SECTION%dir)/$$inst'"; \
 	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man%SECTION%dir)/$$inst"; \
 	done
 
@@ -94,6 +95,7 @@
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man%SECTION%dir)/$$inst'"; \
+	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(man%SECTION%dir)/$$inst"; \
+	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(man%SECTION%dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man%SECTION%dir)/$$inst"; \
 	done
diff -Nru automake-1.9.6-orig/lib/am/program.am automake-1.9.6/lib/am/program.am
--- automake-1.9.6-orig/lib/am/program.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/program.am	2006-06-16 18:38:11.000000000 +0200
@@ -22,5 +22,6 @@
 ## you're using an incremental linker.  Maybe we should think twice?
 ## Or maybe not... sadly, incremental linkers are rarer than losing
 ## systems.
+	@@AMPRETTYECHO@ '  [LD        ]  %PROGRAM%%EXEEXT%'
 	@rm -f %PROGRAM%%EXEEXT%
-	$(%XLINK%) $(%XPROGRAM%_LDFLAGS) $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_LDADD) $(LIBS)
+	@AMSHOWCMDSAT@$(%XLINK%) $(%XPROGRAM%_LDFLAGS) $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_LDADD) $(LIBS)
diff -Nru automake-1.9.6-orig/lib/am/progs.am automake-1.9.6/lib/am/progs.am
--- automake-1.9.6-orig/lib/am/progs.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/progs.am	2006-06-16 18:38:11.000000000 +0200
@@ -30,7 +30,7 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS
 install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+	@AMSHOWCMDSAT@test -z "$(%NDIR%dir)" || ( @AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(%NDIR%dir)'; $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)" )
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
 	@list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
@@ -51,9 +51,10 @@
 ## Note that we explicitly set the libtool mode.  This avoids any
 ## lossage if the install program doesn't have a name that libtool
 ## expects.
-?LIBTOOL?	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(%DIR%PROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	   @AMPRETTYECHO@ "  [INSTALL   ]  $$p -> $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?LIBTOOL?	   @AMCMDECHO@ " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(%DIR%PROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 ?LIBTOOL?	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(%DIR%PROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f" || exit 1; \
-?!LIBTOOL?	   echo " $(INSTALL_PROGRAM_ENV) $(%DIR%PROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+?!LIBTOOL?	   @AMCMDECHO@ " $(INSTALL_PROGRAM_ENV) $(%DIR%PROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 ?!LIBTOOL?	   $(INSTALL_PROGRAM_ENV) $(%DIR%PROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(%NDIR%dir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
@@ -73,7 +74,8 @@
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
 ## Prepend the directory part if nobase_ is used.
 ?!BASE?	  f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
-	  echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(%NDIR%dir)/$$f"; \
+	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \
 	done
 endif %?INSTALL%
@@ -85,7 +87,7 @@
 
 .PHONY clean-am: clean-%DIR%PROGRAMS
 clean-%DIR%PROGRAMS:
-?!LIBTOOL?	-test -z "$(%DIR%_PROGRAMS)" || rm -f $(%DIR%_PROGRAMS)
+?!LIBTOOL?	@AMSHOWCMDSAT@-test -z "$(%DIR%_PROGRAMS)" || ( @AMPRETTYECHO@ '  [RM        ]  $(%DIR%_PROGRAMS)'; rm -f $(%DIR%_PROGRAMS) )
 ## Under Cygwin, we build `program$(EXEEXT)'.  However, if this
 ## program uses a Libtool library, Libtool will move it in
 ## `_libs/program$(EXEEXT)' and create a `program' wrapper (without
@@ -96,7 +98,8 @@
 ## this task to `libtool --mode=clean'.
 ?LIBTOOL?	@list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
 ?LIBTOOL?	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-?LIBTOOL?	  echo " rm -f $$p $$f"; \
+?LIBTOOL?	  @AMPRETTYECHO@ "  [RM        ]  $$p $$f"; \
+?LIBTOOL?	  @AMCMDECHO@ " rm -f $$p $$f"; \
 ?LIBTOOL?	  rm -f $$p $$f ; \
 ?LIBTOOL?	done
 
@@ -108,7 +111,7 @@
 if %?CK-OPTS%
 .PHONY installcheck-am: installcheck-%DIR%PROGRAMS
 installcheck-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
-	bad=0; pid=$$$$; list="$(%DIR%_PROGRAMS)"; for p in $$list; do \
+	@AMSHOWCMDSAT@bad=0; pid=$$$$; list="$(%DIR%_PROGRAMS)"; for p in $$list; do \
 	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
 ## Match $(srcdir)/$$p in addition to $$p because Sun make might rewrite
 ## filenames in AM_INSTALLCHECK_STD_OPTIONS_EXEMPT during VPATH builds.
diff -Nru automake-1.9.6-orig/lib/am/python.am automake-1.9.6/lib/am/python.am
--- automake-1.9.6-orig/lib/am/python.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/python.am	2006-06-16 18:38:11.000000000 +0200
@@ -32,9 +32,9 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%PYTHON
 install-%DIR%PYTHON: $(%DIR%_PYTHON)
 	@$(NORMAL_INSTALL)
-	test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+	@AMSHOWCMDSAT@test -z "$(%NDIR%dir)" || ( @AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(%NDIR%dir)'; $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)" )
 ?!BASE?	@$(am__vpath_adj_setup) \
-?!BASE?	list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
+?!BASE?	@AMSHOWCMDSAT@list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
 ?BASE?	@list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
 ## A file can be in the source directory or the build directory.
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
@@ -46,13 +46,15 @@
 ?!BASE?	    $(am__vpath_adj) \
 	    dlist="$$dlist $$f"; \
 ## Don't perform translation, since script name is important.
-	    echo " $(%DIR%PYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	    @AMPRETTYECHO@ "  [INSTALL   ]  $$b$$p -> $(DESTDIR)$(%NDIR%dir)/$$f"; \
+	    @AMCMDECHO@ " $(%DIR%PYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 	    $(%DIR%PYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \
 	  else :; fi; \
 	done; \
 ## Byte-compile must be done at install time, since file times are
 ## encoded in the actual files.
-	if test -n "$$dlist"; then \
+	@AMSHOWCMDSAT@if test -n "$$dlist"; then \
+	  @AMPRETTYECHO@ "  [PYC       ]  $$dlist"; \
 	  if test -z "$(DESTDIR)"; then \
 	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(%NDIR%dir)" $$dlist; \
 	  else \
@@ -71,10 +73,11 @@
 uninstall-%DIR%PYTHON:
 	@$(NORMAL_UNINSTALL)
 ?!BASE?	@$(am__vpath_adj_setup) \
-?!BASE?	list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
+?!BASE?	@AMSHOWCMDSAT@list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
 ?BASE?	@list='$(%DIR%_PYTHON)'; dlist=''; for p in $$list; do\
 ?BASE?	  f=$(am__strip_dir) \
 ?!BASE?	  $(am__vpath_adj) \
+	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(%NDIR%dir)/$$f{,c,o}"; \
 	  rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \
 ## This is to remove the .pyc and .pyo byte compiled versions (a bit
 ## of a hack).
diff -Nru automake-1.9.6-orig/lib/am/remake-hdr.am automake-1.9.6/lib/am/remake-hdr.am
--- automake-1.9.6-orig/lib/am/remake-hdr.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/remake-hdr.am	2006-06-16 18:38:11.000000000 +0200
@@ -30,14 +30,16 @@
 
 %STAMP%: %CONFIG_H_DEPS% $(top_builddir)/config.status
 	@rm -f %STAMP%
-	cd $(top_builddir) && $(SHELL) ./config.status %CONFIG_H_PATH%
+	@@AMPRETTYECHO@ '  [SH        ]  Regenerate %CONFIG_H_PATH%'
+	@AMSHOWCMDSAT@cd $(top_builddir) && $(SHELL) ./config.status %CONFIG_H_PATH%
 
 
 ## Only the first file of AC_CONFIG_HEADERS is assumed to be generated
 ## by autoheader.
 if %?FIRST%
 %CONFIG_HIN%: %MAINTAINER-MODE% $(am__configure_deps) %FILES%
-	cd $(top_srcdir) && $(AUTOHEADER)
+	@@AMPRETTYECHO@ '  [AUTOHEADER]  Regenerate'
+	@AMSHOWCMDSAT@cd $(top_srcdir) && $(AUTOHEADER)
 ## Whenever $(AUTOHEADER) has run, we must make sure that
 ## ./config.status will rebuild config.h.  The dependency from %STAMP%
 ## on %CONFIG_H_DEPS% (which contains config.hin) is not enough to
@@ -68,11 +70,11 @@
 ##
 ## A solution is to erase %STAMP% here so that the %STAMP% rule
 ## is always triggered after the this one.
-	rm -f %STAMP%
+	@AMSHOWCMDSAT@rm -f %STAMP%
 ## Autoheader has the bad habit of not changing the timestamp if
 ## config.hin is unchanged, which breaks Make targets.  Since what
 ## must not changed gratuitously is config.h, which is already handled
 ## by config.status, there is no reason to make things complex for
 ## config.hin.
-	touch $@
+	@AMSHOWCMDSAT@touch $@
 endif %?FIRST%
diff -Nru automake-1.9.6-orig/lib/am/scripts.am automake-1.9.6/lib/am/scripts.am
--- automake-1.9.6-orig/lib/am/scripts.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/scripts.am	2006-06-16 18:38:11.000000000 +0200
@@ -36,11 +36,11 @@
 ?!EXEC?.PHONY install-data-am: install-%DIR%SCRIPTS
 install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(%NDIR%dir)" || $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)"
+	@AMSHOWCMDSAT@test -z "$(%NDIR%dir)" || ( @AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(%NDIR%dir)'; $(mkdir_p) "$(DESTDIR)$(%NDIR%dir)" )
 ?!BASE?	@$(am__vpath_adj_setup) \
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-?!BASE?	list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
+?!BASE?	@AMSHOWCMDSAT@list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
 ?BASE?	@list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
 ?!BASE?	  $(am__vpath_adj) p=$$f; \
 ## A file can be in the source directory or the build directory.
@@ -54,7 +54,8 @@
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
 ## Prepend the directory part if nobase_ is used.
 ?!BASE?	    f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
-	    echo " $(%DIR%SCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	    @AMPRETTYECHO@ "  [INSTALL   ]  $$d$$p -> $(DESTDIR)$(%NDIR%dir)/$$f"; \
+	    @AMCMDECHO@ " $(%DIR%SCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 	    $(%DIR%SCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \
 	  else :; fi; \
 	done
@@ -70,14 +71,15 @@
 uninstall-%DIR%SCRIPTS:
 	@$(NORMAL_UNINSTALL)
 ?!BASE?	@$(am__vpath_adj_setup) \
-?!BASE?	list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
+?!BASE?	@AMSHOWCMDSAT@list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
 ?BASE?	@list='$(%DIR%_SCRIPTS)'; for p in $$list; do \
 ?!BASE?	  $(am__vpath_adj) p=$$f; \
 ## Remove any leading directory before applying $(transform).
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
 ## Prepend the directory part if nobase_ is used.
 ?!BASE?	  f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
-	  echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
+	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(%NDIR%dir)/$$f"; \
+	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \
 	done
 endif %?INSTALL%
@@ -99,7 +101,7 @@
 if %?CK-OPTS%
 .PHONY installcheck-am: installcheck-%DIR%SCRIPTS
 installcheck-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
-	bad=0; pid=$$$$; list="$(%DIR%_SCRIPTS)"; for p in $$list; do \
+	@AMSHOWCMDSAT@bad=0; pid=$$$$; list="$(%DIR%_SCRIPTS)"; for p in $$list; do \
 	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
 ## Match $(srcdir)/$$p in addition to $$p because Sun make might rewrite
 ## filenames in AM_INSTALLCHECK_STD_OPTIONS_EXEMPT during VPATH builds.
diff -Nru automake-1.9.6-orig/lib/am/tags.am automake-1.9.6/lib/am/tags.am
--- automake-1.9.6-orig/lib/am/tags.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/tags.am	2006-06-16 18:38:11.000000000 +0200
@@ -23,13 +23,14 @@
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 ## Make sure the list of sources is unique.
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	@AMSHOWCMDSAT@list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 ## Handle VPATH correctly.
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
+	@AMPRETTYECHO@ '  [MKID      ]  $$unique'; \
 	mkid -fID $$unique
 
 
@@ -43,7 +44,7 @@
 
 TAGS: %TAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	@AMSHOWCMDSAT@tags=; \
 	here=`pwd`; \
 ## It is tempting to use if/endif here, but don't: the previous
 ## backslash will cause bad results (automake doesn't `see' the `if').
@@ -78,6 +79,7 @@
 ## Make sure we have something to run etags on.
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
+	  @AMPRETTYECHO@ "  [ETAGS     ]  $$tags"; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
@@ -96,7 +98,7 @@
 ## dependencies here are useless.
 CTAGS: %CTAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	@AMSHOWCMDSAT@tags=; \
 	here=`pwd`; \
 ## Make sure the list of sources is unique.
 	list='$(SOURCES) $(HEADERS) %CONFIG% $(LISP) $(TAGS_FILES)'; \
@@ -108,8 +110,10 @@
 	       END { for (i in files) print i; }'`; \
 ## Make sure we have something to run ctags on.
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	  || ( \
+	     @AMPRETTYECHO@ "  [CTAGS     ]  $$tags"; \
+	     $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique )
 
 
 ## --------------- ##
@@ -118,7 +122,8 @@
 
 .PHONY: GTAGS
 GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
+	@@AMPRETTYECHO@ '  [GTAGS     ]'
+	@AMSHOWCMDSAT@here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
@@ -130,4 +135,5 @@
 .PHONY distclean-am: distclean-tags
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	@@AMPRETTYECHO@ '  [RM        ]  TAGS ID GTAGS GRTAGS GSYMS GPATH tags'
+	@AMSHOWCMDSAT@-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
diff -Nru automake-1.9.6-orig/lib/am/texibuild.am automake-1.9.6/lib/am/texibuild.am
--- automake-1.9.6-orig/lib/am/texibuild.am	2005-06-11 00:10:27.000000000 +0200
+++ automake-1.9.6/lib/am/texibuild.am	2006-06-16 18:38:11.000000000 +0200
@@ -34,7 +34,7 @@
 ##    to fail, the info files are not removed.  (They are needed by the
 ##    developer while he writes documentation.)
 ## *.iNN files are used on DJGPP.  See the comments in install-info-am
-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	@AMSHOWCMDSAT@restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 ?INSRC?	am__cwd=`pwd` && cd $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 ## If makeinfo is not installed we must not backup the files so
@@ -45,6 +45,7 @@
 	  done; \
 	else :; fi && \
 ?INSRC?	cd "$$am__cwd"; \
+	@AMPRETTYECHO@ '  [MAKEINFO  ]  %SOURCE_INFO%'; \
 	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \
 ?!INSRC?	 -o $@ `test -f '%SOURCE_INFO%' || echo '$(srcdir)/'`%SOURCE_INFO%; \
 ?INSRC??!GENERIC_INFO?	 -o $@ $(srcdir)/%SOURCE_INFO%; \
@@ -64,7 +65,8 @@
 
 ?GENERIC?%SOURCE_SUFFIX%.dvi:
 ?!GENERIC?%DEST_PREFIX%.dvi: %SOURCE% %DEPS% %DIRSTAMP%
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	@@AMPRETTYECHO@ '  [TEXI2DVI  ]  %SOURCE%'
+	@AMSHOWCMDSAT@TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir (-I $(srcdir) is set in %MAKEINFOFLAGS%).
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS%' \
@@ -74,7 +76,8 @@
 
 ?GENERIC?%SOURCE_SUFFIX%.pdf:
 ?!GENERIC?%DEST_PREFIX%.pdf: %SOURCE% %DEPS% %DIRSTAMP%
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	@@AMPRETTYECHO@ '  [TEXI2PDF  ]  %SOURCE%'
+	@AMSHOWCMDSAT@TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 ## Must set MAKEINFO like this so that version.texi will be found even
 ## if it is in srcdir (-I $(srcdir) is set in %MAKEINFOFLAGS%).
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS%' \
@@ -90,8 +93,9 @@
 ## in the manual change, it may leave unused pages.  Our fix
 ## is to build under a temporary name, and replace the target on
 ## success.
-	rm -rf $(@:.html=.htp)
-	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \
+	@@AMPRETTYECHO@ '  [TEXI2HTML ]  %SOURCE%'
+	@AMSHOWCMDSAT@rm -rf $(@:.html=.htp)
+	@AMSHOWCMDSAT@if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \
 ?GENERIC?	 -o $(@:.html=.htp) %SOURCE%; \
 ?!GENERIC?	 -o $(@:.html=.htp) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
 	then \
diff -Nru automake-1.9.6-orig/lib/am/texinfos.am automake-1.9.6/lib/am/texinfos.am
--- automake-1.9.6-orig/lib/am/texinfos.am	2005-05-24 18:40:06.000000000 +0200
+++ automake-1.9.6/lib/am/texinfos.am	2006-06-16 18:38:11.000000000 +0200
@@ -57,7 +57,8 @@
 if %?LOCAL-TEXIS%
 DVIPS = dvips
 .dvi.ps:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	@@AMPRETTYECHO@ '  [DVIPS     ]  $@'
+	@AMSHOWCMDSAT@TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	$(DVIPS) -o $@ $<
 endif %?LOCAL-TEXIS%
 
@@ -124,7 +125,7 @@
 if %?LOCAL-TEXIS%
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
-	test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
+	@AMSHOWCMDSAT@test -z "$(infodir)" || ( @AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(infodir)'; $(mkdir_p) "$(DESTDIR)$(infodir)" )
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; \
 	for file in $$list; do \
@@ -148,7 +149,8 @@
 	    if test -f $$ifile; then \
 ## Strip directory
 	      relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
-	      echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
+	      @AMPRETTYECHO@ "  [INSTALL   ]  $$ifile -> $(DESTDIR)$(infodir)/$$relfile"; \
+	      @AMCMDECHO@ " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
 	      $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
 	    else : ; fi; \
 	  done; \
@@ -208,7 +210,8 @@
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
 ## install-info needs the actual info file.  We use the installed one,
 ## rather than relying on one still being in srcdir or builddir.
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
+	    @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(infodir)/$$relfile"; \
+	    @AMCMDECHO@ " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
 	    install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
 	  done; \
 	else :; fi
@@ -219,7 +222,8 @@
 ## DJGPP-style info files.  See comment in install-info-am.
 	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
 	  (if cd "$(DESTDIR)$(infodir)"; then \
-	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
+	     @AMPRETTYECHO@ "  [RM        ]  $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
+	     @AMCMDECHO@ " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
 	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
 	   else :; fi); \
 	done
@@ -261,14 +265,16 @@
 mostlyclean-aminfo:
 ## Use `-rf', not just `-f', because %TEXICLEAN% also contains
 ## any directory created by `makeinfo --html'.
-	-rm -rf %TEXICLEAN%
+	@@AMPRETTYECHO@ '  [RM        ]  %TEXICLEAN%'
+	@AMSHOWCMDSAT@-rm -rf %TEXICLEAN%
 
 .PHONY maintainer-clean-am: maintainer-clean-aminfo
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \
 ## .iNN files are DJGPP-style info files.
 	  i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
+	  @AMPRETTYECHO@ "  [RM        ]  $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
+	  @AMCMDECHO@ " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
 	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
 	done
 
diff -Nru automake-1.9.6-orig/lib/am/texi-vers.am automake-1.9.6/lib/am/texi-vers.am
--- automake-1.9.6-orig/lib/am/texi-vers.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/texi-vers.am	2006-06-16 18:38:11.000000000 +0200
@@ -34,7 +34,7 @@
 ## %STAMPVTI% is distributed and %DIRSTAMP% isn't: a distributed file
 ## should never be dependent upon a non-distributed built file.
 ## Therefore we ensure that %DIRSTAMP% exists in the rule.
-?DIRSTAMP?	test -f %DIRSTAMP% || $(MAKE) %DIRSTAMP%
+?DIRSTAMP?	@AMSHOWCMDSAT@test -f %DIRSTAMP% || $(MAKE) %DIRSTAMP%
 	@(dir=.; test -f ./%TEXI% || dir=$(srcdir); \
 	set `$(SHELL) %MDDIR%mdate-sh $$dir/%TEXI%`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
@@ -52,10 +52,12 @@
 
 mostlyclean-am: mostlyclean-%VTI%
 mostlyclean-%VTI%:
-	-rm -f %VTI%.tmp
+	@@AMPRETTYECHO@ '  [RM        ]  %VTI%.tmp'
+	@AMSHOWCMDSAT@-rm -f %VTI%.tmp
 
 maintainer-clean-am: maintainer-clean-%VTI%
 maintainer-clean-%VTI%:
-%MAINTAINER-MODE%	-rm -f %STAMPVTI% %VTEXI%
+	@@AMPRETTYECHO@ '  [RM        ]  %STAMPVTI% %VTEXI%'
+%MAINTAINER-MODE%	@AMSHOWCMDSAT@-rm -f %STAMPVTI% %VTEXI%
 
 .PHONY: mostlyclean-%VTI% maintainer-clean-%VTI%
diff -Nru automake-1.9.6-orig/lib/am/yacc.am automake-1.9.6/lib/am/yacc.am
--- automake-1.9.6-orig/lib/am/yacc.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/yacc.am	2006-06-16 18:38:11.000000000 +0200
@@ -19,18 +19,19 @@
 
 ?GENERIC?%EXT%%DERIVED-EXT%:
 ?!GENERIC?%OBJ%: %SOURCE%
+	@@AMPRETTYECHO@ '  [YACC      ]  %SOURCE'
 if %?MORE-THAN-ONE%
-?GENERIC?	$(SHELL) $(YLWRAP) %SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
+?GENERIC?	@AMSHOWCMDSAT@$(SHELL) $(YLWRAP) %SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?	$(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
+?!GENERIC?	@AMSHOWCMDSAT@$(SHELL) $(YLWRAP) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE%
 else !%?MORE-THAN-ONE%
-?GENERIC?	%COMPILE% %SOURCE%
+?GENERIC?	@AMSHOWCMDSAT@%COMPILE% %SOURCE%
 ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC?	%COMPILE% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?!GENERIC?	@AMSHOWCMDSAT@%COMPILE% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
 ## Edit out Bison multiple inclusion guards.  It may be BISON_Y_TAB_H,
 ## or Y_TAB_H depending upon the version, that's why the regexp is
 ## so loose.
-	if test -f y.tab.h; then \
+	@AMSHOWCMDSAT@if test -f y.tab.h; then \
 	  to=`echo "%BASE%_H" | sed \
                 -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
                 -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
@@ -43,10 +44,10 @@
 	    mv %BASE%.ht %BASE%.h; \
 	  fi; \
 	fi
-	if test -f y.output; then \
+	@AMSHOWCMDSAT@if test -f y.output; then \
 	  mv y.output %BASE%.output; \
 	fi
 ## Edit out `#line' or `#' directives.
-	sed '/^#/ s|y\.tab\.c|%OBJ%|' y.tab.c >%OBJ%t && mv %OBJ%t %OBJ%
-	rm -f y.tab.c
+	@AMSHOWCMDSAT@sed '/^#/ s|y\.tab\.c|%OBJ%|' y.tab.c >%OBJ%t && mv %OBJ%t %OBJ%
+	@AMSHOWCMDSAT@rm -f y.tab.c
 endif !%?MORE-THAN-ONE%
diff -Nru automake-1.9.6-orig/m4/init.m4 automake-1.9.6/m4/init.m4
--- automake-1.9.6-orig/m4/init.m4	2005-01-09 14:04:08.000000000 +0100
+++ automake-1.9.6/m4/init.m4	2006-06-16 19:01:47.000000000 +0200
@@ -89,6 +89,7 @@
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 ])
+AC_REQUIRE([AM_PRETTY_CMDS])
 ])
 
 
diff -Nru automake-1.9.6-orig/m4/prettycmds.m4 automake-1.9.6/m4/prettycmds.m4
--- automake-1.9.6-orig/m4/prettycmds.m4	1970-01-01 01:00:00.000000000 +0100
+++ automake-1.9.6/m4/prettycmds.m4	2006-06-16 21:09:59.000000000 +0200
@@ -0,0 +1,34 @@
+##                                                          -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+
+# AM_PRETTY_CMDS
+# ------------
+AC_DEFUN([AM_PRETTY_CMDS],
+[AC_ARG_ENABLE(pretty-cmds,
+[  --disable-pretty-cmds          show all commands executed
+  --enable-pretty-cmds           do not output the entire command lines])
+AMSHOWCMDSAT=''
+AMDEPSHOWCMDSAT=''
+AMPRETTYECHO=true
+AMCMDECHO=echo
+if test "x$enable_pretty_cmds" == xyes;
+then
+  AMSHOWCMDSAT='@'
+  _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@'
+  AMPRETTYECHO=echo
+  AMCMDECHO=true
+fi
+AC_SUBST([AMSHOWCMDSAT])
+AC_SUBST([AMDEPSHOWCMDSAT])
+AC_SUBST([AMPRETTYECHO])
+AC_SUBST([AMCMDECHO])
+])