From 4de3f2b8f05b5f46d32af7585e02302382688cbb Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sun, 24 Aug 2003 02:16:31 +0000 Subject: [PATCH] * automake.in (file_contents_internal): Do not add newlines before empty actions. --- ChangeLog | 3 +++ Makefile.in | 2 -- automake.in | 2 +- lib/Automake/tests/Makefile.in | 2 -- lib/am/Makefile.in | 2 -- m4/Makefile.in | 2 -- tests/Makefile.in | 2 -- 7 files changed, 4 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d03b81d0..fbb2c2206 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-08-24 Alexandre Duret-Lutz + * 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 c0c4d11da..3b2f571ea 100644 --- 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 a55f1a94b..5c8dce20a 100755 --- 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 a2d981776..0fe616fae 100644 --- 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 06241bb6a..2e3a4ee2e 100644 --- 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 a3caf97b5..477a5f074 100644 --- 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 602914535..18981faa7 100644 --- 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 -- 2.34.1