Fixing phoenix bustage. Patch by dbaron, r=me. Only affects phoenix build.

browser/components/build/Makefile.in

@@ -36,7 +36,9 @@ EXPORTS = nsBrowserCompsCID.h
 CPPSRCS = nsModule.cpp \
           $(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
 OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32)
+endif
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../downloads/src \

xpfe/components/Makefile.in

@@ -27,7 +27,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 DIRS	= \
-			bookmarks \
 			directory \
 			filepicker \
 			find \
@@ -46,7 +45,13 @@ DIRS	= \
 			$(NULL)
 
 ifndef MOZ_PHOENIX
-DIRS += autocomplete history urlbarhistory download-manager
+DIRS += \
+		autocomplete \
+		bookmarks \
+		download-manager \
+		history \
+		urlbarhistory \
+		$(NULL)
 endif
 
 ifdef MOZ_ENABLE_XREMOTE

xpfe/components/build/nsModule.cpp

@@ -36,7 +36,6 @@
  * ***** END LICENSE BLOCK ***** */
 #include "nsIGenericFactory.h"
 #include "nsICategoryManager.h"
-#include "nsBookmarksService.h"
 #include "nsDirectoryViewer.h"
 #include "rdf.h"
 #include "nsTimeBomb.h"
@@ -50,6 +49,7 @@
 #include "nsRDFCID.h"
 #ifndef MOZ_PHOENIX
 #include "nsAutoComplete.h"
+#include "nsBookmarksService.h"
 #include "nsGlobalHistory.h"
 #include "nsUrlbarHistory.h"
 #include "nsDownloadManager.h"
@@ -69,7 +69,6 @@
 #include "nsCURILoader.h"
 
 // Factory constructors
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsHTTPIndex, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirectoryViewerFactory)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(LocalSearchDataSource, Init)
@@ -81,6 +80,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowDataSource, Init)
 #ifndef MOZ_PHOENIX
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteItem)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAutoCompleteResults)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlbarHistory)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGlobalHistory, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDownloadManager, Init)