dbe31b9a73
points within DATA->linebuffer; otherwise use all of DATA->linebuffer itself, no need to skip past a NUL. * nss/nsswitch.h (known_function): Comment fix. * nss/nsswitch.c (nss_lookup_function): Rewritten using __tsearch directly. Do the lookup and insertion with a single call, and fill in the tree node afterwards if new. (known_compare, nss_find_entry, nss_insert_entry): Functions removed. * misc/sys/select.h: #define __need_timespec before <sys/time.h> incl. (struct timeval): Add bodiless decl for scope. * time/time.h (struct timespec): Rename members from `ts_*' to `tv_*'. Move struct timespec defn outside [_TIME_H] so it can be got with #define __need_timespec. * time/sys/time.h (TIMEVAL_TO_TIMESPEC): Use `tv_*' instead of `ts_*' for `struct timespec' member names. (TIMESPEC_TO_TIMEVAL): Likewise. * nss/Makefile (extra-libs-others): New variable. * extra-lib.mk: Don't test for $($(lib)-no-lib-dep). Instead match $(lib) in $(extra-libs-others). * sunrpc/Makefile (extra-libs-others): New variable. (librpcsvc-no-lib-dep): Variable removed. Thu Jul 4 05:21:59 1996 David Mosberger-Tang <davidm@azstarnet.com> * login/utmp.h: Fix typos. * misc/syslog.c (vsyslog): Use __send instead of send and __connect instead of connect to avoid name-space collisions (e.g., with psgetty).
53 lines
1.8 KiB
Makefile
53 lines
1.8 KiB
Makefile
# This file is included several times in a row, once
|
|
# for each element of $(extra-libs). $(extra-libs-left)
|
|
# is initialized first to $(extra-libs) so that with each
|
|
# inclusion, we advance $(lib) to the next library name (e.g. libfoo).
|
|
# The variable $($(lib)-routines) defines the list of modules
|
|
# to be included in that library.
|
|
|
|
lib := $(firstword $(extra-libs-left))
|
|
extra-libs-left := $(filter-out $(lib),$(extra-libs-left))
|
|
|
|
object-suffixes-$(lib) := $(filter-out $($(lib)-inhibit-o),$(object-suffixes))
|
|
|
|
ifneq (,$(object-suffixes-$(lib)))
|
|
|
|
# Make sure these are simply-expanded variables before we append to them,
|
|
# since we want the expressions we append to be expanded right now.
|
|
install-lib := $(install-lib)
|
|
extra-objs := $(extra-objs)
|
|
|
|
# Add each flavor of library to the lists of things to build and install.
|
|
install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o)))
|
|
extra-objs += $(foreach o,$(object-suffixes-$(lib)),\
|
|
$(patsubst %,%$o,$($(lib)-routines)))
|
|
alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
|
|
$(objpfx)$(patsubst %,$(libtype$o),\
|
|
$(lib:lib%=%)))
|
|
|
|
ifeq (,$(filter $(lib),extra-libs-others))
|
|
lib-noranlib: $(alltypes-$(lib))
|
|
ifeq (yes,$(build-shared))
|
|
lib-noranlib: $(objpfx)$(lib).so$($(lib).so-version)
|
|
endif
|
|
else
|
|
others: $(alltypes-$(lib))
|
|
endif
|
|
|
|
# The linked shared library is never a dependent of lib-noranlib,
|
|
# because linking it will depend on libc.so already being built.
|
|
ifneq (,$(filter .so,$(object-suffixes-$(lib))))
|
|
others: $(objpfx)$(lib).so
|
|
endif
|
|
|
|
|
|
# Use o-iterator.mk to generate a rule for each flavor of library.
|
|
define o-iterator-doit
|
|
$(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
|
|
$($(lib)-routines:%=$(objpfx)%$o); $$(build-extra-lib)
|
|
endef
|
|
object-suffixes-left = $(object-suffixes-$(lib))
|
|
include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-$(lib)))
|
|
|
|
endif
|