* automake.in (file_contents_internal): Do not add newlines before

empty actions.

diff --git a/ChangeLog b/ChangeLog
index 4d03b81d084121ce2ffd73725793943d01c79f11..fbb2c2206a46c1998373249965fff7623f33ac61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-24  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * automake.in (file_contents_internal): Do not add newlines before
+       empty actions.
+
        * aclocal.in (write_aclocal): Take an output file and list of
        used macros in arguments and make up the file contents here.
        (trace_used_macros): New function.

diff --git a/Makefile.in b/Makefile.in
index c0c4d11da41757b914f2a21889d0609eb7119f8b..3b2f571eac9d6e79de7b88645af57053ec711baa 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -644,7 +644,6 @@ clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-
        -rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
@@ -701,7 +700,6 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
        maintainer-clean-generic maintainer-clean-vti

diff --git a/automake.in b/automake.in
index a55f1a94b077a7b96b1586075a7503549c640f6c..5c8dce20ab35fe587c1bc656de1e17c1016c48f8 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5728,7 +5728,7 @@ sub file_contents_internal ($$$%)
                  &depend ($_, @deps);
                  if ($actions{$_})
                    {
-                     $actions{$_} .= "\n$actions";
+                     $actions{$_} .= "\n$actions" if $actions;
                    }
                  else
                    {

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index a2d981776e618282a57b1de2e6abcda253d62a8a..0fe616fae19f5b0c99ef36baab547149a3edc69b 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -292,7 +292,6 @@ clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
@@ -317,7 +316,6 @@ installcheck-am:
 
 maintainer-clean: maintainer-clean-am
        -rm -f Makefile
-
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 06241bb6aaf7ef74a58e9236e991bbee88a654f3..2e3a4ee2e42e7e4ac48c5fef860762d4b2c50361 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -241,7 +241,6 @@ clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
@@ -266,7 +265,6 @@ installcheck-am:
 
 maintainer-clean: maintainer-clean-am
        -rm -f Makefile
-
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am

diff --git a/m4/Makefile.in b/m4/Makefile.in
index a3caf97b5392ee658fcc3e43ffb7827da5a9ee10..477a5f074d4bf589b9d5c8b35b0b46724aa08bb5 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -267,7 +267,6 @@ clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
@@ -292,7 +291,6 @@ installcheck-am:
 
 maintainer-clean: maintainer-clean-am
        -rm -f Makefile
-
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6029145359bc4386a79546483f975e880e29cff6..18981faa7c039c2c7c0cc1f3c173d480f46358ba 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -780,7 +780,6 @@ clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
-
 distclean-am: clean-am distclean-generic distclean-local
 
 dvi: dvi-am
@@ -805,7 +804,6 @@ installcheck-am:
 
 maintainer-clean: maintainer-clean-am
        -rm -f Makefile
-
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am