aboutsummaryrefslogtreecommitdiff
path: root/extra-lib.mk
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>1999-07-20 08:19:37 +0000
committerAndreas Schwab <schwab@suse.de>1999-07-20 08:19:37 +0000
commitb3ed821981e392d20d94028aeaa94b8ab31cc678 (patch)
tree87b6ae143ac0e37700094d3b5600e2f7b3f81f9e /extra-lib.mk
parent3944f99e84e2fba80b5ac657d91a506e8b791772 (diff)
downloadglibc-b3ed821981e392d20d94028aeaa94b8ab31cc678.zip
glibc-b3ed821981e392d20d94028aeaa94b8ab31cc678.tar.gz
glibc-b3ed821981e392d20d94028aeaa94b8ab31cc678.tar.bz2
1999-07-19 Andreas Schwab <schwab@suse.de>
* libio/Makefile (routines): Add fwprintf. PowerPC has own version of w_sqrt.c and w_sqrtf.c. * math/w_sqrt.c: Moved to ... * sysdeps/generic/w_sqrt.c: ... here. * math/w_sqrtf.c: Moved to ... * sysdeps/generic/w_sqrtf.c: ... here. * Make-dist (generic-dirs): New variable. (try-sysdeps, +sysdep-names): Use it. * extra-lib.mk (all-$(lib)-routines): New variable. Use it instead of $(lib)-routines. * elf/Makefile (distribute): Add dl-cache.h. * db2/Makefile (distribute): Add all new files. * iconvdata/Makefile (distribute): Don't distribute CVS directory. * math/Makefile (distribute): Remove machine/endian.h, add math_ldbl.h. * stdio-common/Makefile (distribute): Add _itowa.h. * sysdeps/generic/Dist: Remove make_siglist.c, add siglist.h. * sysdeps/gnu/Dist: Add eval.c * sysdeps/gnu/Makefile (libdl-sysdep_routines) [$(subdir) = dlfcn]: Add to this instead of libdl-routines. * sysdeps/ieee754/ldbl-128/Dist: New file. * sysdeps/mach/hurd/Dist: Add siglist.h * sysdeps/unix/sysv/linux/Dist: Add kernel-features.h.
Diffstat (limited to 'extra-lib.mk')
-rw-r--r--extra-lib.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/extra-lib.mk b/extra-lib.mk
index 6216ce9..cdb48e2 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -3,7 +3,8 @@
# 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.
+# to be included in that library. A sysdep Makefile can add to
+# $(lib)-sysdep_routines to include additional modules.
lib := $(firstword $(extra-libs-left))
extra-libs-left := $(filter-out $(lib),$(extra-libs-left))
@@ -17,14 +18,17 @@ ifneq (,$(object-suffixes-$(lib)))
install-lib := $(install-lib)
extra-objs := $(extra-objs)
+# The modules that go in $(lib).
+all-$(lib)-routines := $($(lib)-routines) $($(lib)-sysdep_routines)
+
# 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):.os=),\
$(patsubst %,%$o,$(filter-out \
$($(lib)-shared-only-routines),\
- $($(lib)-routines))))
+ $(all-$(lib)-routines))))
ifneq (,$(filter .os,$(object-suffixes-$(lib))))
-extra-objs += $($(lib)-routines:=.os)
+extra-objs += $(all-$(lib)-routines:%=%.os)
endif
alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
$(objpfx)$(patsubst %,$(libtype$o),\
@@ -52,7 +56,7 @@ define o-iterator-doit
$(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
$(patsubst %,$(objpfx)%$o,\
$(filter-out $($(lib)-shared-only-routines),\
- $($(lib)-routines))); \
+ $(all-$(lib)-routines))); \
$$(build-extra-lib)
endef
object-suffixes-left = $(object-suffixes-$(lib):.os=)
@@ -61,7 +65,7 @@ endif
ifneq (,$(filter .os,$(object-suffixes-$(lib))))
$(objpfx)$(patsubst %,$(libtype.os),$(lib:lib%=%)): \
- $($(lib)-routines:%=$(objpfx)%.os)
+ $(all-$(lib)-routines:%=$(objpfx)%.os)
$(build-extra-lib)
endif