Don't build the old bookmarks implementation if MOZ_PLACES is enabled. We still export the interface headers for now since not everything is converted over. Bug 320482, r=brettw.

browser/components/bookmarks/Makefile.in

@@ -42,7 +42,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+DIRS		= public
+
+ifndef MOZ_PLACES
+DIRS		+= src
+endif
 
 include $(topsrcdir)/config/rules.mk
 

browser/components/build/Makefile.in

@@ -52,7 +52,6 @@ OS_LIBS += $(call EXPAND_LIBNAME,version)
 endif
 
 SHARED_LIBRARY_LIBS = \
-	$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX) \
 	$(NULL)
 
@@ -78,6 +77,10 @@ REQUIRES += \
 
 LOCAL_INCLUDES += -I$(srcdir)/../places/src
 SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)places_s.$(LIB_SUFFIX)
+else
+SHARED_LIBRARY_LIBS += \
+	$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
+	$(NULL)
 endif
 
 # Link to gkgfx for GNOME shell service

browser/components/build/nsModule.cpp

@@ -39,8 +39,6 @@
 #include "nsIGenericFactory.h"
 
 #include "nsBrowserCompsCID.h"
-#include "nsBookmarksService.h"
-#include "nsForwardProxyDataSource.h"
 #ifdef MOZ_PLACES
 #include "nsAnnoProtocolHandler.h"
 #include "nsAnnotationService.h"
@@ -48,6 +46,9 @@
 #include "nsNavBookmarks.h"
 #include "nsFaviconService.h"
 #include "nsLivemarkService.h"
+#else
+#include "nsBookmarksService.h"
+#include "nsForwardProxyDataSource.h"
 #endif
 #ifdef XP_WIN
 #include "nsWindowsShellService.h"
@@ -78,8 +79,6 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsForwardProxyDataSource, Init)
 #ifdef MOZ_PLACES
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNavHistory, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAnnoProtocolHandler)
@@ -87,6 +86,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAnnotationService, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNavBookmarks, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFaviconService, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsLivemarkService, Init)
+#else
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsForwardProxyDataSource, Init)
 #endif
 #ifdef XP_WIN
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
@@ -172,7 +174,7 @@ static const nsModuleComponentInfo components[] =
     NS_LIVEMARKSERVICE_CID,
     NS_LIVEMARKSERVICE_CONTRACTID,
     nsLivemarkServiceConstructor },
-#endif
+#else
 
   { "Bookmarks",
     NS_BOOKMARKS_SERVICE_CID,
@@ -189,6 +191,8 @@ static const nsModuleComponentInfo components[] =
     NS_RDF_INFER_DATASOURCE_CONTRACTID_PREFIX "forward-proxy",
     nsForwardProxyDataSourceConstructor },
 
+#endif
+
   { "Profile Migrator",
     NS_FIREFOX_PROFILEMIGRATOR_CID,
     NS_PROFILEMIGRATOR_CONTRACTID,

browser/components/migration/src/nsOperaProfileMigrator.h

@@ -52,6 +52,8 @@ class nsILocalFile;
 class nsINIParser;
 class nsIPermissionManager;
 class nsIPrefBranch;
+class nsIBookmarksService;
+class nsIRDFResource;
 
 class nsOperaProfileMigrator : public nsIBrowserProfileMigrator
 {