Bug 597789 - Remove --disable-rdf; r=ted
authorMatheus Kerschbaum <matjk7@gmail.com>
Tue, 08 Nov 2011 11:42:54 +0000
changeset 80000 1f0be211721f812b870b4d17a51f9c291197e0db
parent 79999 f25597d036ec0e8e7353532fcef816c08a88fcec
child 80001 41f853454fc502544fc1108c30264cc9cd05b9f7
child 80020 9543018be98c9b7a209bde174a91cc156b1944ce
push idunknown
push userunknown
push dateunknown
reviewersted
bugs597789
milestone10.0a1
Bug 597789 - Remove --disable-rdf; r=ted
config/autoconf.mk.in
configure.in
toolkit/components/Makefile.in
toolkit/components/build/Makefile.in
toolkit/components/build/nsToolkitCompsModule.cpp
toolkit/library/Makefile.in
toolkit/library/libxul-config.mk
toolkit/library/nsStaticXULComponents.cpp
toolkit/toolkit-tiers.mk
xpfe/components/Makefile.in
xpfe/components/build/nsModule.cpp
xpfe/components/directory/nsDirectoryViewer.cpp
xpfe/components/directory/nsDirectoryViewer.h
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -218,17 +218,16 @@ CookieManagement=1
 SingleSignon=1
 
 MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
 MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
 
 MOZ_BUILD_ROOT             = @MOZ_BUILD_ROOT@
 
 MOZ_XUL                    = @MOZ_XUL@
-MOZ_RDF                    = @MOZ_RDF@
 
 NECKO_PROTOCOLS = @NECKO_PROTOCOLS@
 NECKO_COOKIES = @NECKO_COOKIES@
 NECKO_WIFI = @NECKO_WIFI@
 MOZ_AUTH_EXTENSION = @MOZ_AUTH_EXTENSION@
 
 MOZ_NATIVE_HUNSPELL = @SYSTEM_HUNSPELL@
 MOZ_HUNSPELL_LIBS = @MOZ_HUNSPELL_LIBS@
--- a/configure.in
+++ b/configure.in
@@ -4568,17 +4568,16 @@ LIBJPEG_TURBO_ASFLAGS=
 LIBJPEG_TURBO_X86_ASM=
 LIBJPEG_TURBO_X64_ASM=
 MOZ_PANGO=1
 MOZ_PERMISSIONS=1
 MOZ_PLACES=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_PROFILELOCKING=1
 MOZ_PSM=1
-MOZ_RDF=1
 MOZ_REFLOW_PERF=
 MOZ_SAFE_BROWSING=
 MOZ_HELP_VIEWER=
 MOZ_SPELLCHECK=1
 MOZ_SVG_DLISTS=
 MOZ_TOOLKIT_SEARCH=1
 MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
@@ -8135,28 +8134,16 @@ MOZ_ARG_DISABLE_BOOL(profilelocking,
                           Disable profile locking],
     MOZ_PROFILELOCKING=,
     MOZ_PROFILELOCKING=1 )
 if test "$MOZ_PROFILELOCKING"; then
   AC_DEFINE(MOZ_PROFILELOCKING)
 fi
 
 dnl ========================================================
