merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 40f73b6f59821cc7db8943a40a6c4deefe6bfc42..4758fc6317b847d5a0a9d24136efe866b3690d8a 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-26  DJ Delorie  <dj@redhat.com>
+            Daniel Jacobowitz  <drow@mvista.com>
+
+       * Makefile.in (stamp-h): Depend on Makefile for proper
+       serialization.
+       (*-subdir): Depend on config.h for proper serialization.
+
 2001-11-26  DJ Delorie  <dj@redhat.com>
 
        * configure.in: Check for alloca.h (for regex.c and putenv.c).

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 877e0a9279f08a010e50ffc239111145ba62cdb3..093c449328c3ecb8532244f60f28c870ee08e356 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -300,17 +300,22 @@ force:
 Makefile: $(srcdir)/Makefile.in config.status
        CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
 
+# Depending on Makefile makes sure that config.status has been re-run
+# if needed.  This prevents problems with parallel builds.
 config.h: stamp-h ; @true
-stamp-h: config.in config.status
+stamp-h: config.in config.status Makefile
        CONFIG_FILES= CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status
 
 config.status: $(srcdir)/configure $(srcdir)/config.table
        $(SHELL) ./config.status --recheck
 
+# 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.
 all-subdir check-subdir installcheck-subdir info-subdir        \
 install-info-subdir clean-info-subdir dvi-subdir install-subdir        \
 etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \
-maintainer-clean-subdir:
+maintainer-clean-subdir: config.h
        @subdirs='$(SUBDIRS)'; \
        target=`echo $@ | sed -e 's/-subdir//'`; \
        for dir in $$subdirs ; do \