summaryrefslogtreecommitdiff
path: root/libada
diff options
context:
space:
mode:
authorrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-30 22:33:49 +0000
committerrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-30 22:33:49 +0000
commita2655af126b7d95fd7824291b5b1be33518c8e7c (patch)
treefe36bb9b424aa4d54d507386453cb4a4b5db4c67 /libada
parent3f501de4aadd548abdae65ccc8291b4d2dc05a64 (diff)
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150277 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libada')
-rw-r--r--libada/ChangeLog5
-rw-r--r--libada/Makefile.in12
2 files changed, 14 insertions, 3 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 2be7dff176f2..0eddf991d728 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,5 +1,10 @@
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * Makefile.in (AUTOCONF, configure_deps): New variables.
+ ($(srcdir)/configure)): Use them. Also depend on multi.m4.
+
+2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
* configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force.
2009-07-13 Eric Botcazou <ebotcazou@adacore.com>
diff --git a/libada/Makefile.in b/libada/Makefile.in
index f5057a006e73..db483b50033d 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -171,9 +171,15 @@ 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)/../config/multi.m4
+
+$(srcdir)/configure: @MAINT@ $(configure_deps)
+ cd $(srcdir) && $(AUTOCONF)
# Don't export variables to the environment, in order to not confuse
# configure.