From: Alexandre Duret-Lutz Date: Fri, 25 Apr 2003 20:46:21 +0000 (+0000) Subject: * automake.in (handle_configure): Don't add @configure_deps to X-Git-Tag: Release-1-7b~192 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cfc348e7ecf981a54ba31bf0d59d2520fffd165;p=thirdparty%2Fautomake.git * automake.in (handle_configure): Don't add @configure_deps to DIST_COMMON, we do this from lib/am/configure.am now. Define the am__configure_deps variable instead of substituing %CONFIGURE_DEPS%. * lib/am/configure.am (%MAKEFILE-IN%, $(top_srcdir)/configure, $(ACLOCAL_M4)): Use $(am__configure_deps) instead of %CONFIGURE_DEPS%. (DIST_COMMON): Add $(am__configure_deps). --- diff --git a/ChangeLog b/ChangeLog index 99b5697ee..ca5285245 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2003-04-25 Alexandre Duret-Lutz + * automake.in (handle_configure): Don't add @configure_deps to + DIST_COMMON, we do this from lib/am/configure.am now. + Define the am__configure_deps variable instead of substituing + %CONFIGURE_DEPS%. + * lib/am/configure.am (%MAKEFILE-IN%, $(top_srcdir)/configure, + $(ACLOCAL_M4)): Use $(am__configure_deps) instead of %CONFIGURE_DEPS%. + (DIST_COMMON): Add $(am__configure_deps). + * tests/aclocal6.test: New file. * lib/am/configure.am (am--refresh): New rule. (%MAKEFILE-IN%, %MAKEFILE%, $(top_builddir)/config.status, diff --git a/Makefile.in b/Makefile.in index 62c3e90c1..dbca2a559 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,18 +35,20 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : DIST_COMMON = Makefile.in Makefile.am COPYING INSTALL NEWS README \ - AUTHORS ChangeLog THANKS aclocal.m4 $(top_srcdir)/m4/init.m4 \ + AUTHORS ChangeLog THANKS aclocal.m4 configure configure.in \ + $(am__configure_deps) version.texi stamp-vti AUTHORS COPYING \ + ChangeLog INSTALL NEWS README THANKS TODO configure \ + configure.in +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__configure_deps = $(top_srcdir)/m4/init.m4 \ $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 \ $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 \ $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 \ $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 \ $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 \ - $(top_srcdir)/m4/runlog.m4 configure configure.in version.texi \ - stamp-vti AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \ - TODO configure configure.in -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + $(top_srcdir)/m4/runlog.m4 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs @@ -189,9 +191,9 @@ all: all-recursive am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno am--refresh: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps) @for dep in $?; do \ - case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \ + case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \ *$$dep*) \ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ cd $(srcdir) && $(AUTOMAKE) --gnu ; \ @@ -214,9 +216,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(top_srcdir)/configure.in $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) binSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-binSCRIPTS: $(bin_SCRIPTS) diff --git a/automake.in b/automake.in index 58f129a54..87842d250 100755 --- a/automake.in +++ b/automake.in @@ -4393,8 +4393,9 @@ sub handle_configure my ($regen_aclocal_m4, @aclocal_m4_deps) = scan_aclocal_m4 (); - push_dist_common (@configure_deps) - if $relative_dir eq '.'; + + define_pretty_variable ('am__configure_deps', TRUE, INTERNAL, + @configure_deps); $output_rules .= &file_contents ('configure', @@ -4411,8 +4412,7 @@ sub handle_configure => $cmdline_use_dependencies ? '' : ' --ignore-deps', 'MAKEFILE-AM-SOURCES' => "$input$colon_infile", 'REGEN-ACLOCAL-M4' => $regen_aclocal_m4, - ACLOCAL_M4_DEPS => "@aclocal_m4_deps", - CONFIGURE_DEPS => "@configure_deps"); + ACLOCAL_M4_DEPS => "@aclocal_m4_deps"); if ($relative_dir eq '.') { diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index d7614802f..af55fe2d0 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -37,6 +37,14 @@ POST_UNINSTALL = : DIST_COMMON = Makefile.in Makefile.am $(dist_perllib_DATA) subdir = lib/Automake ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__configure_deps = $(top_srcdir)/m4/init.m4 \ + $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 \ + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 \ + $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 \ + $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 \ + $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 \ + $(top_srcdir)/m4/runlog.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = @@ -134,9 +142,9 @@ dist_perllib_DATA = \ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps) @for dep in $?; do \ - case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \ + case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \ *$$dep*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \ exit 0;; \ @@ -157,9 +165,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(top_srcdir)/configure.in $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: dist_perllibDATA_INSTALL = $(INSTALL_DATA) diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 4e45b86f7..d5a4ca583 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -36,6 +36,14 @@ POST_UNINSTALL = : DIST_COMMON = Makefile.in Makefile.am subdir = lib/Automake/tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__configure_deps = $(top_srcdir)/m4/init.m4 \ + $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 \ + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 \ + $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 \ + $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 \ + $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 \ + $(top_srcdir)/m4/runlog.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = @@ -114,9 +122,9 @@ EXTRA_DIST = $(TESTS) all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps) @for dep in $?; do \ - case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \ + case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \ *$$dep*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \ exit 0;; \ @@ -137,9 +145,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(top_srcdir)/configure.in $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS diff --git a/lib/Makefile.in b/lib/Makefile.in index f67448c72..364dddceb 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -41,6 +41,14 @@ DIST_COMMON = Makefile.in Makefile.am $(dist_pkgvdata_DATA) \ config.guess config.sub subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__configure_deps = $(top_srcdir)/m4/init.m4 \ + $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 \ + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 \ + $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 \ + $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 \ + $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 \ + $(top_srcdir)/m4/runlog.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = @@ -132,9 +140,9 @@ mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps) @for dep in $?; do \ - case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \ + case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \ *$$dep*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \ exit 0;; \ @@ -155,9 +163,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(top_srcdir)/configure.in $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: dist_pkgvdataDATA_INSTALL = $(INSTALL_DATA) diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 7d50df189..5b7ff54ca 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -37,6 +37,14 @@ POST_UNINSTALL = : DIST_COMMON = Makefile.in Makefile.am $(dist_am_DATA) subdir = lib/am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__configure_deps = $(top_srcdir)/m4/init.m4 \ + $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 \ + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 \ + $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 \ + $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 \ + $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 \ + $(top_srcdir)/m4/runlog.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = @@ -120,9 +128,9 @@ texinfos.am yacc.am all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps) @for dep in $?; do \ - case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \ + case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \ *$$dep*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \ exit 0;; \ @@ -143,9 +151,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(top_srcdir)/configure.in $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: dist_amDATA_INSTALL = $(INSTALL_DATA) diff --git a/lib/am/configure.am b/lib/am/configure.am index fc3115f72..474e83138 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -33,13 +33,13 @@ endif %?TOPDIR_P% ## --------------------- ## ## This rule remakes the Makefile.in. -%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) %CONFIGURE_DEPS% +%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(am__configure_deps) ## If configure.ac or one of configure's dependencies has changed, all ## Makefile.in are to be updated; it is then more efficient to run ## automake on all the Makefiles at once. It also allow Automake to be ## run for newly added directories. @for dep in $?; do \ - case '$(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) %CONFIGURE_DEPS%' in \ + case '$(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(am__configure_deps)' in \ *$$dep*) \ ?TOPDIR_P? echo ' cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS%'; \ ?TOPDIR_P? cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS%; \ @@ -84,14 +84,14 @@ if %?TOPDIR_P% ## don't exist. This is especially important for configure, since it ## won't be created until autoconf is run -- which might be after ## automake is run. -DIST_COMMON += configure %CONFIGURE-AC% +DIST_COMMON += configure %CONFIGURE-AC% $(am__configure_deps) endif %?TOPDIR_P% $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ?TOPDIR_P? $(SHELL) ./config.status --recheck ?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) %CONFIGURE_DEPS% +$(top_srcdir)/configure: %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps) ?TOPDIR_P? cd $(srcdir) && $(AUTOCONF) ?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -106,9 +106,9 @@ $(top_srcdir)/configure: %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCA ## Whenever a configure dependency changes we need to rebuild ## aclocal.m4 too. Changing configure.ac, or any file included by ## aclocal.m4 might require adding more files to aclocal.m4. Hence -## the %CONFIGURE_DEPS% dependency. +## the $(am__configure_deps) dependency. if %?REGEN-ACLOCAL-M4% -$(ACLOCAL_M4): %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% %ACLOCAL_M4_DEPS% %CONFIGURE_DEPS% +$(ACLOCAL_M4): %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% %ACLOCAL_M4_DEPS% $(am__configure_deps) ?TOPDIR_P? cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh endif %?REGEN-ACLOCAL-M4% diff --git a/m4/Makefile.in b/m4/Makefile.in index 109094891..4df46453e 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -37,6 +37,14 @@ POST_UNINSTALL = : DIST_COMMON = Makefile.in Makefile.am $(dist_m4data_DATA) subdir = m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__configure_deps = $(top_srcdir)/m4/init.m4 \ + $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 \ + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 \ + $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 \ + $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 \ + $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 \ + $(top_srcdir)/m4/runlog.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = SOURCES = @@ -150,9 +158,9 @@ EXTRA_DIST = dirlist all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps) @for dep in $?; do \ - case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \ + case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \ *$$dep*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \ exit 0;; \ @@ -173,9 +181,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(top_srcdir)/configure.in $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: dist_m4dataDATA_INSTALL = $(INSTALL_DATA) diff --git a/tests/Makefile.in b/tests/Makefile.in index b86ee2845..2f0381138 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -36,6 +36,14 @@ POST_UNINSTALL = : DIST_COMMON = Makefile.in Makefile.am defs.in README subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__configure_deps = $(top_srcdir)/m4/init.m4 \ + $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 \ + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 \ + $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 \ + $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 \ + $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 \ + $(top_srcdir)/m4/runlog.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = defs SOURCES = @@ -578,9 +586,9 @@ check_SCRIPTS = defs all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps) @for dep in $?; do \ - case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4' in \ + case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \ *$$dep*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \ exit 0;; \ @@ -601,9 +609,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(top_srcdir)/configure.in $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/amversion.m4 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/depend.m4 $(top_srcdir)/m4/depout.m4 $(top_srcdir)/m4/make.m4 $(top_srcdir)/m4/cond.m4 $(top_srcdir)/m4/runlog.m4 +$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh defs: $(top_builddir)/config.status defs.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@