Bug 332114 - XULRunner shouldn't build xpcomobsolete, r=darin

git-svn-id: svn://10.0.0.236/trunk@193229 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/toolkit/library/Makefile.in

@@ -59,7 +59,6 @@ endif
 REQUIRES = \
 	xpcom \
 	string \
-	xpcom_obsolete \
 	$(ZLIB_REQUIRES) \
 	xulapp \
 	$(NULL)

mozilla/toolkit/library/libxul-config.mk

@@ -45,7 +45,6 @@ REQUIRES += libreg widget gfx
 
 CPPSRCS += \
 	dlldeps.cpp \
-	dlldeps-obs.cpp \
 	nsGFXDeps.cpp \
 	nsDllMain.cpp \
 	$(NULL)
@@ -69,7 +68,6 @@ REQUIRES += libreg widget gfx
 
 CPPSRCS += \
 	dlldeps.cpp \
-	dlldeps-obs.cpp \
 	nsGFXDeps.cpp \
 	$(NULL)
 
@@ -85,7 +83,6 @@ endif
 STATIC_LIBS += \
 	xpcom_core \
 	mozreg_s \
-	xpcom_compat \
 	unicharutil_s \
 	ucvutil_s \
 	gkgfx \
@@ -94,7 +91,6 @@ STATIC_LIBS += \
 
 # component libraries
 COMPONENT_LIBS += \
-	xpcom_compat_c \
 	xpconnect \
 	necko \
 	auth \

mozilla/toolkit/library/libxul-rules.mk

@@ -65,7 +65,6 @@ DEFINES += \
 	-D_IMPL_NS_STRINGAPI \
 	-DEXPORT_XPT_API \
 	-DEXPORT_XPTC_API \
-	-D_IMPL_NS_COM_OBSOLETE \
 	-D_IMPL_NS_GFX \
 	-D_IMPL_NS_WIDGET \
 	$(NULL)
@@ -85,10 +84,7 @@ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG))
 EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
 endif
 
-export:: dlldeps.cpp dlldeps-obs.cpp
+export:: dlldeps.cpp
 
 dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp
 	$(INSTALL) $^ .
-
-dlldeps-obs.cpp: $(topsrcdir)/xpcom/obsolete/dlldeps-obs.cpp
-	$(INSTALL) $^ .

mozilla/toolkit/library/nsStaticXULComponents.cpp

@@ -172,7 +172,6 @@
 #endif
 
 #define XUL_MODULES                          \
-    MODULE(xpcomObsoleteModule)              \
     MODULE(xpconnect)                        \
     MATHML_MODULES                           \
     MODULE(nsUConvModule)                    \