-dnl disable rdf services
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(rdf,
-[  --disable-rdf           Disable RDF],
-    MOZ_RDF= )
-if test "$MOZ_RDF"; then
-  AC_DEFINE(MOZ_RDF)
-fi
-
-AC_SUBST(MOZ_RDF)
-
-dnl ========================================================
 dnl necko configuration options
 dnl ========================================================
 
 dnl
 dnl option to disable various necko protocols
 dnl
 MOZ_ARG_ENABLE_STRING(necko-protocols,
 [  --enable-necko-protocols[={http,ftp,default,all,none}]
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -51,33 +51,35 @@ endif
 
 PARALLEL_DIRS += \
   aboutmemory \
   apppicker \
   commandlines \
   console \
   contentprefs \
   cookie \
+  downloads \
   exthelper \
   filepicker \
   find \
+  intl \
   microformats \
   parentalcontrols \
   passwordmgr \
   perf \
   places \
   prompts \
   reflect \
   startup \
   statusfilter \
+  telemetry \
   typeaheadfind \
   urlformatter \
   viewconfig \
   viewsource \
-  telemetry \
   $(NULL)
 
 ifdef BUILD_CTYPES
 PARALLEL_DIRS += \
   ctypes \
   $(NULL)
 endif
 
@@ -105,23 +107,16 @@ PARALLEL_DIRS += \
   satchel \
   $(NULL)
 endif
 
 ifdef MOZ_TOOLKIT_SEARCH
 PARALLEL_DIRS += search
 endif
 
-ifdef MOZ_RDF
-PARALLEL_DIRS += \
-  downloads \
-  intl \
-  $(NULL)
-endif
-
 ifdef MOZ_URL_CLASSIFIER
 PARALLEL_DIRS += url-classifier
 endif
 
 DIRS += \
   build \
   $(NULL)
 
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -78,34 +78,29 @@ LOCAL_INCLUDES += \
   $(NULL)
 endif
 
 SHARED_LIBRARY_LIBS = \
   ../find/$(LIB_PREFIX)mozfind_s.$(LIB_SUFFIX) \
   ../typeaheadfind/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \
   ../startup/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
   ../statusfilter/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \
+  ../downloads/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
+  ../intl/$(LIB_PREFIX)intl_s.$(LIB_SUFFIX) \
   $(NULL)
 
 ifndef MOZ_DISABLE_PARENTAL_CONTROLS
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 SHARED_LIBRARY_LIBS += ../parentalcontrols/$(LIB_PREFIX)parentalcontrols_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += \
   -I$(srcdir)/../parentalcontrols \
   $(NULL)
 endif
 endif
 
-ifdef MOZ_RDF
-SHARED_LIBRARY_LIBS += \
-  ../downloads/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
-  ../intl/$(LIB_PREFIX)intl_s.$(LIB_SUFFIX) \
-  $(NULL)
-endif
-
 ifdef ALERTS_SERVICE
 SHARED_LIBRARY_LIBS += ../alerts/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
 endif
 ifdef ALERTS_SERVICE_MAC
 SHARED_LIBRARY_LIBS += ../alerts/mac/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
 SHARED_LIBRARY_LIBS += ../alerts/mac/growl/$(LIB_PREFIX)growl_s.$(LIB_SUFFIX)
 endif
 
--- a/toolkit/components/build/nsToolkitCompsModule.cpp
+++ b/toolkit/components/build/nsToolkitCompsModule.cpp
@@ -45,22 +45,20 @@
 #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
 #include "nsParentalControlsServiceWin.h"
 #endif
 
 #ifdef ALERTS_SERVICE
 #include "nsAlertsService.h"
 #endif
 
-#ifdef MOZ_RDF
 #include "nsDownloadManager.h"
 #include "nsDownloadProxy.h"
 #include "nsCharsetMenu.h"
 #include "rdf.h"
-#endif
 
 #include "nsTypeAheadFind.h"
 
 #ifdef MOZ_URL_CLASSIFIER
 #include "nsUrlClassifierDBService.h"
 #include "nsUrlClassifierStreamUpdater.h"
 #include "nsUrlClassifierUtils.h"
 #include "nsUrlClassifierPrefixSet.h"
@@ -81,21 +79,19 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindSer
 #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsParentalControlsServiceWin)
 #endif
 
 #ifdef ALERTS_SERVICE
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAlertsService)
 #endif
 
-#ifdef MOZ_RDF
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsDownloadManager,
                                          nsDownloadManager::GetSingleton) 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadProxy)
