From 6aa8372e1684381fdc8fdacb4fdd71415c2ecde3 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 8 Apr 1995 19:23:00 +0000 Subject: * extra-lib.mk (install-lib, extra-objs, alltypes-$(lib)): Make sure these are simply-expanded variables. --- extra-lib.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'extra-lib.mk') diff --git a/extra-lib.mk b/extra-lib.mk index 436170e0d0..d4d2b52829 100644 --- a/extra-lib.mk +++ b/extra-lib.mk @@ -10,12 +10,17 @@ extra-libs-left := $(filter-out $(lib),$(extra-libs-left)) object-suffixes-$(lib) := $(filter-out $($(lib)-inhibit-o),$(object-suffixes)) +# Make sure these are simply-expanded variables before we append to them, +# since we want the expressions we 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)),$($(lib)-routines:=$o)) -alltypes-$(lib) = $(foreach o,$(object-suffixes-$(lib)),\ - $(objpfx)$(patsubst %,$(libtype$o),\ - $(lib:lib%=%))) +alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\ + $(objpfx)$(patsubst %,$(libtype$o),\ + $(lib:lib%=%))) ifneq (,$(filter .so,$(object-suffixes-$(lib)))) alltypes-$(lib) += $(objpfx)$(lib).so endif -- cgit v1.2.1