Attachment #523872 for bug #650474




	MADE_FROM_ABOVE:=$(N)
endif

ifneq ($(SHARED),0)
    LIBTYPE=so
else
    LIBTYPE=a
endif

ifndef PROJECT_LIBDEPS
    PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
endif
ifndef PROJECT_LIBS
    PROJECT_LIBS = $(foreach l,$(PROJECT_LIBRARIES),-L$(PROJECT_LIBRARY_DIR_$(l)) -l$(l))
endif

ifndef REQUIRED_LIBDEPS
    REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
endif
ifndef REQUIRED_LIBS
    REQUIRED_LIBS = $(foreach l,$(REQUIRED_LIBRARIES),-L$(REQUIRED_LIBRARY_DIR_$(l)) -l$(l))

Lines 103-116 endif Link Here

(-)a/config/rules/library.mak (-5 / +5 lines)
103	###########################################################################	103	###########################################################################
104		104
105	lib%.so : lib%.a	105	lib%.so : lib%.a
106	@echo Make Shared Library $*	106	@echo Make Shared Library $(*F)
107	@if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi	107	@if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
108	@(cd shared_space ; $(AR) x ../$< )	108	@(cd shared_space ; $(AR) x ../$< )
109	@echo Link Shared Library $*	109	@echo Link Shared Library $(*F)
110	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\	110	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
111	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$),$(MAKE_SHARED_LIB)) shared_space/.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs	111	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(F)),$(MAKE_SHARED_LIB))) shared_space/.o $(PROJECT_LIBRARY_USES_$(F):%=-L. -l%) $$libs
112	@$(RM) -f shared_space/*.o $@	112	@$(RM) -f shared_space/*.o $@
113	@ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@	113	@ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@
114		114
115	###########################################################################	115	###########################################################################
116	## ##	116	## ##

Return to bug 650474

Lines 69-83 ifdef N Link Here

(-)a/config/rules/defaults.mak (-2 / +8 lines)
69	MADE_FROM_ABOVE:=$(N)	69	MADE_FROM_ABOVE:=$(N)
70	endif	70	endif
71		71
		72	ifneq ($(SHARED),0)
		73	LIBTYPE=so
		74	else
		75	LIBTYPE=a
		76	endif
		77
72	ifndef PROJECT_LIBDEPS	78	ifndef PROJECT_LIBDEPS
73	PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).a)	79	PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
74	endif	80	endif
75	ifndef PROJECT_LIBS	81	ifndef PROJECT_LIBS
76	PROJECT_LIBS = $(foreach l,$(PROJECT_LIBRARIES),-L$(PROJECT_LIBRARY_DIR_$(l)) -l$(l))	82	PROJECT_LIBS = $(foreach l,$(PROJECT_LIBRARIES),-L$(PROJECT_LIBRARY_DIR_$(l)) -l$(l))
77	endif	83	endif
78		84
79	ifndef REQUIRED_LIBDEPS	85	ifndef REQUIRED_LIBDEPS
80	REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).a)	86	REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
81	endif	87	endif
82	ifndef REQUIRED_LIBS	88	ifndef REQUIRED_LIBS
83	REQUIRED_LIBS = $(foreach l,$(REQUIRED_LIBRARIES),-L$(REQUIRED_LIBRARY_DIR_$(l)) -l$(l))	89	REQUIRED_LIBS = $(foreach l,$(REQUIRED_LIBRARIES),-L$(REQUIRED_LIBRARY_DIR_$(l)) -l$(l))