diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-06-11 12:49:31 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-06-11 12:49:31 +0200 |
| commit | 9474426b7637f2d6dcfa454f0e77bb0ebe1fd741 (patch) | |
| tree | eedd31f19e9223f120bb29db3a932b2e82d09df6 /lib | |
| parent | 9ef5f5ffede710fe01cab5e4a62773a763c2eafd (diff) | |
| parent | 5b7c6b4ce170477dc3a25a5ca669d117bfb40aa8 (diff) | |
| download | automake-9474426b7637f2d6dcfa454f0e77bb0ebe1fd741.tar.gz | |
Merge branch 'maint' into yacc-work
* maint:
test defs: new function 'fatal_', for hard errors
maintcheck: fix some failures, extend some checks
automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
remake: behave better with non-GNU make in subdirectories
tests/README: fix example about `make -e' usage
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Automake/Makefile.in | 3 | ||||
| -rw-r--r-- | lib/Automake/tests/Makefile.in | 3 | ||||
| -rw-r--r-- | lib/Makefile.in | 3 | ||||
| -rw-r--r-- | lib/am/Makefile.in | 3 | ||||
| -rw-r--r-- | lib/am/configure.am | 2 |
5 files changed, 13 insertions, 1 deletions
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 5f051ed57..baccf7dc2 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -181,6 +181,9 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ am_AUTOCONF = @am_AUTOCONF@ am_AUTOHEADER = @am_AUTOHEADER@ +am_AUTOM4TE = @am_AUTOM4TE@ +am_AUTORECONF = @am_AUTORECONF@ +am_AUTOUPDATE = @am_AUTOUPDATE@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index b4940db79..7ed17d61e 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -226,6 +226,9 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ am_AUTOCONF = @am_AUTOCONF@ am_AUTOHEADER = @am_AUTOHEADER@ +am_AUTOM4TE = @am_AUTOM4TE@ +am_AUTORECONF = @am_AUTORECONF@ +am_AUTOUPDATE = @am_AUTOUPDATE@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/lib/Makefile.in b/lib/Makefile.in index d9e41e2d8..bc2a6c03e 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -183,6 +183,9 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ am_AUTOCONF = @am_AUTOCONF@ am_AUTOHEADER = @am_AUTOHEADER@ +am_AUTOM4TE = @am_AUTOM4TE@ +am_AUTORECONF = @am_AUTORECONF@ +am_AUTOUPDATE = @am_AUTOUPDATE@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 352c64f41..649c1bf29 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -141,6 +141,9 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ am_AUTOCONF = @am_AUTOCONF@ am_AUTOHEADER = @am_AUTOHEADER@ +am_AUTOM4TE = @am_AUTOM4TE@ +am_AUTORECONF = @am_AUTORECONF@ +am_AUTOUPDATE = @am_AUTOUPDATE@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ diff --git a/lib/am/configure.am b/lib/am/configure.am index e9299d64b..d00846aaa 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -22,7 +22,7 @@ ## %MAKEFILE% is updated before considering the am--refresh target. if %?TOPDIR_P% .PHONY: am--refresh -am--refresh: +am--refresh: %MAKEFILE% @: endif %?TOPDIR_P% |