-#endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTypeAheadFind)
 
 #ifdef MOZ_URL_CLASSIFIER
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlClassifierPrefixSet)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlClassifierStreamUpdater)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUrlClassifierUtils, Init)
 
@@ -128,20 +124,18 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowser
 NS_DEFINE_NAMED_CID(NS_TOOLKIT_APPSTARTUP_CID);
 NS_DEFINE_NAMED_CID(NS_USERINFO_CID);
 #ifdef ALERTS_SERVICE
 NS_DEFINE_NAMED_CID(NS_ALERTSSERVICE_CID);
 #endif
 #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
 NS_DEFINE_NAMED_CID(NS_PARENTALCONTROLSSERVICE_CID);
 #endif
-#ifdef MOZ_RDF
 NS_DEFINE_NAMED_CID(NS_DOWNLOADMANAGER_CID);
 NS_DEFINE_NAMED_CID(NS_DOWNLOAD_CID);
-#endif
 NS_DEFINE_NAMED_CID(NS_FIND_SERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_TYPEAHEADFIND_CID);
 #ifdef MOZ_URL_CLASSIFIER
 NS_DEFINE_NAMED_CID(NS_URLCLASSIFIERPREFIXSET_CID);
 NS_DEFINE_NAMED_CID(NS_URLCLASSIFIERDBSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_URLCLASSIFIERSTREAMUPDATER_CID);
 NS_DEFINE_NAMED_CID(NS_URLCLASSIFIERUTILS_CID);
 #endif
@@ -155,20 +149,18 @@ static const mozilla::Module::CIDEntry k
   { &kNS_TOOLKIT_APPSTARTUP_CID, false, NULL, nsAppStartupConstructor },
   { &kNS_USERINFO_CID, false, NULL, nsUserInfoConstructor },
 #ifdef ALERTS_SERVICE
   { &kNS_ALERTSSERVICE_CID, false, NULL, nsAlertsServiceConstructor },
 #endif
 #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
   { &kNS_PARENTALCONTROLSSERVICE_CID, false, NULL, nsParentalControlsServiceWinConstructor },
 #endif
-#ifdef MOZ_RDF
   { &kNS_DOWNLOADMANAGER_CID, false, NULL, nsDownloadManagerConstructor },
   { &kNS_DOWNLOAD_CID, false, NULL, nsDownloadProxyConstructor },
-#endif
   { &kNS_FIND_SERVICE_CID, false, NULL, nsFindServiceConstructor },
   { &kNS_TYPEAHEADFIND_CID, false, NULL, nsTypeAheadFindConstructor },
 #ifdef MOZ_URL_CLASSIFIER
   { &kNS_URLCLASSIFIERPREFIXSET_CID, false, NULL, nsUrlClassifierPrefixSetConstructor },
   { &kNS_URLCLASSIFIERDBSERVICE_CID, false, NULL, nsUrlClassifierDBServiceConstructor },
   { &kNS_URLCLASSIFIERSTREAMUPDATER_CID, false, NULL, nsUrlClassifierStreamUpdaterConstructor },
   { &kNS_URLCLASSIFIERUTILS_CID, false, NULL, nsUrlClassifierUtilsConstructor },
 #endif
@@ -184,20 +176,18 @@ static const mozilla::Module::ContractID
   { NS_APPSTARTUP_CONTRACTID, &kNS_TOOLKIT_APPSTARTUP_CID },
   { NS_USERINFO_CONTRACTID, &kNS_USERINFO_CID },
 #ifdef ALERTS_SERVICE
   { NS_ALERTSERVICE_CONTRACTID, &kNS_ALERTSSERVICE_CID },
 #endif
 #if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
   { NS_PARENTALCONTROLSSERVICE_CONTRACTID, &kNS_PARENTALCONTROLSSERVICE_CID },
 #endif
-#ifdef MOZ_RDF
   { NS_DOWNLOADMANAGER_CONTRACTID, &kNS_DOWNLOADMANAGER_CID },
   { NS_TRANSFER_CONTRACTID, &kNS_DOWNLOAD_CID },
