diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makerules | 4 | ||||
| -rw-r--r-- | extra-lib.mk | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index ac276db283..65293eabdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Apr 3 17:10:44 1996 Roland McGrath <roland@whiz-bang.gnu.ai.mit.edu> + + * extra-lib.mk: Put libs in $(common-objpfx) instead of $(objpfx). + * Makerules ($(install-lib) rules): Find libs with $(common-objpfx) + instead of $(objpfx). + Tue Apr 2 21:27:01 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * posix/glob.c (glob_pattern_p): Avoid scanning past eos if diff --git a/Makerules b/Makerules index d7e82d9082..cb22d03945 100644 --- a/Makerules +++ b/Makerules @@ -519,12 +519,12 @@ install-lib.a := $(filter lib%.a,$(install-lib)) install-lib-non.a := $(filter-out lib%.a,$(install-lib)) ifdef install-lib-non.a $(addprefix $(libdir)/$(libprefix),$(install-lib-non.a)): \ - $(libdir)/$(libprefix)%: $(objpfx)% + $(libdir)/$(libprefix)%: $(common-objpfx)% $(do-install) endif ifdef install-lib.a $(install-lib.a:lib%.a=$(libdir)/lib$(libprefix)%.a): \ - $(libdir)/lib$(libprefix)%.a: $(objpfx)lib%.a + $(libdir)/lib$(libprefix)%.a: $(common-objpfx)lib%.a $(do-install) $(patsubst %,$(RANLIB) $@,$(filter-out $(non-lib.a),$(<F))) endif diff --git a/extra-lib.mk b/extra-lib.mk index aa92fd1664..f6a1c83e37 100644 --- a/extra-lib.mk +++ b/extra-lib.mk @@ -19,10 +19,10 @@ extra-objs := $(extra-objs) 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),\ + $(common-objpfx)$(patsubst %,$(libtype$o),\ $(lib:lib%=%))) ifneq (,$(filter .so,$(object-suffixes-$(lib)))) -alltypes-$(lib) += $(objpfx)$(lib).so +alltypes-$(lib) += $(common-objpfx)$(lib).so endif ifeq (,$($(lib)-no-lib-dep)) @@ -33,7 +33,7 @@ endif # Use o-iterator.mk to generate a rule for each flavor of library. define o-iterator-doit -$(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \ +$(common-objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \ $($(lib)-routines:%=$(objpfx)%$o); $$(build-extra-lib) endef object-suffixes-left = $(object-suffixes-$(lib)) |