From 6efbd53f258e718b12b7a411912b2d639ed7a197 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 30 Jul 2009 22:33:49 +0000 Subject: Makefile.in (AUTOCONF, [...]): New variables. fixincludes/ * Makefile.in (AUTOCONF, AUTOHEADER, ACLOCAL, ACLOCAL_AMFLAGS): New variables. ($(srcdir)/configure, $(srcdir)/config.h.in, $(srcdir)/aclocal.m4): Use them. gcc/ * Makefile.in (AUTOCONF, ACLOCAL, ACLOCAL_AMFLAGS, aclocal_deps): New variables. ($(srcdir)/configure, $(srcdir)/aclocal.m4): New rules. (AUTOHEADER): New variable. ($(srcdir)/cstamp-h.in): Use it. gnattools/ * Makefile.in (AUTOCONF, configure_deps): New variables. ($(srcdir)/configure): Use them. libada/ * Makefile.in (AUTOCONF, configure_deps): New variables. ($(srcdir)/configure)): Use them. Also depend on multi.m4. libgcc/ * configure.ac: Add snippet for maintainer-mode. * configure: Regenerate. * Makefile.in (AUTOCONF, configure_deps): New variables. ($(srcdir)/configure)): New rule, active only with maintainer mode turned on. libiberty/ * Makefile.in (AUTOCONF, configure_deps): New variables. ($(srcdir)/configure): New rule, active only in maintainer mode. libobjc/ * Makefile.in (AUTOCONF, ACLOCAL, ACLOCAL_AMFLAGS, aclocal_deps): New variables. ($(srcdir)/configure, $(srcdir)/aclocal.m4): New rules. intl/ * Makefile.in (aclocal_deps): New variable. ($(srcdir)/aclocal.m4): Use it, for portable makefile syntax. libdecnumber/ * Makefile.in (aclocal_deps): New variable. ($(srcdir)/aclocal.m4): Use it, for portable makefile syntax. From-SVN: r150277 --- gnattools/ChangeLog | 5 +++++ gnattools/Makefile.in | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'gnattools') diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog index d8cbe086f4a..ff395ea7783 100644 --- a/gnattools/ChangeLog +++ b/gnattools/ChangeLog @@ -1,3 +1,8 @@ +2009-07-30 Ralf Wildenhues + + * Makefile.in (AUTOCONF, configure_deps): New variables. + ($(srcdir)/configure): Use them. + 2009-05-18 Bechir Zalila PR ada/40166 diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index 92f4773b3d8..93198967857 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -305,9 +305,14 @@ Makefile: $(srcdir)/Makefile.in config.status config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac \ - $(srcdir)/../config/acx.m4 $(srcdir)/../config/override.m4 - cd $(srcdir) && autoconf +AUTOCONF = autoconf +configure_deps = \ + $(srcdir)/configure.ac \ + $(srcdir)/../config/acx.m4 \ + $(srcdir)/../config/override.m4 + +$(srcdir)/configure: @MAINT@ $(configure_deps) + cd $(srcdir) && $(AUTOCONF) # Don't export variables to the environment, in order to not confuse # configure. -- cgit v1.2.1