-#endif
   { NS_FIND_SERVICE_CONTRACTID, &kNS_FIND_SERVICE_CID },
   { NS_TYPEAHEADFIND_CONTRACTID, &kNS_TYPEAHEADFIND_CID },
 #ifdef MOZ_URL_CLASSIFIER
   { NS_URLCLASSIFIERPREFIXSET_CONTRACTID, &kNS_URLCLASSIFIERPREFIXSET_CID },
   { NS_URLCLASSIFIERDBSERVICE_CONTRACTID, &kNS_URLCLASSIFIERDBSERVICE_CID },
   { NS_URICLASSIFIERSERVICE_CONTRACTID, &kNS_URLCLASSIFIERDBSERVICE_CID },
   { NS_URLCLASSIFIERSTREAMUPDATER_CONTRACTID, &kNS_URLCLASSIFIERSTREAMUPDATER_CID },
   { NS_URLCLASSIFIERUTILS_CONTRACTID, &kNS_URLCLASSIFIERUTILS_CID },
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -37,19 +37,17 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_RDF
 include $(topsrcdir)/rdf/util/src/objs.mk
-endif
 include $(topsrcdir)/intl/unicharutil/util/objs.mk
 
 MODULE = libxul
 LIBRARY_NAME = xul
 FORCE_USE_PIC = 1
 FORCE_SHARED_LIB = 1
 MOZILLA_INTERNAL_API = 1
 
