Bug 505525 Followup to fix static trunk build r=KaiRo

suite/app/Makefile.in

@@ -152,6 +152,12 @@ 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	+= \

suite/build/Makefile.in

@@ -102,12 +102,14 @@ EXTRA_DSO_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)))