Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 78081 - don't export intermediate libraries - initial makefile changes to switch from $(DIST)/lib to in-tree library locations - blanket-r=mento

Browse Source
This commit is contained in:
benjamin%smedbergs.us 2006-04-06 18:12:59 +00:00
parent a4c515c10e
commit 95dea0071a
4 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/components/build/Makefile.in
View File

@ -79,11 +79,8 @@ ifneq (,$(filter mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
SHARED_LIBRARY_LIBS += ../shell/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
endif
EXTRA_DSO_LIBS += mozreg_s
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_XPCOM_OBSOLETE_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)

9
mailnews/build/Makefile.in
View File

@ -113,11 +113,6 @@ REQUIRES += mozldap \
DEFINES += -DMOZ_LDAP_XPCOM
endif
EXTRA_DSO_LIBS += \
rdfutil_s \
mozreg_s \
$(NULL)
CPPSRCS = nsMailModule.cpp
SHARED_LIBRARY_LIBS = \
@ -140,8 +135,8 @@ SHARED_LIBRARY_LIBS = \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(DEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_JS_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \

4
mailnews/import/build/Makefile.in
View File

@ -124,13 +124,11 @@ LOCAL_INCLUDES += -I$(srcdir)/../oexpress \
endif
endif
EXTRA_DSO_LIBS += mozreg_s
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) \
$(MOZ_UNICHARUTIL_LIBS) \
$(EXTRA_DSO_LIBS) \
$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_XPCOM_OBSOLETE_LIBS) \
$(NULL)

10
mailnews/import/comm4x/src/Makefile.in
View File

@ -93,16 +93,14 @@ ifndef MOZ_STATIC_MAIL_BUILD
CPPSRCS += nsComm4xMailFactory.cpp
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS += msgbsutl
BASEUTIL = msgbsutl
else
EXTRA_DSO_LIBS += msgbaseutil
BASEUTIL = msgbaseutil
endif
EXTRA_DSO_LIBS += mozreg_s
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(DEPTH)/mailnews/base/util/$(LIB_PREFIX)$(BASEUTIL).$(LIB_SUFFIX) \
$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_XPCOM_OBSOLETE_LIBS) \
$(NULL)