* automake.in (&file_contents): Use rule_define.

diff --git a/ChangeLog b/ChangeLog
index 8b2a7247151b70f052677c13eafc24f5da3e8af1..3f594dfc6c7df8972da6e30a45683bc0a34e58ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-23  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&file_contents): Use rule_define.
+
 2001-03-23  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&macro_define): Don't rely on $1.

diff --git a/Makefile.in b/Makefile.in
index 6bc48eff71e6101315cc1c921285faad0c33c6c7..6f93b5977841dc98bf922c9098778a509f645f2d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -140,11 +140,11 @@ all: all-recursive
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
 
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnits  Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=$@ $(SHELL) ./config.status
@@ -153,7 +153,7 @@ $(ACLOCAL_M4): configure.in
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 automake: $(top_builddir)/config.status automake.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
@@ -181,7 +181,7 @@ uninstall-binSCRIPTS:
          rm -f $(DESTDIR)$(bindir)/$$f; \
        done
 
-$(srcdir)/version.texi: $(srcdir)/stamp-vti
+$(srcdir)/version.texi:  $(srcdir)/stamp-vti
        @:
 
 $(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in

diff --git a/automake.in b/automake.in
index f0d97a4de78bf11530522d8ae8fc3aa5a6fab04c..4980f1921925475e085e9d82c5363b1ed3528aad 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6771,6 +6771,7 @@ sub file_contents ($%)
          # line).
          # I'm quite shoked!  It seems that (\\\n|[^\n]) is not the
          # same as `([^\n]|\\\n)!!!  Don't swap it, it breaks.
+         my $paragraph = $_;
          /^((?:\\\n|[^\n])*)(?:\n(\t.*))?$/som;
          my ($relationship, $actions) = ($1, $2 || '');
 
@@ -6784,6 +6785,8 @@ sub file_contents ($%)
 
          foreach (split (' ' , $targets))
            {
+             # FIXME: We are not robust to people defining several targets
+             # at once, only some of them being in %dependencies.
              if (defined $dependencies{$_})
                {
                  &depend ($_, @deps);
@@ -6795,18 +6798,8 @@ sub file_contents ($%)
                  # targets instead of one by one.
                  if (!defined $targets{$targets})
                    {
-                     # Some hair to avoid spurious trailing blank
-                     # when there are no dependencies.
-                     $result_rules .= "$separator$comment";
-                     $result_rules .= "$targets:";
-                     $result_rules .= " $dependencies"
-                       if $dependencies;
-                     $result_rules .= "\n";
-                     # Only add actions if we found some.  Otherwise
-                     # we can end up with a spurious newline.  See
-                     # pr87.test.
-                     $result_rules .= "$actions\n"
-                         if $actions;
+                     $result_rules .= "$separator$comment$paragraph\n";
+                     rule_define ($targets, 1, '', $.);
                    }
                  $comment = $separator = '';
                  last;

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 66c195b1134f0a1ee8d7cd30e85f59f66ba0e3c3..6ead21c7008f23d1223ecc062c7beaa1cdca41bb 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -99,11 +99,11 @@ all: all-am
 
 .SUFFIXES:
 
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnits  m4/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0373c8447ba7a358b2ab21bb102e1dfaa1d92c9d..c29f544f2bb210fb439fedee85be94799f6cdddf 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -368,11 +368,11 @@ all: all-am
 
 .SUFFIXES:
 
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnits  tests/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status