aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2009-08-13 17:04:01 +0000
committerDJ Delorie <dj@redhat.com>2009-08-13 17:04:01 +0000
commit626aaf890945123ad73b1d9da5cd8bcc1f22f7ae (patch)
tree929b6553a6bb04c21ea2f088deb7c22ffb036f7b /libiberty
parentb84aa90aa5b2c265030ca85a70a4547f8f893690 (diff)
downloadbinutils-626aaf890945123ad73b1d9da5cd8bcc1f22f7ae.zip
binutils-626aaf890945123ad73b1d9da5cd8bcc1f22f7ae.tar.gz
binutils-626aaf890945123ad73b1d9da5cd8bcc1f22f7ae.tar.bz2
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/Makefile.in10
2 files changed, 15 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 16f541e..b2f4120 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * Makefile.in (AUTOCONF, configure_deps): New variables.
+ ($(srcdir)/configure): New rule, active only in maintainer mode.
+
2009-07-29 Douglas B Rupp <rupp@gnat.com>
* make-temp-file.c (choose_tmpdir): Try standard temp logical on VMS.
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 20a7210..e8f4f4d 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -459,6 +459,16 @@ stamp-h: $(srcdir)/config.in config.status Makefile
config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck
+AUTOCONF = autoconf
+configure_deps = $(srcdir)/aclocal.m4 \
+ $(srcdir)/../config/acx.m4 \
+ $(srcdir)/../config/no-executables.m4 \
+ $(srcdir)/../config/override.m4 \
+ $(srcdir)/../config/warnings.m4 \
+
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(configure_deps)
+ cd $(srcdir) && $(AUTOCONF)
+
# Depending on config.h makes sure that config.status has been re-run
# if needed. This prevents problems with parallel builds, in case
# subdirectories need to run config.status also.