followup fix for
bug 410613 (suite/build linking bustage), r=Neil
--- a/suite/browser/public/Makefile.in
+++ b/suite/browser/public/Makefile.in
@@ -40,14 +40,12 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = suitebrowser
XPIDL_MODULE = suitebrowser
-ifeq ($(OS_ARCH),WINNT)
XPIDLSRCS += nsIUrlWidget.idl
-endif
include $(topsrcdir)/config/rules.mk
--- a/suite/browser/src/Makefile.in
+++ b/suite/browser/src/Makefile.in
@@ -41,17 +41,15 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = suitebrowser
LIBRARY_NAME = suitebrowser_s
META_COMPONENT = suite
-ifeq ($(OS_ARCH),WINNT)
CPPSRCS += nsUrlWidget.cpp
-endif
FORCE_STATIC_LIB = 1
FORCE_USE_PIC=1
include $(topsrcdir)/config/rules.mk
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -61,28 +61,31 @@ endif
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
endif
LOCAL_INCLUDES += \
-I$(topsrcdir)/suite/profile \
-I$(topsrcdir)/suite/profile/migration/src \
- -I$(topsrcdir)/suite/browser/src \
-I$(topsrcdir)/suite/shell/src \
-I$(topsrcdir)/suite/feeds/src \
$(NULL)
SHARED_LIBRARY_LIBS = \
../profile/$(LIB_PREFIX)suiteprofile_s.$(LIB_SUFFIX) \
../profile/migration/src/$(LIB_PREFIX)suitemigration_s.$(LIB_SUFFIX) \
- ../browser/src/$(LIB_PREFIX)suitebrowser_s.$(LIB_SUFFIX) \
../feeds/src/$(LIB_PREFIX)suitefeeds_s.$(LIB_SUFFIX) \
$(NULL)
+ifeq ($(OS_ARCH),WINNT)
+LOCAL_INCLUDES += -I$(topsrcdir)/suite/browser/src
+SHARED_LIBRARY_LIBS += ../browser/src/$(LIB_PREFIX)suitebrowser_s.$(LIB_SUFFIX)
+endif
+
# We need to link the windows shell service into seamonkey.exe.
ifdef BUILD_STATIC_LIBS
BUILD_STATIC_SHELL = 1
DEFINES += -DBUILD_STATIC_SHELL=1
endif
ifndef BUILD_STATIC_SHELL
ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))