[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: $(am__configure_deps) and $(am__aclocal_m4_deps)
From: |
Alexandre Duret-Lutz |
Subject: |
FYI: $(am__configure_deps) and $(am__aclocal_m4_deps) |
Date: |
Mon, 27 Oct 2003 08:51:44 +0100 |
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3 (gnu/linux) |
I'm checking this in. Putting these dependencies into variables
make sure we don't forget some dependencies on some rules.
2003-10-27 Alexandre Duret-Lutz <address@hidden>
* automake.in (handle_configure): Rename am__configure_deps
as am__aclocal_m4_deps and include $(ACLOCAL_M4_SOURCES) and
$configure_ac. Define am__configure_deps as am__aclocal_m4_deps
+ $(CONFIGURE_DEPENDENCIES) + $(ACLOCAL_M4). Do not define
ACLOCAL_M4_DEPS while processing configure.am.
(make_paragraphs): Do not define %CONFIGURE_AC%, now unused.
(scan_aclocal_m4): Do not distribute aclocal.m4, this
is done from lib/am/configure.am.
* lib/am/configure.am (%MAKEFILE-IN%, DIST_COMMON,
$(top_srcdir)/configure, $(ACLOCAL_M4)): Simplify using
$(am__configure_deps) or $(am__aclocal_m4_deps).
* lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Likewise.
Index: Makefile.in
===================================================================
RCS file: /cvs/automake/automake/Makefile.in,v
retrieving revision 1.456
diff -u -r1.456 Makefile.in
--- Makefile.in 21 Oct 2003 13:05:54 -0000 1.456
+++ Makefile.in 27 Oct 2003 07:44:07 -0000
@@ -37,14 +37,16 @@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
- Makefile.am NEWS THANKS TODO aclocal.m4 configure configure.ac
+ Makefile.am NEWS THANKS TODO configure configure.ac
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
$(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \
$(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \
$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/options.m4 \
$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
- $(top_srcdir)/m4/strip.m4
+ $(top_srcdir)/m4/strip.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
@@ -168,9 +170,9 @@
.SUFFIXES:
am--refresh:
@:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
$(am__configure_deps)
+$(srcdir)/Makefile.in: Makefile.am $(am__configure_deps)
@for dep in $?; do \
- case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)'
in \
+ case '$(am__configure_deps)' in \
*$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
cd $(srcdir) && $(AUTOMAKE) --gnu \
@@ -194,9 +196,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
$(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(top_srcdir)/configure.ac $(am__configure_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1509
diff -u -r1.1509 automake.in
--- automake.in 26 Oct 2003 21:20:09 -0000 1.1509
+++ automake.in 27 Oct 2003 07:44:11 -0000
@@ -3288,8 +3288,6 @@
if (-f 'aclocal.m4')
{
- &push_dist_common ('aclocal.m4')
- if $relative_dir eq '.';
&define_variable ("ACLOCAL_M4", '$(top_srcdir)/aclocal.m4', INTERNAL);
my $aclocal = new Automake::XFile "< aclocal.m4";
@@ -3375,8 +3373,13 @@
$colon_infile = '' if $colon_infile eq ":$makefile.in";
my @rewritten = rewrite_inputs_into_dependencies ($makefile_in, @inputs);
my ($regen_aclocal_m4, @aclocal_m4_deps) = scan_aclocal_m4;
+ define_pretty_variable ('am__aclocal_m4_deps', TRUE, INTERNAL,
+ @configure_deps, @aclocal_m4_deps,
+ '$(top_srcdir)/' . $configure_ac);
+ my @configuredeps = ('$(am__aclocal_m4_deps)', '$(CONFIGURE_DEPENDENCIES)');
+ push @configuredeps, '$(ACLOCAL_M4)' if -f 'aclocal.m4';
define_pretty_variable ('am__configure_deps', TRUE, INTERNAL,
- @configure_deps);
+ @configuredeps);
$output_rules .= file_contents
('configure',
@@ -3392,8 +3395,7 @@
'USE-DEPS' => global_option 'no-dependencies'
? ' --ignore-deps' : '',
'MAKEFILE-AM-SOURCES' => "$makefile$colon_infile",
- 'REGEN-ACLOCAL-M4' => $regen_aclocal_m4,
- ACLOCAL_M4_DEPS => "@aclocal_m4_deps");
+ 'REGEN-ACLOCAL-M4' => $regen_aclocal_m4);
if ($relative_dir eq '.')
{
@@ -5590,7 +5592,6 @@
'SUBDIRS' => !! var ('SUBDIRS'),
'TOPDIR' => backname ($relative_dir),
'TOPDIR_P' => $relative_dir eq '.',
- 'CONFIGURE-AC' => $configure_ac,
'BUILD' => $seen_canonical == AC_CANONICAL_SYSTEM,
'HOST' => $seen_canonical,
Index: lib/am/configure.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/configure.am,v
retrieving revision 1.25
diff -u -r1.25 configure.am
--- lib/am/configure.am 23 Sep 2003 08:14:35 -0000 1.25
+++ lib/am/configure.am 27 Oct 2003 07:44:13 -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) $(am__configure_deps)
+%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS%
$(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)
$(am__configure_deps)' in \
+ case '$(am__configure_deps)' in \
*$$dep*) \
?TOPDIR_P? echo ' cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS%
%USE-DEPS%'; \
?TOPDIR_P? cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% \
@@ -87,14 +87,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 += $(top_srcdir)/configure %CONFIGURE-AC% $(am__configure_deps)
+DIST_COMMON += $(top_srcdir)/configure $(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) $(am__configure_deps)
+$(top_srcdir)/configure: %MAINTAINER-MODE% $(am__configure_deps)
?TOPDIR_P? cd $(srcdir) && $(AUTOCONF)
?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -111,7 +111,7 @@
## aclocal.m4 might require adding more files to aclocal.m4. Hence
## the $(am__configure_deps) dependency.
if %?REGEN-ACLOCAL-M4%
-$(ACLOCAL_M4): %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC%
%ACLOCAL_M4_DEPS% $(am__configure_deps)
+$(ACLOCAL_M4): %MAINTAINER-MODE% $(am__aclocal_m4_deps)
?TOPDIR_P? cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
endif %?REGEN-ACLOCAL-M4%
Index: lib/am/remake-hdr.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/remake-hdr.am,v
retrieving revision 1.40
diff -u -r1.40 remake-hdr.am
--- lib/am/remake-hdr.am 26 Oct 2003 22:07:46 -0000 1.40
+++ lib/am/remake-hdr.am 27 Oct 2003 07:44:13 -0000
@@ -36,7 +36,7 @@
## Only the first file of AC_CONFIG_HEADERS is assumed to be generated
## by autoheader.
if %?FIRST_CONFIG_HIN%
-$(srcdir)/%CONFIG_HIN%: %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC%
$(ACLOCAL_M4) $(am__configure_deps) %FILES%
+$(srcdir)/%CONFIG_HIN%: %MAINTAINER-MODE% $(am__configure_deps) %FILES%
cd $(top_srcdir) && $(AUTOHEADER)
## Autoheader has the bad habit of not changing the time stamp if
## config.hin is unchanged, which breaks Make targets. Since what
--
Alexandre Duret-Lutz
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: $(am__configure_deps) and $(am__aclocal_m4_deps),
Alexandre Duret-Lutz <=