diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makeconfig | 38 |
2 files changed, 28 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index 824aef61b5..2253407581 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1999-11-25 Andreas Schwab <schwab@suse.de> + + * Makeconfig: Include sys-dirs and sys-sorted earlier. + ($(common-objpfx)soversions.mk): Wait until subdirs is complete. + ($(common-objpfx)sysd-sorted): Emit marker when this file is + complete. + 1999-11-24 Ulrich Drepper <drepper@cygnus.com> * manual/setjmp.texi: Many changes to correct bad English introduced diff --git a/Makeconfig b/Makeconfig index a0d714e473..a2efb41761 100644 --- a/Makeconfig +++ b/Makeconfig @@ -662,11 +662,19 @@ endif move-if-change = $(SHELL) $(..)scripts/move-if-change +-include $(common-objpfx)sysd-dirs + +ifeq ($(sysd-dirs-done),t) +-include $(common-objpfx)sysd-sorted +subdirs = $(sorted-subdirs) +endif ifeq (yes, $(build-shared)) # Process the shlib-versions file, which tells us what shared library # version numbers to use when we install shared objects on this system. +# We need to wait until $(subdirs) is complete. +ifeq ($(sysd-sorted-done),t) -include $(common-objpfx)soversions.mk ifndef avoid-generated $(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makeconfig \ @@ -699,6 +707,7 @@ $(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makeconfig \ done;) > $@T; exit 0 mv -f $@T $@ endif +endif postclean-generated += soversions.mk @@ -753,8 +762,6 @@ have-thread-library = yes rpath-dirs += linuxthreads endif --include $(common-objpfx)sysd-dirs - ifeq ($(elf),yes) dlfcn = dlfcn ifeq ($(build-shared),yes) @@ -780,11 +787,6 @@ all-subdirs = csu assert ctype db db2 locale intl catgets math setjmp signal\ $(dlfcn) $(binfmt-subdir) all-subdirs := $(filter-out $(sysdep-inhibit-subdirs),$(all-subdirs)) -ifeq ($(sysd-dirs-done),t) --include $(common-objpfx)sysd-sorted -subdirs = $(sorted-subdirs) -endif - # The mach and hurd subdirectories have many generated header files which # much of the rest of the library depends on, so it is best to build them # first (and mach before hurd, at that). The before-compile additions in @@ -810,16 +812,18 @@ $(common-objpfx)sysd-dirs: $(common-objpfx)config.make $(all-Subdirs-files) all-Depend-files = $(wildcard $(..)*/Depend) $(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk $(all-Depend-files) \ $(common-objpfx)sysd-dirs $(..)Makeconfig - (dirs='$(patsubst $(..)%/Depend,$(..)%,$(filter %/Depend, $^))';\ - for d in $$dirs; do \ - while read on; do \ - echo "depend $$d $$on"; \ - done < $$d/Depend; \ - done; \ - for f in $(all-subdirs); do \ - echo $$f; \ - done \ - ) | $(AWK) -f $< > $@-tmp + { { dirs='$(patsubst $(..)%/Depend,$(..)%,$(filter %/Depend,$^))';\ + for d in $$dirs; do \ + while read on; do \ + echo "depend $$d $$on"; \ + done < $$d/Depend; \ + done; \ + for f in $(all-subdirs); do \ + echo $$f; \ + done; \ + } | $(AWK) -f $< && \ + echo sysd-sorted-done = t; \ + } > $@-tmp mv -f $@-tmp $@ endif |