diff options
| author | DJ Delorie <dj@delorie.com> | 2001-11-26 22:25:58 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2001-11-26 22:25:58 +0000 |
| commit | a82f38ea93a1674452e9526d5156afb37e951553 (patch) | |
| tree | 167a1a1038e98d100ef2aa10a1510d87b94b5a32 | |
| parent | d538325e0f0e2faedfbe05903c66557fe47c1911 (diff) | |
| download | gdb-a82f38ea93a1674452e9526d5156afb37e951553.tar.gz | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 7 | ||||
| -rw-r--r-- | libiberty/Makefile.in | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 40f73b6f598..4758fc6317b 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,4 +1,11 @@ 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). * configure: Regenerate. diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 877e0a9279f..093c449328c 100644 --- 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 \ |