diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2003-09-23 08:14:35 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2003-09-23 08:14:35 +0000 |
| commit | 74fe06a8da51f85af74d7cb8ec9b5531f4939bfb (patch) | |
| tree | e5d4254f9f3dbee65fd12de1b76416396ecf36e1 /lib/am/configure.am | |
| parent | 9cf2ab697fb786e5d4e73e4448b962327ac07582 (diff) | |
| download | automake-74fe06a8da51f85af74d7cb8ec9b5531f4939bfb.tar.gz | |
Support for multiple inputs in AC_CONFIG_FILES.
Requested long ago by Harlan Stenn.
* automake.in (handle_dist): Remove unused argument $makefile.
(handle_subdirs): Expect SUBDIRS elements in $relative_dir,
not $am_relative_dir.
(rewrite_inputs_into_dependencies): Allow $add_srcdir to
be a filename that must always be prefixed by $(srcdir) or
$(top_srcdir).
(handle_configure, generate_makefile): Revamp to make the
Makefile.am, Makefile.in, Makefile more independent.
(locate_am): New function.
(scan_configure_dep, parse_arguments): Use locate_am.
(MAIN): Adjust call to generate_makefile.
* lib/am/configure.am: Remove %MAKEFILE-IN% from the dependencies
of %MAKEFILE%. %MAKEFILE-IN% is already in %MAKEFILE-DEPS%.
* tests/output6.test, tests/output7.test: New files.
* tests/Makefile.am (TESTS): Add them.
* automake.texi (Requirements) <AC_CONFIG_FILES>: Document how
multiple inputs are scanned.
Diffstat (limited to 'lib/am/configure.am')
| -rw-r--r-- | lib/am/configure.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/am/configure.am b/lib/am/configure.am index 2f399ae00..a274ea4be 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -54,7 +54,7 @@ endif %?TOPDIR_P% $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES% ## This rule remakes the Makefile. -%MAKEFILE%: %MAINTAINER-MODE% %MAKEFILE-IN% %MAKEFILE-DEPS% $(top_builddir)/config.status +%MAKEFILE%: %MAINTAINER-MODE% %MAKEFILE-DEPS% $(top_builddir)/config.status ## If Makefile is to be updated because of config.status, then run ## config.status without argument in order to (i) rerun all the ## AC_CONFIG_COMMANDS including those that are not visible to |