@@ -85,49 +83,36 @@ SHARED_LIBRARY_LIBS += \
 SHARED_LIBRARY_LIBS += \
 	$(foreach component,$(COMPONENT_LIBS),$(DEPTH)/staticlib/components/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
 	$(foreach lib,$(STATIC_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \
 	$(NULL)
 
 include $(srcdir)/libxul-config.mk
 
 EXTRA_DEPS += \
-	$(srcdir)/libxul-config.mk \
-	$(srcdir)/libxul-rules.mk \
-	$(topsrcdir)/intl/unicharutil/util/objs.mk \
-	$(NULL)
-
+  $(srcdir)/libxul-config.mk \
+  $(srcdir)/libxul-rules.mk \
+  $(topsrcdir)/intl/unicharutil/util/objs.mk \
+  $(topsrcdir)/rdf/util/src/objs.mk \
+  $(NULL)
 
 CPPSRCS += \
-	$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
-	$(NULL)
+  $(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
+  $(RDF_UTIL_SRC_LCPPSRCS) \
+  $(NULL)
 
 GARBAGE	+= \
-	$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
-	$(wildcard *.$(OBJ_SUFFIX)) \
-	$(NULL)
+  $(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
+  $(wildcard *.$(OBJ_SUFFIX)) \
+  $(RDF_UTIL_SRC_LCPPSRCS) \
+  $(NULL)
 
 LOCAL_INCLUDES += -I$(topsrcdir)/intl/unicharutil/util \
   -I$(topsrcdir)/intl/unicharutil/src
 
-ifdef MOZ_RDF
-EXTRA_DEPS += \
-	$(topsrcdir)/rdf/util/src/objs.mk \
-	$(NULL)
-
-
-CPPSRCS += \
-	$(RDF_UTIL_SRC_LCPPSRCS) \
-	$(NULL)
-
-GARBAGE += \
-	$(RDF_UTIL_SRC_LCPPSRCS) \
-	$(NULL)
-endif
-
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SDK_LIBRARY = $(IMPORT_LIBRARY)
 else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
 # See bug 653662 - some builders are hitting an internal size limit
 # on incremental builds. Disable this for debug builds using VC8/9.
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -118,17 +118,17 @@ STATIC_LIBS += \
 
 # component libraries
 COMPONENT_LIBS += \
 	necko \
 	uconv \
 	i18n \
 	chardet \
 	jar$(VERSION_NUMBER) \
-        startupcache \
+	startupcache \
 	pref \
 	htmlpars \
 	imglib2 \
 	gkgfx \
 	gklayout \
 	docshell \
 	embedcomponents \
 	webbrwsr \
@@ -140,16 +140,18 @@ COMPONENT_LIBS += \
 	pipnss \
 	appcomps \
 	jsreflect \
 	composer \
 	jetpack_s \
 	telemetry \
 	jsdebugger \
 	storagecomps \
+	rdf \
+	windowds \
 	$(NULL)
 
 ifdef BUILD_CTYPES
 COMPONENT_LIBS += \
 	jsctypes \
 	$(NULL)
 endif
 
@@ -210,23 +212,16 @@ COMPONENT_LIBS += cookie permissions
 DEFINES += -DMOZ_PERMISSIONS
 endif
 
 ifdef MOZ_UNIVERSALCHARDET
 COMPONENT_LIBS += universalchardet
 DEFINES += -DMOZ_UNIVERSALCHARDET
 endif
 
-ifdef MOZ_RDF
-COMPONENT_LIBS += \
-	rdf \
-	windowds \
-	$(NULL)
-endif
-
 ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 ifdef MOZ_XUL
 COMPONENT_LIBS += fileview
 DEFINES += -DMOZ_FILEVIEW
 endif
 endif
 
 ifdef MOZ_PLACES
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -60,18 +60,16 @@
 #endif
 
 #ifdef MOZ_UNIVERSALCHARDET
 #define UNIVERSALCHARDET_MODULE MODULE(nsUniversalCharDetModule)
 #else
 #define UNIVERSALCHARDET_MODULE
 #endif
 
-#define GFX_MODULES MODULE(nsGfxModule)
-
 #ifdef XP_WIN
 #  define WIDGET_MODULES MODULE(nsWidgetModule)
 #elif defined(XP_MACOSX)
 #  define WIDGET_MODULES MODULE(nsWidgetMacModule)
 #elif defined(XP_OS2)
 #  define WIDGET_MODULES MODULE(nsWidgetOS2Module)
 #elif defined(MOZ_WIDGET_GTK2)
 #  define WIDGET_MODULES MODULE(nsWidgetGtk2Module)
@@ -84,24 +82,16 @@
 #endif
 
 #ifdef ICON_DECODER
 #define ICON_MODULE MODULE(nsIconDecoderModule)
 #else
 #define ICON_MODULE
 #endif
 
-#ifdef MOZ_RDF
-#define RDF_MODULES \
-    MODULE(nsRDFModule) \
-    MODULE(nsWindowDataSourceModule)
-#else
-#define RDF_MODULES
-#endif
-
 #ifdef ACCESSIBILITY
 #define ACCESS_MODULES MODULE(nsAccessibilityModule)
 #else
 #define ACCESS_MODULES
 #endif
 
 #ifdef MOZ_ENABLE_XREMOTE
 #define XREMOTE_MODULES MODULE(RemoteServiceModule)
@@ -129,19 +119,16 @@
 
 #if defined(ENABLE_JETPACK_SERVICE)
 #define JETPACK_MODULES \
     MODULE(jetpack)
 #else
 #define JETPACK_MODULES
 #endif
 
-#define PLUGINS_MODULES \
-    MODULE(nsPluginModule)
-
 #ifdef MOZ_JSDEBUGGER
 #define JSDEBUGGER_MODULES \
     MODULE(JavaScript_Debugger)
 #else
 #define JSDEBUGGER_MODULES
 #endif
 
 #if defined(MOZ_FILEVIEW) && defined(MOZ_XUL)
@@ -203,20 +190,16 @@
 #endif
 
 #if defined(BUILD_CTYPES)
 #define JSCTYPES_MODULE MODULE(jsctypes)
 #else
 #define JSCTYPES_MODULE
 #endif
 
-#define JSREFLECT_MODULE MODULE(jsreflect)
-
-#define SERVICES_CRYPTO_MODULE MODULE(nsServicesCryptoModule)
-
 #ifndef MOZ_APP_COMPONENT_MODULES
 #if defined(MOZ_APP_COMPONENT_INCLUDE)
 #include MOZ_APP_COMPONENT_INCLUDE
 #define MOZ_APP_COMPONENT_MODULES APP_COMPONENT_MODULES
 #else
 #define MOZ_APP_COMPONENT_MODULES
 #endif
 #endif
@@ -228,24 +211,25 @@
     UNIVERSALCHARDET_MODULE                  \
     MODULE(necko)                            \
     PERMISSIONS_MODULES                      \
     AUTH_MODULE                              \
     MODULE(nsJarModule)                      \
     ZIPWRITER_MODULE                         \
     MODULE(StartupCacheModule)               \
     MODULE(nsPrefModule)                     \
-    RDF_MODULES                              \
+    MODULE(nsRDFModule)                      \
+    MODULE(nsWindowDataSourceModule)         \
     MODULE(nsParserModule)                   \
-    GFX_MODULES                              \
+    MODULE(nsGfxModule)                      \
     WIDGET_MODULES                           \
     MODULE(nsImageLib2Module)                \
     ICON_MODULE                              \
     JETPACK_MODULES                          \
-    PLUGINS_MODULES                          \
+    MODULE(nsPluginModule)                   \
     MODULE(nsLayoutModule)                   \
     MODULE(docshell_provider)                \
     MODULE(embedcomponents)                  \
     MODULE(Browser_Embedding_Module)         \
     ACCESS_MODULES                           \
     MODULE(appshell)                         \
     MODULE(nsTransactionManagerModule)       \
     MODULE(nsComposerModule)                 \
@@ -263,19 +247,19 @@
     MODULE(NSS)                              \
     SYSTEMPREF_MODULES                       \
     SPELLCHECK_MODULE                        \
     LAYOUT_DEBUG_MODULE                      \
     UNIXPROXY_MODULE                         \
     OSXPROXY_MODULE                          \
     WINDOWSPROXY_MODULE                      \
     JSCTYPES_MODULE                          \
-    JSREFLECT_MODULE                         \
+    MODULE(jsreflect)                        \
     MODULE(jsperf)                           \
-    SERVICES_CRYPTO_MODULE                   \
+    MODULE(nsServicesCryptoModule)           \
     MOZ_APP_COMPONENT_MODULES                \
     MODULE(nsTelemetryModule)                \
     MODULE(jsdebugger)                       \
     /* end of list */
 
 #define MODULE(_name) \
   NSMODULE_DECL(_name);
 
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -112,19 +112,17 @@ tier_platform_dirs	+= \
 
 ifdef MOZ_PERMISSIONS
 tier_platform_dirs += \
 		extensions/cookie \
 		extensions/permissions \
 		$(NULL)
 endif
 
-ifdef MOZ_RDF
 tier_platform_dirs += rdf
-endif
 
 ifdef MOZ_JSDEBUGGER
 tier_platform_dirs += js/jsd
 endif
 
 ifdef MOZ_VORBIS
 tier_platform_dirs += \
 		media/libvorbis \
--- a/xpfe/components/Makefile.in
+++ b/xpfe/components/Makefile.in
@@ -41,21 +41,15 @@ srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = appcomps
 
 include $(topsrcdir)/config/config.mk
 
-ifdef MOZ_RDF
 DIRS += \
-        windowds \
-        $(NULL)
-endif
-
-# build should be last
-DIRS += \
-        directory \
-        build \
-        $(NULL)
+    windowds \
+    directory \
+    build \
+    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/build/nsModule.cpp
+++ b/xpfe/components/build/nsModule.cpp
@@ -33,48 +33,37 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "mozilla/ModuleUtils.h"
 #include "nsNetUtil.h"
 #include "nsDirectoryViewer.h"
-#ifdef MOZ_RDF
 #include "rdf.h"
 #include "nsRDFCID.h"
-#endif
 #include "nsCURILoader.h"
 
-#ifdef MOZ_RDF
 // Factory constructors
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsHTTPIndex, Init)
-#endif
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirectoryViewerFactory)
 
 NS_DEFINE_NAMED_CID(NS_DIRECTORYVIEWERFACTORY_CID);
-#ifdef MOZ_RDF
 NS_DEFINE_NAMED_CID(NS_HTTPINDEX_SERVICE_CID);
-#endif
-
 
 static const mozilla::Module::CIDEntry kXPFECIDs[] = {
     { &kNS_DIRECTORYVIEWERFACTORY_CID, false, NULL, nsDirectoryViewerFactoryConstructor },
-#ifdef MOZ_RDF
     { &kNS_HTTPINDEX_SERVICE_CID, false, NULL, nsHTTPIndexConstructor },
-#endif
     { NULL }
 };
 
 static const mozilla::Module::ContractIDEntry kXPFEContracts[] = {
     { "@mozilla.org/xpfe/http-index-format-factory-constructor", &kNS_DIRECTORYVIEWERFACTORY_CID },
-#ifdef MOZ_RDF
     { NS_HTTPINDEX_SERVICE_CONTRACTID, &kNS_HTTPINDEX_SERVICE_CID },
     { NS_HTTPINDEX_DATASOURCE_CONTRACTID, &kNS_HTTPINDEX_SERVICE_CID },
-#endif
     { NULL }
 };
 
 static const mozilla::Module::CategoryEntry kXPFECategories[] = {
     { "Gecko-Content-Viewers", "application/http-index-format", "@mozilla.org/xpfe/http-index-format-factory-constructor" },
     { NULL }
 };
 
--- a/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -53,21 +53,19 @@
 
 #include "nsDirectoryViewer.h"
 #include "nsIDirIndex.h"
 #include "jsapi.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
 #include "nsEscape.h"
 #include "nsIEnumerator.h"
-#ifdef MOZ_RDF
 #include "nsIRDFService.h"
 #include "nsRDFCID.h"
 #include "rdf.h"
-#endif
 #include "nsIScriptContext.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIServiceManager.h"
 #include "nsISupportsArray.h"
 #include "nsIXPConnect.h"
 #include "nsEnumeratorUtils.h"
 #include "nsString.h"
 #include "nsXPIDLString.h"
@@ -95,29 +93,26 @@ using namespace mozilla;
 static const int FORMAT_HTML = 2;
 static const int FORMAT_XUL = 3;
 
 //----------------------------------------------------------------------
 //
 // Common CIDs
 //
 
-#ifdef MOZ_RDF
 static NS_DEFINE_CID(kRDFServiceCID,             NS_RDFSERVICE_CID);
-#endif
 
 // Various protocols we have to special case
 static const char               kFTPProtocol[] = "ftp://";
 
 //----------------------------------------------------------------------
 //
 // nsHTTPIndex
 //
 
-#ifdef MOZ_RDF
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsHTTPIndex)
     NS_INTERFACE_MAP_ENTRY(nsIHTTPIndex)
     NS_INTERFACE_MAP_ENTRY(nsIRDFDataSource)
     NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
     NS_INTERFACE_MAP_ENTRY(nsIDirIndexListener)
     NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
     NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
     NS_INTERFACE_MAP_ENTRY(nsIFTPEventSink)
@@ -1295,18 +1290,16 @@ nsHTTPIndex::GetAllCmds(nsIRDFResource *
 	nsresult	rv = NS_ERROR_UNEXPECTED;
 	if (mInner)
 	{
 		rv = mInner->GetAllCmds(aSource, _retval);
 	}
 	return(rv);
 }
 
-#endif /* MOZ_RDF */
-
 
 //----------------------------------------------------------------------
 //
 // nsDirectoryViewerFactory
 //
 nsDirectoryViewerFactory::nsDirectoryViewerFactory()
 {
 }
@@ -1330,18 +1323,16 @@ nsDirectoryViewerFactory::CreateInstance
                                          nsISupports* aContainer,
                                          nsISupports* aExtraInfo,
                                          nsIStreamListener** aDocListenerResult,
                                          nsIContentViewer** aDocViewerResult)
 {
   nsresult rv;
 
   bool viewSource = (PL_strstr(aContentType,"view-source") != 0);
-  
-#ifdef MOZ_RDF
 
   if (!viewSource &&
       Preferences::GetInt("network.dir.format", FORMAT_XUL) == FORMAT_XUL) {
     // ... and setup the original channel's content type
     (void)aChannel->SetContentType(NS_LITERAL_CSTRING("application/vnd.mozilla.xul+xml"));
 
     // This is where we shunt the HTTP/Index stream into our datasource,
     // and open the directory viewer XUL file as the content stream to
@@ -1392,17 +1383,16 @@ nsDirectoryViewerFactory::CreateInstance
     // Now shanghai the stream into our http-index parsing datasource
     // wrapper beastie.
     listener = do_QueryInterface(httpindex,&rv);
     *aDocListenerResult = listener.get();
     NS_ADDREF(*aDocListenerResult);
     
     return NS_OK;
   }
-#endif
 
   // setup the original channel's content type
   (void)aChannel->SetContentType(NS_LITERAL_CSTRING("text/html"));
 
   // Otherwise, lets use the html listing
   nsCOMPtr<nsICategoryManager> catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
   if (NS_FAILED(rv))
     return rv;
--- a/xpfe/components/directory/nsDirectoryViewer.h
+++ b/xpfe/components/directory/nsDirectoryViewer.h
@@ -38,22 +38,20 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsdirectoryviewer__h____
 #define nsdirectoryviewer__h____
 
 #include "nsNetUtil.h"
 #include "nsIStreamListener.h"
 #include "nsIContentViewer.h"
-#ifdef MOZ_RDF
 #include "nsIHTTPIndex.h"
 #include "nsIRDFService.h"
 #include "nsIRDFDataSource.h"
 #include "nsIRDFLiteral.h"
-#endif
 #include "nsIDocumentLoaderFactory.h"
 #include "nsITimer.h"
 #include "nsISupportsArray.h"
 #include "nsXPIDLString.h"
 #include "nsIDirIndexListener.h"
 #include "nsIFTPChannel.h"
 #include "nsCycleCollectionParticipant.h"
 
@@ -63,17 +61,16 @@ public:
     nsDirectoryViewerFactory();
     virtual ~nsDirectoryViewerFactory();
 
     // nsISupports interface
     NS_DECL_ISUPPORTS
     NS_DECL_NSIDOCUMENTLOADERFACTORY
 };
 
-#ifdef MOZ_RDF
 class nsHTTPIndex : public nsIHTTPIndex,
                     public nsIRDFDataSource,
                     public nsIStreamListener,
                     public nsIDirIndexListener,
                     public nsIInterfaceRequestor,
                     public nsIFTPEventSink
 {
 private:
@@ -144,16 +141,14 @@ public:
     NS_DECL_NSIDIRINDEXLISTENER
     NS_DECL_NSIINTERFACEREQUESTOR
     NS_DECL_NSIFTPEVENTSINK
 
     // nsISupports interface
     NS_DECL_CYCLE_COLLECTING_ISUPPORTS
     NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsHTTPIndex, nsIHTTPIndex)
 };
-#endif
 
 // {82776710-5690-11d3-BE36-00104BDE6048}
 #define NS_DIRECTORYVIEWERFACTORY_CID \
 { 0x82776710, 0x5690, 0x11d3, { 0xbe, 0x36, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } }
 
-
 #endif // nsdirectoryviewer__h____