diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-31 08:31:59 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-31 08:31:59 +0100 |
| commit | 3c66523fe55c94b19b5b26e0eae1c8de1d47d0cd (patch) | |
| tree | 6dcdba379f5b0c6176d073e67fb7ac7c5c22d4a4 /m4 | |
| parent | a6c171136d2086f6c4bc4a50d1771c0e1b58ba10 (diff) | |
| parent | 32cde2a4722d25ad41e5ae2e33d43ceb2c6f4a90 (diff) | |
| download | automake-3c66523fe55c94b19b5b26e0eae1c8de1d47d0cd.tar.gz | |
Merge branch 'maint'
* maint:
tests: do not assume the object file extension is .o
tests: avoid spurious failure of 'transform2.test' on Cygwin
tests: avoid spurious failure of deleted-am.test with FreeBSD make
tests: avoid possibly undeserved PASS from check8.test
warnings: more precise category and message for one warning
release: revamp rules to tag and upload the releases
amversion: add missing dependency
hacking: update advice w.r.t. synced files
hacking: don't reference ChangeLog anymore
+ Extra non-trivial edits:
* tests/suffix8.tap: Copy in (by hand) the modifications done
to 'suffix8.test' on maint, i.e., the addition of an explicit
'.y_.obj:' suffix rule to Makefile.am.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am index b2f937d01..d683a5b34 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -68,7 +68,7 @@ EXTRA_DIST = acdir/.placeholder amversion.in # loop otherwise. # Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is # how amversion.m4 appears in our dependencies. -$(top_srcdir)/m4/amversion.m4: $(srcdir)/amversion.in +$(top_srcdir)/m4/amversion.m4: $(top_srcdir)/configure.ac $(srcdir)/amversion.in $(AM_V_at)sed \ -e 's,[@]VERSION[@],$(VERSION),g' \ -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ |