aboutsummaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-03-16 09:09:16 +0000
committerUlrich Drepper <drepper@redhat.com>1998-03-16 09:09:16 +0000
commitf649c2015a0c9cc4a2d71880fcb7fac0832af69c (patch)
treece7ebba8fe952aac5c8556c3e1e3e3957ddfc8e1 /nscd
parent60c34a30cf22b0ec9f2f4c17a19a6aea7094b329 (diff)
downloadglibc-f649c2015a0c9cc4a2d71880fcb7fac0832af69c.tar
glibc-f649c2015a0c9cc4a2d71880fcb7fac0832af69c.tar.gz
glibc-f649c2015a0c9cc4a2d71880fcb7fac0832af69c.tar.bz2
glibc-f649c2015a0c9cc4a2d71880fcb7fac0832af69c.zip
Update.
1998-03-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Export internal versions of cancelable functions. 1998-03-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (MAKEFLAGS): Append `r'. 1998-03-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig: Define have-thread-library, shared-thread-library and static-thread-library if a thread library is available. Don't define rt. * nscd/Makefile: Compile nscd if have-thread-library. Rename nscd-routines to nscd-modules. Use shared-thread-library and static-thread-library in dependencies. * rt/Makefile: Only compile librt if have-thread-library is defined. * Makefile (subdirs): Always include rt subdir. 1998-03-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig ($(common-objpfx)gnu/lib-names.h): Add dummy command.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/nscd/Makefile b/nscd/Makefile
index 79db5abd37..aace588def 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -25,25 +25,26 @@ routines := nscd_getpw_r nscd_getgr_r
include ../Makeconfig
-# We can later add the names of other thread packages here.
-ifneq (,$(findstring linuxthreads,$(add-ons)))
+ifeq ($(have-thread-library),yes)
others := nscd
install-sbin := nscd
-nscd-routines := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
- getgrnam_r getgrgid_r dbg_log nscd_conf nscd_stat
-extra-objs := $(nscd-routines:=.o)
+nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
+ getgrnam_r getgrgid_r dbg_log nscd_conf nscd_stat
+extra-objs := $(nscd-modules:=.o)
endif
-distribute := nscd.h dbg_log.h $(nscd-routines:=.c) TODO nscd.conf nscd.init \
+distribute := nscd.h dbg_log.h $(nscd-modules:=.c) TODO nscd.conf nscd.init \
nscd_proto.h
include ../Rules
+$(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o)
+
ifeq ($(build-shared),yes)
-$(objpfx)nscd: $(nscd-routines:%=$(objpfx)%.o) $(objpfx)../linuxthreads/libpthread.so$(libpthread.so-version) $(objpfx)../nis/libnsl.so$(libnsl.so-version)
+$(objpfx)nscd: $(shared-thread-library) $(common-objpfx)nis/libnsl.so
else
-$(objpfx)nscd: $(nscd-routines:%=$(objpfx)%.o) $(objpfx)../linuxthreads/libpthread.a $(objpfx)../nis/libnsl.a
+$(objpfx)nscd: $(static-thread-library) $(common-objpfx)nis/libnsl.a
endif