+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 (¯o_define): Don't rely on $1.
.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
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
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
# 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 || '');
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);
# 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;
.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
.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