Commit 2bdd3b1c authored by benjamin%smedbergs.us's avatar benjamin%smedbergs.us
Browse files

Bug 214889 - add mozreg_s to the static link list and don't link it into xpcom... 

Bug 214889 - add mozreg_s to the static link list and don't link it into xpcom obsolete when in a static build, r=cls
parent ad93adc6

browser/components/build/Makefile.in

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ SHARED_LIBRARY_LIBS += \ 
	$(NULL)

endif



EXTRA_DSO_LIBS += mozreg_s



# Link to gkgfx for GNOME shell service

ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)

EXTRA_DSO_LIBS += gkgfx

mail/components/build/Makefile.in

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +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) \

mailnews/build/Makefile.in

+4 −1
Original line number Diff line number Diff line
@@ -113,7 +113,10 @@ REQUIRES += mozldap \ 
DEFINES		+= -DMOZ_LDAP_XPCOM

endif



EXTRA_DSO_LIBS += rdfutil_s

EXTRA_DSO_LIBS += \

	rdfutil_s \

	mozreg_s \

	$(NULL)



CPPSRCS		= nsMailModule.cpp

mailnews/import/build/Makefile.in

+3 −0
Original line number Diff line number Diff line
@@ -124,10 +124,13 @@ 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) \

	$(MOZ_COMPONENT_LIBS) \

	$(MOZ_XPCOM_OBSOLETE_LIBS) \

	$(NULL)

modules/libreg/src/Makefile.in

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ FORCE_STATIC_LIB = 1 
# Force use of PIC

FORCE_USE_PIC	= 1



# We do want this in the static libraries list

EXPORT_LIBRARY = 1



include $(topsrcdir)/config/config.mk



DEFINES         += -DUSE_BUFFERED_REGISTRY_IO