Part of bug 379068 - remove mailnews' dependency on xpcom_obsolete. r/sr=bienvenu

2007-05-04 15:27:50 +00:00 · 2007-05-04 15:27:50 +00:00 · 88403ccc09
--- a/mailnews/addrbook/build/Makefile.in
+++ b/mailnews/addrbook/build/Makefile.in
@ -96,7 +96,6 @@ EXTRA_DSO_LDOPTS = \
 	$(EXTRA_DSO_LIBS) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
-	$(MOZ_XPCOM_OBSOLETE_LIBS) \
 	$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@ -57,7 +57,6 @@ MOZILLA_INTERNAL_API = 1
 PACKAGE_FILE = msgbase.pkg

 REQUIRES	= xpcom \
-		  xpcom_obsolete \
 		  string \
 		  necko \
 		  intl \
@ -109,7 +108,6 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)

 LOCAL_INCLUDES += -I$(srcdir) \
--- a/mailnews/base/build/nsMsgFactory.cpp
+++ b/mailnews/base/build/nsMsgFactory.cpp
@ -54,7 +54,6 @@
 #include "nsMessengerBootstrap.h"
 #include "nsMessenger.h"

-#include "nsIRegistry.h"
 #include "nsIContentViewer.h"

 /* Include all of the interfaces our factory can generate components for */
--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@ -135,7 +135,6 @@ EXTRA_DSO_LDOPTS = \
 	$(DEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
-	$(MOZ_XPCOM_OBSOLETE_LIBS) \
 	$(NULL)

 else
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@ -63,8 +63,6 @@ MODULE_NAME	= nsMailModule

 REQUIRES	= xpcom \
 		  alerts \
-		  xpcom_obsolete \
-		  xpobsolete \
 		  addrbook \
 		  appcomps \
 		  appshell \
@ -140,7 +138,6 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)

 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
--- a/mailnews/compose/build/Makefile.in
+++ b/mailnews/compose/build/Makefile.in
@ -58,7 +58,6 @@ MOZILLA_INTERNAL_API = 1
 PACKAGE_FILE = msgcompose.pkg

 REQUIRES	= xpcom \
-		  xpcom_obsolete \
 		  string \
 		  msgbase \
 		  msgbaseutil \
@ -97,7 +96,6 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)

 ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
--- a/mailnews/db/msgdb/build/Makefile.in
+++ b/mailnews/db/msgdb/build/Makefile.in
@ -53,7 +53,6 @@ MOZILLA_INTERNAL_API = 1
 PACKAGE_FILE = msgdb.pkg

 REQUIRES	= xpcom \
-                  xpcom_obsolete \
 		  string \
 		  mailnews \
 		  locale \
@ -78,7 +77,6 @@ EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
@ -78,7 +78,6 @@ EXTRA_DSO_LDOPTS = \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(NULL)

--- a/mailnews/extensions/mailviews/build/Makefile.in
+++ b/mailnews/extensions/mailviews/build/Makefile.in
@ -81,7 +81,6 @@ EXTRA_DSO_LDOPTS = \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/mdn/build/Makefile.in
+++ b/mailnews/extensions/mdn/build/Makefile.in
@ -52,7 +52,6 @@ MODULE_NAME	= nsMsgMdnModule
 MOZILLA_INTERNAL_API = 1

 REQUIRES	= xpcom \
-		  xpcom_obsolete \
 		  string \
 		  mailnews \
 		  mime \
@ -81,7 +80,6 @@ EXTRA_DSO_LDOPTS = \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/palmsync/src/Makefile.in
+++ b/mailnews/extensions/palmsync/src/Makefile.in
@ -107,7 +107,6 @@ endif
 EXTRA_DSO_LDOPTS= \
        ../../../addrbook/src/$(LIB_PREFIX)addrbook_s.$(LIB_SUFFIX) \
        $(EXTRA_DSO_LIBS) \
-        $(MOZ_XPCOM_OBSOLETE_LIBS) \
        $(XPCOM_LIBS) \
        $(MOZ_UNICHARUTIL_LIBS) \
        $(NSPR_LIBS) \
--- a/mailnews/extensions/smime/build/Makefile.in
+++ b/mailnews/extensions/smime/build/Makefile.in
@ -90,7 +90,6 @@ EXTRA_DSO_LDOPTS = \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/imap/build/Makefile.in
+++ b/mailnews/imap/build/Makefile.in
@ -54,7 +54,6 @@ MOZILLA_INTERNAL_API = 1
 PACKAGE_FILE = msgimap.pkg

 REQUIRES	= xpcom \
-                  xpcom_obsolete \
 		  string \
 		  mailnews \
 		  msgbase \
@ -90,7 +89,6 @@ EXTRA_DSO_LDOPTS = \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@ -52,7 +52,6 @@ MOZILLA_INTERNAL_API = 1
 MODULE_NAME	= nsImportServiceModule

 REQUIRES	= xpcom \
-		  xpcom_obsolete \
 		  string \
 		  mailnews \
 		  addrbook \
@ -140,7 +139,6 @@ EXTRA_DSO_LDOPTS += \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
 	$(MOZ_COMPONENT_LIBS) \
-	$(MOZ_XPCOM_OBSOLETE_LIBS) \
 	$(NULL)

 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
--- a/mailnews/local/build/Makefile.in
+++ b/mailnews/local/build/Makefile.in
@ -55,7 +55,6 @@ LOCAL_INCLUDES += -I$(srcdir)/../src
 PACKAGE_FILE = msglocal.pkg

 REQUIRES	= xpcom \
-		  xpcom_obsolete \
 		  string \
 		  mailnews \
 		  msgbase \
@ -89,7 +88,6 @@ EXTRA_DSO_LDOPTS = \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@ -107,7 +107,6 @@ EXTRA_DSO_LDOPTS= \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(XPCOM_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/mailnews/mime/build/Makefile.in
+++ b/mailnews/mime/build/Makefile.in
@ -78,7 +78,6 @@ EXTRA_DSO_LDOPTS = \
 	        $(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
                $(MOZ_COMPONENT_LIBS) \
-                $(MOZ_XPCOM_OBSOLETE_LIBS) \
                $(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mailnews/mime/cthandlers/vcard/Makefile.in
@ -100,7 +100,6 @@ EXTRA_DSO_LDOPTS = \
 		$(EXTRA_DSO_LIBS) \
 		../glue/$(LIB_PREFIX)mimecthglue_s.$(LIB_SUFFIX) \
 		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)
 else

--- a/mailnews/news/build/Makefile.in
+++ b/mailnews/news/build/Makefile.in
@ -53,7 +53,6 @@ MOZILLA_INTERNAL_API = 1
 PACKAGE_FILE = msgnews.pkg

 REQUIRES	= xpcom \
-		  xpcom_obsolete \
 		  string \
 		  mailnews \
 		  msgbase \
@ -92,7 +91,6 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_XPCOM_OBSOLETE_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk