Bug 505525 Followup to fix static trunk build r=KaiRo
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Tue, 28 Jul 2009 14:52:17 +0100
changeset 3159 42cbb85c46ae7a7cb72f1ca8ef61a1aaf022d063
parent 3158 32a58120ea69ce1da517bf6d72d96b056472a05f
child 3160 0f774ca9742ee4e12e96dd6ea3437d3ac89cb28a
push idunknown
push userunknown
push dateunknown
reviewersKaiRo
bugs505525
Bug 505525 Followup to fix static trunk build r=KaiRo
suite/app/Makefile.in
suite/build/Makefile.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -147,16 +147,22 @@ NSDISTMODE = copy
 include $(topsrcdir)/config/config.mk
 
 ifdef _MSC_VER
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
 
 ifdef BUILD_STATIC_LIBS
 
+ifndef MOZILLA_1_9_1_BRANCH
+ifeq ($(OS_ARCH),WINNT)
+LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
+endif
+endif
+
 include $(topsrcdir)/config/static-config.mk
 
 EXTRA_DEPS	+= \
 	$(STATIC_EXTRA_DEPS) \
 	$(NULL)
 DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -97,22 +97,24 @@ EXTRA_DSO_LDOPTS += \
 	$(EXTRA_DSO_LIBS) \
 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
 	$(LIBXUL_DIST)/../modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
 	$(MOZ_JS_LIBS) \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
 
+ifndef BUILD_STATIC_LIBS
 ifeq ($(OS_ARCH),WINNT)
 SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
 ifeq (,$(MOZ_ENABLE_LIBXUL)$(MOZILLA_1_9_1_BRANCH))
 EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)thebes.$(LIB_SUFFIX)
 endif
 endif
+endif
 
 # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += \
 	$(TK_LIBS) \
 	$(NULL)
 endif