[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: define configure_deps in a variable to cleanup Makefiles
|
From: |
Alexandre Duret-Lutz |
|
Subject: |
FYI: define configure_deps in a variable to cleanup Makefiles |
|
Date: |
Fri, 25 Apr 2003 22:44:29 +0200 |
|
User-agent: |
Gnus/5.090016 (Oort Gnus v0.16) Emacs/21.2 (gnu/linux) |
I'm installing this.
This list of configure dependencies was repeated at several places.
I've left the Makefile.ins in the patch so you get the feeling :)
2003-04-25 Alexandre Duret-Lutz <address@hidden>
* 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).
Index: Makefile.in
===================================================================
RCS file: /cvs/automake/automake/Makefile.in,v
retrieving revision 1.428
diff -u -r1.428 Makefile.in
--- Makefile.in 25 Apr 2003 18:39:20 -0000 1.428
+++ Makefile.in 25 Apr 2003 20:41:12 -0000
@@ -35,18 +35,20 @@
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 @@
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 @@
$(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)
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1454
diff -u -r1.1454 automake.in
--- automake.in 24 Apr 2003 18:48:03 -0000 1.1454
+++ automake.in 25 Apr 2003 20:41:20 -0000
@@ -4393,8 +4393,9 @@
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 @@
=> $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 '.')
{
Index: lib/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/lib/Makefile.in,v
retrieving revision 1.60
diff -u -r1.60 Makefile.in
--- lib/Makefile.in 25 Apr 2003 18:39:21 -0000 1.60
+++ lib/Makefile.in 25 Apr 2003 20:41:22 -0000
@@ -41,6 +41,14 @@
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 @@
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 @@
$(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)
Index: lib/Automake/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Makefile.in,v
retrieving revision 1.66
diff -u -r1.66 Makefile.in
--- lib/Automake/Makefile.in 25 Apr 2003 18:39:21 -0000 1.66
+++ lib/Automake/Makefile.in 25 Apr 2003 20:41:22 -0000
@@ -37,6 +37,14 @@
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 @@
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 @@
$(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)
Index: lib/Automake/tests/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/tests/Makefile.in,v
retrieving revision 1.10
diff -u -r1.10 Makefile.in
--- lib/Automake/tests/Makefile.in 25 Apr 2003 18:39:21 -0000 1.10
+++ lib/Automake/tests/Makefile.in 25 Apr 2003 20:41:22 -0000
@@ -36,6 +36,14 @@
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 @@
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 @@
$(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
Index: lib/am/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/lib/am/Makefile.in,v
retrieving revision 1.56
diff -u -r1.56 Makefile.in
--- lib/am/Makefile.in 25 Apr 2003 18:39:21 -0000 1.56
+++ lib/am/Makefile.in 25 Apr 2003 20:41:22 -0000
@@ -37,6 +37,14 @@
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 @@
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 @@
$(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)
Index: lib/am/configure.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/configure.am,v
retrieving revision 1.18
diff -u -r1.18 configure.am
--- lib/am/configure.am 25 Apr 2003 18:39:21 -0000 1.18
+++ lib/am/configure.am 25 Apr 2003 20:41:22 -0000
@@ -33,13 +33,13 @@
## --------------------- ##
## 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 @@
## 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 @@
## 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%
Index: m4/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/m4/Makefile.in,v
retrieving revision 1.211
diff -u -r1.211 Makefile.in
--- m4/Makefile.in 25 Apr 2003 18:39:21 -0000 1.211
+++ m4/Makefile.in 25 Apr 2003 20:41:22 -0000
@@ -37,6 +37,14 @@
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 @@
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 @@
$(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)
Index: tests/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.in,v
retrieving revision 1.628
diff -u -r1.628 Makefile.in
--- tests/Makefile.in 25 Apr 2003 18:39:21 -0000 1.628
+++ tests/Makefile.in 25 Apr 2003 20:41:23 -0000
@@ -36,6 +36,14 @@
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 @@
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 @@
$(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)/$@
--
Alexandre Duret-Lutz
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: define configure_deps in a variable to cleanup Makefiles,
Alexandre Duret-Lutz <=