AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-25 06:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wed Apr 3 17:10:44 1996 Roland McGrath <roland@whiz-bang.gnu.ai.mit.edu>

Browse Source 
* extra-lib.mk: Put libs in $(common-objpfx) instead of $(objpfx).
	* Makerules ($(install-lib) rules): Find libs with $(common-objpfx)
	instead of $(objpfx).
This commit is contained in:
Roland McGrath 1996-04-04 01:18:10 +00:00
parent 299a95b9f0
commit 2e516341fa
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 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 * posix/glob.c (glob_pattern_p): Avoid scanning past eos if

4
Makerules
View File

@ -519,12 +519,12 @@ install-lib.a := $(filter lib%.a,$(install-lib))
install-lib-non.a := $(filter-out lib%.a,$(install-lib)) install-lib-non.a := $(filter-out lib%.a,$(install-lib))
ifdef install-lib-non.a ifdef install-lib-non.a
$(addprefix $(libdir)/$(libprefix),$(install-lib-non.a)): \ $(addprefix $(libdir)/$(libprefix),$(install-lib-non.a)): \
$(libdir)/$(libprefix)%: $(objpfx)% $(libdir)/$(libprefix)%: $(common-objpfx)%
$(do-install) $(do-install)
endif endif
ifdef install-lib.a ifdef install-lib.a
$(install-lib.a:lib%.a=$(libdir)/lib$(libprefix)%.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) $(do-install)
$(patsubst %,$(RANLIB) $@,$(filter-out $(non-lib.a),$(<F))) $(patsubst %,$(RANLIB) $@,$(filter-out $(non-lib.a),$(<F)))
endif endif

6
extra-lib.mk
View File

@ -19,10 +19,10 @@ extra-objs := $(extra-objs)
install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o))) install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o)))
extra-objs += $(foreach o,$(object-suffixes-$(lib)),$($(lib)-routines:=$o)) extra-objs += $(foreach o,$(object-suffixes-$(lib)),$($(lib)-routines:=$o))
alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\ alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
$(objpfx)$(patsubst %,$(libtype$o),\ $(common-objpfx)$(patsubst %,$(libtype$o),\
$(lib:lib%=%))) $(lib:lib%=%)))
ifneq (,$(filter .so,$(object-suffixes-$(lib)))) ifneq (,$(filter .so,$(object-suffixes-$(lib))))
alltypes-$(lib) += $(objpfx)$(lib).so alltypes-$(lib) += $(common-objpfx)$(lib).so
endif endif
ifeq (,$($(lib)-no-lib-dep)) ifeq (,$($(lib)-no-lib-dep))
@ -33,7 +33,7 @@ endif
# Use o-iterator.mk to generate a rule for each flavor of library. # Use o-iterator.mk to generate a rule for each flavor of library.
define o-iterator-doit define o-iterator-doit
$(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \ $(common-objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
$($(lib)-routines:%=$(objpfx)%$o); $$(build-extra-lib) $($(lib)-routines:%=$(objpfx)%$o); $$(build-extra-lib)
endef endef
object-suffixes-left = $(object-suffixes-$(lib)) object-suffixes-left = $(object-suffixes-$(lib))