From f1d71039d18411fe5966b59b57c67a1b8dd009b4 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 21 May 2001 06:06:51 +0000 Subject: * Makeconfig (sysdep-makeconfigs): Include any Makeconfig files found within $(add-ons) directories too. [linuxthreads add-on]: Move variable settings for linuxthreads to new file linuxthreads/Makeconfig. --- Makeconfig | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'Makeconfig') diff --git a/Makeconfig b/Makeconfig index 996b971..26884f8 100644 --- a/Makeconfig +++ b/Makeconfig @@ -806,13 +806,6 @@ endif endif # build-shared -ifneq (,$(findstring linuxthreads,$(add-ons))) -shared-thread-library = $(common-objpfx)linuxthreads/libpthread.so -static-thread-library = $(common-objpfx)linuxthreads/libpthread.a -bounded-thread-library = $(common-objpfx)linuxthreads/libpthread_b.a -have-thread-library = yes -rpath-dirs += linuxthreads -endif ifeq ($(elf),yes) dlfcn = dlfcn @@ -880,7 +873,9 @@ $(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk $(all-Depend-files) \ endif # Let sysdeps/ subdirs contain a Makeconfig fragment for us to include here. -sysdep-makeconfigs := $(wildcard $(full_config_sysdirs:=/Makeconfig)) +sysdep-makeconfigs := $(wildcard $(patsubst %,$(..)%/Makeconfig,\ + $(config-sysdirs) $(add-ons))) + ifneq (,$(sysdep-makeconfigs)) include $(sysdep-makeconfigs) endif -- cgit v1.1