aboutsummaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-11-25 18:31:44 +0000
committerUlrich Drepper <drepper@redhat.com>1999-11-25 18:31:44 +0000
commit281e6031736c13d1ead4d832d6beaf978d36ffdf (patch)
tree328ca1172832566ab3fb30faf5bc6104d205331a /Makeconfig
parent76c23bacd8d180c7955668fc0d181522f7b80d37 (diff)
downloadglibc-281e6031736c13d1ead4d832d6beaf978d36ffdf.zip
glibc-281e6031736c13d1ead4d832d6beaf978d36ffdf.tar.gz
glibc-281e6031736c13d1ead4d832d6beaf978d36ffdf.tar.bz2
Update.
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.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig38
1 files changed, 21 insertions, 17 deletions
diff --git a/Makeconfig b/Makeconfig
index a0d714e..a2efb41 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