merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 82def678ecdba642084b5e53ab0e593a4ca6d617..0bd81a6b1c6db9d9f512ac752e9155c15002b2db 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-03  Richard Henderson  <rth@redhat.com>
+
+       * Makefile.in (concat.o): Depend on config.h.
+
 2001-07-30  Andreas Jaeger  <aj@suse.de>
 
        * regex.c: Declare wcs functions only if compiling with

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 0cded6b6f653bf7e06f8946819c6be5d3214ce4f..226f7d1ca8f77fd6e37b14b6ebeba7cc719a3750 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -260,7 +260,7 @@ argv.o: config.h $(INCDIR)/libiberty.h
 basename.o: $(INCDIR)/libiberty.h
 choose-temp.o: config.h
 clock.o: config.h
-concat.o: $(INCDIR)/libiberty.h
+concat.o: config.h $(INCDIR)/libiberty.h
 cplus-dem.o: config.h $(INCDIR)/demangle.h
 cp-demangle.o: config.h $(INCDIR)/dyn-string.h $(INCDIR)/demangle.h
 dyn-string.o: config.h $(INCDIR)/dyn-string.h