From: Stefano Lattarini Date: Wed, 3 Oct 2012 11:07:17 +0000 (+0200) Subject: Merge branch 'master' into ng/master X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88d130e2b105d1fe0546a498d7e43e42345d91af;p=thirdparty%2Fautomake.git Merge branch 'master' into ng/master * master: config headers: remove stale comment in makefile fragment NEWS: wording and quoting fixlets in few older entries config headers: don't emit rules for headers not generated by autoheader docs: fix minor typo: s/expending/expanding/ sync: update files from upstream with "make fetch" maint: post-release minor version bump maint: typo fixes s/lies into/lies in/ release: stable release 1.12.4 NEWS: minor fix Signed-off-by: Stefano Lattarini --- 88d130e2b105d1fe0546a498d7e43e42345d91af diff --cc automake.in index 179987543,9c0c8b9cc..660685398 --- a/automake.in +++ b/automake.in @@@ -3556,6 -4113,8 +3556,7 @@@ sub handle_configure ($@ $output_rules .= file_contents ('remake-hdr', new Automake::Location, - FILES => "@files", + 'FIRST-HDR' => ($hdr_index == 1), CONFIG_H => $cn_sans_dir, CONFIG_HIN => $ins[0], CONFIG_H_DEPS => "@ins", diff --cc lib/am/remake-hdr.am index cf4f013f8,155e7b4cb..54222c078 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@@ -25,11 -24,13 +25,11 @@@ @rm -f %STAMP% cd $(top_builddir) && $(SHELL) ./config.status %CONFIG_H_PATH% - ## Only the first file of AC_CONFIG_HEADERS is assumed to be generated ## by autoheader. - if %?FIRST% + if %?FIRST-HDR% -%CONFIG_HIN%: %MAINTAINER-MODE% $(am__configure_deps) %FILES% -## Cater to parallel BSD make. - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) +%CONFIG_HIN%: $(am.remake.configure-deps) + cd $(top_srcdir) && $(AUTOHEADER) ## Whenever $(AUTOHEADER) has run, we must make sure that ## ./config.status will rebuild config.h. The dependency from %STAMP% ## on %CONFIG_H_DEPS% (which contains config.hin) is not enough to