summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fixincludes/ChangeLog7
-rw-r--r--fixincludes/Makefile.in11
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/Makefile.in35
-rw-r--r--gcc/aclocal.m410
-rw-r--r--gnattools/ChangeLog5
-rw-r--r--gnattools/Makefile.in11
-rw-r--r--intl/ChangeLog5
-rw-r--r--intl/Makefile.in32
-rw-r--r--libada/ChangeLog5
-rw-r--r--libada/Makefile.in12
-rw-r--r--libdecnumber/ChangeLog5
-rw-r--r--libdecnumber/Makefile.in8
-rw-r--r--libgcc/ChangeLog8
-rw-r--r--libgcc/Makefile.in11
-rw-r--r--libgcc/configure23
-rw-r--r--libgcc/configure.ac15
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/Makefile.in10
-rw-r--r--libobjc/ChangeLog6
-rw-r--r--libobjc/Makefile.in20
-rw-r--r--libobjc/aclocal.m46
22 files changed, 222 insertions, 36 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 35260caca66..62300af7c25 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * Makefile.in (AUTOCONF, AUTOHEADER, ACLOCAL, ACLOCAL_AMFLAGS):
+ New variables.
+ ($(srcdir)/configure, $(srcdir)/config.h.in, $(srcdir)/aclocal.m4):
+ Use them.
+
2009-07-04 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
* inclhack.def (darwin_stdint_5, darwin_stdint_6,
diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in
index 1f89cf9edeb..f91a70d2e6e 100644
--- a/fixincludes/Makefile.in
+++ b/fixincludes/Makefile.in
@@ -63,6 +63,11 @@ itoolsdatadir = $(libsubdir)/install-tools
# Locate mkinstalldirs.
mkinstalldirs=$(SHELL) $(srcdir)/../mkinstalldirs
+AUTOCONF = autoconf
+AUTOHEADER = autoheader
+ACLOCAL = aclocal
+ACLOCAL_AMFLAGS = -I ../gcc -I .. -I ../config
+
default : all
# Now figure out from those variables how to compile and link.
@@ -159,13 +164,13 @@ config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4
- cd $(srcdir) && autoconf
+ cd $(srcdir) && $(AUTOCONF)
$(srcdir)/config.h.in: @MAINT@ $(srcdir)/configure.ac
- cd $(srcdir) && autoheader
+ cd $(srcdir) && $(AUTOHEADER)
$(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/configure.ac
- cd $(srcdir) && aclocal -I ../gcc -I .. -I ../config
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
check : all
autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4358c842638..a37f9dc2350 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * 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.
+
2009-07-30 Michael Meissner <meissner@linux.vnet.ibm.com>
Pat Haugen <pthaugen@us.ibm.com>
Revital Eres <ERES@il.ibm.com>
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index eeac7deab6a..72622a0c508 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1592,9 +1592,35 @@ cs-tm_p.h: Makefile
# might be on a read-only file system. If configured for maintainer mode
# then do allow autoconf to be run.
-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4 \
- $(srcdir)/acinclude.m4
- (cd $(srcdir) && autoconf)
+AUTOCONF = autoconf
+ACLOCAL = aclocal
+ACLOCAL_AMFLAGS = -I ../config -I ..
+aclocal_deps = \
+ $(srcdir)/../libtool.m4 \
+ $(srcdir)/../ltoptions.m4 \
+ $(srcdir)/../ltsugar.m4 \
+ $(srcdir)/../ltversion.m4 \
+ $(srcdir)/../lt~obsolete.m4 \
+ $(srcdir)/../config/acx.m4 \
+ $(srcdir)/../config/codeset.m4 \
+ $(srcdir)/../config/extensions.m4 \
+ $(srcdir)/../config/gettext-sister.m4 \
+ $(srcdir)/../config/iconv.m4 \
+ $(srcdir)/../config/lcmessage.m4 \
+ $(srcdir)/../config/lib-ld.m4 \
+ $(srcdir)/../config/lib-link.m4 \
+ $(srcdir)/../config/lib-prefix.m4 \
+ $(srcdir)/../config/override.m4 \
+ $(srcdir)/../config/progtest.m4 \
+ $(srcdir)/../config/unwind_ipinfo.m4 \
+ $(srcdir)/../config/warnings.m4 \
+ $(srcdir)/acinclude.m4
+
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4
+ (cd $(srcdir) && $(AUTOCONF))
+
+$(srcdir)/aclocal.m4 : @MAINT@ $(aclocal_deps)
+ (cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS))
gccbug: $(srcdir)/gccbug.in
CONFIG_FILES=gccbug CONFIG_HEADERS= ./config.status
@@ -1611,9 +1637,10 @@ gccbug: $(srcdir)/gccbug.in
# Don't run autoheader automatically either.
# Only run it if maintainer mode is enabled.
+@MAINT@ AUTOHEADER = autoheader
@MAINT@ $(srcdir)/config.in: $(srcdir)/cstamp-h.in
@MAINT@ $(srcdir)/cstamp-h.in: $(srcdir)/configure.ac
-@MAINT@ (cd $(srcdir) && autoheader)
+@MAINT@ (cd $(srcdir) && $(AUTOHEADER))
@MAINT@ @rm -f $(srcdir)/cstamp-h.in
@MAINT@ echo timestamp > $(srcdir)/cstamp-h.in
auto-host.h: cstamp-h ; @true
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index 72765902458..99756b180cf 100644
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -92,6 +92,11 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
fi
])
+m4_include([../libtool.m4])
+m4_include([../ltoptions.m4])
+m4_include([../ltsugar.m4])
+m4_include([../ltversion.m4])
+m4_include([../lt~obsolete.m4])
m4_include([../config/acx.m4])
m4_include([../config/codeset.m4])
m4_include([../config/extensions.m4])
@@ -105,9 +110,4 @@ m4_include([../config/override.m4])
m4_include([../config/progtest.m4])
m4_include([../config/unwind_ipinfo.m4])
m4_include([../config/warnings.m4])
-m4_include([../libtool.m4])
-m4_include([../ltoptions.m4])
-m4_include([../ltsugar.m4])
-m4_include([../ltversion.m4])
-m4_include([../lt~obsolete.m4])
m4_include([acinclude.m4])
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 <Ralf.Wildenhues@gmx.de>
+
+ * Makefile.in (AUTOCONF, configure_deps): New variables.
+ ($(srcdir)/configure): Use them.
+
2009-05-18 Bechir Zalila <bechir.zalila@gmail.com>
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.
diff --git a/intl/ChangeLog b/intl/ChangeLog
index 74018fb44c0..fda6cc38cd4 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * Makefile.in (aclocal_deps): New variable.
+ ($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.
+
2008-06-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure: Regenerate.
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 96211ffd147..3dd0b7fe8fd 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -211,16 +211,28 @@ config.status: $(srcdir)/configure
$(srcdir)/configure: @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/configure.ac
cd $(srcdir) && $(AUTOCONF)
-$(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/configure.ac \
- $(srcdir)/../config/codeset.m4 $(srcdir)/../config/gettext.m4 \
- $(srcdir)/../config/glibc21.m4 $(srcdir)/../config/iconv.m4 \
- $(srcdir)/../config/intdiv0.m4 $(srcdir)/../config/inttypes-pri.m4 \
- $(srcdir)/../config/inttypes.m4 $(srcdir)/../config/inttypes_h.m4 \
- $(srcdir)/../config/lcmessage.m4 $(srcdir)/../config/lib-ld.m4 \
- $(srcdir)/../config/lib-link.m4 $(srcdir)/../config/lib-prefix.m4 \
- $(srcdir)/../config/nls.m4 $(srcdir)/../config/po.m4 \
- $(srcdir)/../config/progtest.m4 $(srcdir)/../config/stdint_h.m4 \
- $(srcdir)/../config/uintmax_t.m4 $(srcdir)/../config/ulonglong.m4
+aclocal_deps = \
+ $(srcdir)/configure.ac \
+ $(srcdir)/../config/codeset.m4 \
+ $(srcdir)/../config/gettext.m4 \
+ $(srcdir)/../config/glibc21.m4 \
+ $(srcdir)/../config/iconv.m4 \
+ $(srcdir)/../config/intdiv0.m4 \
+ $(srcdir)/../config/inttypes-pri.m4 \
+ $(srcdir)/../config/inttypes.m4 \
+ $(srcdir)/../config/inttypes_h.m4 \
+ $(srcdir)/../config/lcmessage.m4 \
+ $(srcdir)/../config/lib-ld.m4 \
+ $(srcdir)/../config/lib-link.m4 \
+ $(srcdir)/../config/lib-prefix.m4 \
+ $(srcdir)/../config/nls.m4 \
+ $(srcdir)/../config/po.m4 \
+ $(srcdir)/../config/progtest.m4 \
+ $(srcdir)/../config/stdint_h.m4 \
+ $(srcdir)/../config/uintmax_t.m4 \
+ $(srcdir)/../config/ulonglong.m4
+
+$(srcdir)/aclocal.m4: @MAINT@ $(aclocal_deps)
cd $(srcdir) && $(ACLOCAL) -I ../config
config.h: stamp-h1
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 2be7dff176f..0eddf991d72 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 f5057a006e7..db483b50033 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.
diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 74fba5990d6..8cdf161b1d4 100644
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * Makefile.in (aclocal_deps): New variable.
+ ($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.
+
2009-05-31 Ian Lance Taylor <iant@google.com>
* decContext.h: Add extern "C" if compiling with C++.
diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in
index 41607959c91..de91f6f614b 100644
--- a/libdecnumber/Makefile.in
+++ b/libdecnumber/Makefile.in
@@ -94,9 +94,13 @@ config.status: $(srcdir)/configure
$(srcdir)/configure: @MAINT@ $(srcdir)/aclocal.m4
cd $(srcdir) && $(AUTOCONF)
-$(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/../config/stdint.m4 \
- $(srcdir)/../config/warnings.m4 $(srcdir)/../config/override.m4 \
+aclocal_deps = \
+ $(srcdir)/../config/stdint.m4 \
+ $(srcdir)/../config/warnings.m4 \
+ $(srcdir)/../config/override.m4 \
$(srcdir)/configure.ac
+
+$(srcdir)/aclocal.m4: @MAINT@ $(aclocal_deps)
cd $(srcdir) && $(ACLOCAL) -I ../config
config.h: stamp-h1
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 01c35fc5366..9c2f7aefb81 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * 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.
+
2009-06-23 DJ Delorie <dj@redhat.com>
Add MeP port.
diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index 53dde12b47d..9484e7e6c0e 100644
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -140,6 +140,17 @@ stamp-h: $(srcdir)/config.in config.status Makefile
config.status: $(srcdir)/configure $(srcdir)/config.host
$(SHELL) ./config.status --recheck
+AUTOCONF = autoconf
+configure_deps = \
+ $(srcdir)/../config/enable.m4 \
+ $(srcdir)/../config/tls.m4 \
+ $(srcdir)/../config/acx.m4 \
+ $(srcdir)/../config/no-executables.m4 \
+ $(srcdir)/../config/override.m4 \
+
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(configure_deps)
+ cd $(srcdir) && $(AUTOCONF)
+
include $(gcc_objdir)/libgcc.mvars
# Flags to pass to recursive makes.
diff --git a/libgcc/configure b/libgcc/configure
index 6315ecd5cbc..0230e799fce 100644
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -272,7 +272,7 @@ PACKAGE_STRING='GNU C Runtime Library 1.0'
PACKAGE_BUGREPORT=''
ac_unique_file="static-object.mk"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcc_topdir enable_shared slibdir MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os host_noncanonical build_libsubdir build_subdir host_subdir target_subdir AR ac_ct_AR LIPO ac_ct_LIPO NM ac_ct_NM RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP decimal_float enable_decimal_float fixed_point vis_hide set_have_cc_tls tmake_file extra_parts asm_hidden_op LIBOBJS LTLIBOBJS'
ac_subst_files=''
ac_pwd=`pwd`
@@ -812,6 +812,9 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-shared don't provide a shared libgcc
--enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory
+ --enable-maintainer-mode
+ enable make rules and dependencies not useful (and
+ sometimes confusing) to the casual installer
--enable-decimal-float={no,yes,bid,dpd}
enable decimal float extension to C. Selecting 'bid'
or 'dpd' choses which decimal floating point format
@@ -1419,6 +1422,23 @@ fi
fi;
+# Command-line options.
+# Very limited version of AC_MAINTAINER_MODE.
+# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval="$enable_maintainer_mode"
+ case ${enable_maintainer_mode} in
+ yes) MAINT='' ;;
+ no) MAINT='#' ;;
+ *) { { echo "$as_me:$LINENO: error: --enable-maintainer-mode must be yes or no" >&5
+echo "$as_me: error: --enable-maintainer-mode must be yes or no" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ maintainer_mode=${enableval}
+else
+ MAINT='#'
+fi;
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -4226,6 +4246,7 @@ s,@LIBS@,$LIBS,;t t
s,@libgcc_topdir@,$libgcc_topdir,;t t
s,@enable_shared@,$enable_shared,;t t
s,@slibdir@,$slibdir,;t t
+s,@MAINT@,$MAINT,;t t
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
diff --git a/libgcc/configure.ac b/libgcc/configure.ac
index d48bccce065..b055dbaca13 100644
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -78,6 +78,21 @@ else
fi)
AC_SUBST(slibdir)
+# Command-line options.
+# Very limited version of AC_MAINTAINER_MODE.
+AC_ARG_ENABLE([maintainer-mode],
+ [AC_HELP_STRING([--enable-maintainer-mode],
+ [enable make rules and dependencies not useful (and
+ sometimes confusing) to the casual installer])],
+ [case ${enable_maintainer_mode} in
+ yes) MAINT='' ;;
+ no) MAINT='#' ;;
+ *) AC_MSG_ERROR([--enable-maintainer-mode must be yes or no]) ;;
+ esac
+ maintainer_mode=${enableval}],
+ [MAINT='#'])
+AC_SUBST([MAINT])dnl
+
AC_PROG_INSTALL
AC_PROG_AWK
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 16f541ed275..b2f41208bf8 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 20a7210a1a1..e8f4f4d679a 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.
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index fa6022b2b32..a4c963a6e5c 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,5 +1,11 @@
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * Makefile.in (AUTOCONF, ACLOCAL, ACLOCAL_AMFLAGS, aclocal_deps):
+ New variables.
+ ($(srcdir)/configure, $(srcdir)/aclocal.m4): New rules.
+
+2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
* configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force.
2009-04-09 Nick Clifton <nickc@redhat.com>
diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 85550035521..98539cfda41 100644
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -333,9 +333,25 @@ config.status: configure
CONFIG_SITE=no-such-file CC='$(CC)' AR='$(AR)' CFLAGS='$(CFLAGS)' \
CPPFLAGS='$(CPPFLAGS)' $(SHELL) config.status --recheck
-${srcdir}/configure: @MAINT@ configure.ac
+AUTOCONF = autoconf
+ACLOCAL = aclocal
+ACLOCAL_AMFLAGS = -I ../config -I ..
+aclocal_deps = \
+ $(srcdir)/../config/multi.m4 \
+ $(srcdir)/../config/override.m4 \
+ $(srcdir)/../config/proginstall.m4 \
+ $(srcdir)/../ltoptions.m4 \
+ $(srcdir)/../ltsugar.m4 \
+ $(srcdir)/../ltversion.m4 \
+ $(srcdir)/../lt~obsolete.m4 \
+ $(srcdir)/acinclude.m4
+
+$(srcdir)/configure: @MAINT@ configure.ac $(srcdir)/aclocal.m4
rm -f config.cache
- cd ${srcdir} && autoconf
+ cd $(srcdir) && $(AUTOCONF)
+
+$(srcdir)/aclocal.m4: @MAINT@ $(aclocal_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
install: install-libs install-headers
diff --git a/libobjc/aclocal.m4 b/libobjc/aclocal.m4
index 0b3d8b741f7..69611d54e76 100644
--- a/libobjc/aclocal.m4
+++ b/libobjc/aclocal.m4
@@ -154,11 +154,11 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
fi
])
-m4_include([../config/multi.m4])
-m4_include([../config/override.m4])
-m4_include([../config/proginstall.m4])
m4_include([../ltoptions.m4])
m4_include([../ltsugar.m4])
m4_include([../ltversion.m4])
m4_include([../lt~obsolete.m4])
+m4_include([../config/multi.m4])
+m4_include([../config/override.m4])
+m4_include([../config/proginstall.m4])
m4_include([acinclude.m4])
View Lorry Controller Status