Clean up MODULE/REQUIRES, bug=73353, r=cls

2001-04-08 08:33:11 +00:00 · 2001-04-08 08:33:11 +00:00 · 748e1ece2f
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= caps
 LIBRARY_NAME	= caps
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string pref js dom xpconnect necko jar widget plugin intl locale layout appshell docshell uriloader gfx2 windowwatcher
+REQUIRES	= xpcom string pref js dom xpconnect necko jar widget plugin intl locale layout docshell uriloader gfx2 windowwatcher

 CPPSRCS		= \
 		nsBasePrincipal.cpp \
--- a/dom/src/base/Makefile.in
+++ b/dom/src/base/Makefile.in
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
 LIBRARY_NAME	= jsdombase_s
-REQUIRES	= xpcom string webbrwsr js widget layout caps docshell xpconnect pref oji necko java locale uriloader sidebar xuldoc timer cookie webshell view uconv shistory plugin windowwatcher gfx2
+REQUIRES	= xpcom string webbrwsr js widget layout caps docshell xpconnect pref oji necko java locale uriloader sidebar xuldoc timer webshell view uconv shistory plugin windowwatcher gfx2

 CPPSRCS		= \
 		nsBarProps.cpp \
--- a/editor/base/Makefile.in
+++ b/editor/base/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= editor
 LIBRARY_NAME	= editor
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc gfx2
+REQUIRES	= xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc gfx2 mozcomps

 CPPSRCS		=                           \
 		ChangeAttributeTxn.cpp      \
--- a/embedding/browser/gtk/src/Makefile.in
+++ b/embedding/browser/gtk/src/Makefile.in
@ -25,8 +25,9 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= gtkembedmoz
 LIBRARY_NAME	= gtkembedmoz
-REQUIRES	= xpcom string docshell webshell necko widget dom layout locale js uriloader webbrwsr shistory embed_base pref windowwatcher gfx2
+REQUIRES	= xpcom string docshell webshell necko widget dom layout locale js uriloader webbrwsr shistory embed_base pref windowwatcher gfx2 mpfilelocprovider

 CPPSRCS		= \
 		gtkmozembed2.cpp \
--- a/embedding/browser/gtk/tests/Makefile.in
+++ b/embedding/browser/gtk/tests/Makefile.in
@ -25,6 +25,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= gtkembedmoz
 REQUIRES	= xpcom string dom

 CPPSRCS		= \
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= cookie
 LIBRARY_NAME	= cookie
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string necko dom js widget layout appshell pref intl locale uriloader windowwatcher
+REQUIRES	= xpcom string necko dom js widget layout pref intl locale uriloader windowwatcher

 ifdef ENABLE_TESTS
 DIRS		= tests
--- a/extensions/cookie/tests/Makefile.in
+++ b/extensions/cookie/tests/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-REQUIRES	= xpcom string cookie necko intl locale layout widget dom
+REQUIRES	= xpcom string cookie necko intl locale

 PROGRAM		= TestCookie$(BIN_SUFFIX)
 CPPSRCS		= TestCookie.cpp
--- a/extensions/xmlextras/build/src/Makefile.in
+++ b/extensions/xmlextras/build/src/Makefile.in
@ -30,7 +30,7 @@ MODULE		= xmlextras
 LIBRARY_NAME	= xmlextras
 SHORT_LIBNAME	= xmlextra
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string dom js layout widget caps necko webbrwsr appstartupnotifier embedcomponents
+REQUIRES	= xpcom string dom js layout widget caps necko webbrwsr embedcomponents

 CPPSRCS		= nsXMLExtrasModule.cpp

--- a/gfx/src/gtk/Makefile.in
+++ b/gfx/src/gtk/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= layout
 LIBRARY_NAME	= gfx_gtk
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string img widget view util dom pref js uconv appshell necko unicharutil gfx2
+REQUIRES	= xpcom string img widget view util dom pref js uconv appshell necko unicharutil gfx2 mozcomps

 CSRCS		= nsPrintdGTK.c

--- a/mailnews/absync/src/Makefile.in
+++ b/mailnews/absync/src/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= absyncsvc
 XPIDL_MODULE	= absync
 LIBRARY_NAME	= absync_s
-REQUIRES	= xpcom string necko mime cookie docshell locale uriloader pref layout widget msgbase msgbaseutil dom rdf addrbook intl locale appshell mork mimetype gfx2 windowwatcher
+REQUIRES	= xpcom string necko mime cookie docshell locale uriloader pref layout widget msgbase msgbaseutil dom rdf addrbook intl locale mork mimetype gfx2 windowwatcher

 CPPSRCS		= \
 		nsAbSyncPostEngine.cpp \
--- a/mailnews/addrbook/build/Makefile.in
+++ b/mailnews/addrbook/build/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= addrbook
 LIBRARY_NAME	= addrbook
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string addrbook necko msgcompose mime msgbase rdf rdfutil docshell appshell dom widget uriloader layout locale mork xuldoc gfx2
+REQUIRES	= xpcom string addrbook necko msgcompose mime msgbase rdf rdfutil docshell appshell dom widget uriloader layout locale mork xuldoc gfx2 appcomps

 CPPSRCS		= nsAbFactory.cpp
 EXPORTS		= nsAbBaseCID.h
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= addrbook
 LIBRARY_NAME	= addrbook_s
-REQUIRES	= xpcom string rdf rdfutil appshell dom js layout widget mork docshell pref necko locale uriloader webshell uconv msgbase msgbaseutil mime msgcompose xuldoc gfx2
+REQUIRES	= xpcom string rdf rdfutil appshell dom js layout widget mork docshell pref necko locale uriloader webshell uconv msgbase msgbaseutil mime msgcompose xuldoc gfx2 appcomps

 CPPSRCS		= \
 		nsAddressBook.cpp \
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= msgbase
 LIBRARY_NAME	= mailnews
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string necko intl locale timer rdf dom js docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompose msgbaseutil appcomps msgdb editor appshell xuldoc caps msgnews gfx2
+REQUIRES	= xpcom string necko intl locale timer rdf dom js docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompose msgbaseutil appcomps msgdb editor appshell xuldoc caps msgnews gfx2 mozcomps

 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS = msgbsutl
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= msgbase
 LIBRARY_NAME	= msgbase_s
-REQUIRES	= xpcom string necko dom js appshell appcomps uconv intl htmlparser widget docshell rdf editor layout mailnews locale msgbaseutil webshell txmgr msgcompose msgdb uriloader pref msglocal msgimap timer mork msgnews addrbook prefmigr chrome xuldoc caps mime mimetype gfx2
+REQUIRES	= xpcom string necko dom js appshell appcomps uconv intl htmlparser widget docshell rdf editor layout mailnews locale msgbaseutil webshell txmgr msgcompose msgdb uriloader pref msglocal msgimap timer mork msgnews addrbook prefmigr chrome xuldoc caps mime mimetype gfx2 mozcomps

 CPPSRCS		= \
 		nsMessenger.cpp \
--- a/mailnews/imap/src/Makefile.in
+++ b/mailnews/imap/src/Makefile.in
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= msgimap
 LIBRARY_NAME	= msgimap_s
-REQUIRES	= xpcom string mailnews rdf msgbase msgbaseutil rdfutil necko msgdb uconv mime pref js intl appshell nkcache timer locale txmgr dom docshell msglocal widget layout uriloader xuldoc msgnews mimetype gfx2 windowwatcher
+REQUIRES	= xpcom string mailnews rdf msgbase msgbaseutil rdfutil necko msgdb uconv mime pref js intl nkcache timer locale txmgr dom docshell msglocal widget layout uriloader xuldoc msgnews mimetype gfx2 windowwatcher

 EXPORTS		= \
 		nsIMAPBodyShell.h \
--- a/modules/libimg/src/Makefile.in
+++ b/modules/libimg/src/Makefile.in
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= img
 LIBRARY_NAME	= img_s
-REQUIRES	= xpcom string layout util locale cookie necko widget dom timer jpeg
+REQUIRES	= xpcom string layout util locale cookie necko timer jpeg

 CPPSRCS		= \
 		ilNetReader.cpp \
--- a/modules/mpfilelocprovider/public/Makefile.in
+++ b/modules/mpfilelocprovider/public/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= mpfilelocprovider
 EXPORTS		= \
 		nsMPFileLocProvider.h   \
 		$(NULL)
--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@ -30,7 +30,7 @@ MODULE		= plugin
 XPIDL_MODULE	= layout
 LIBRARY_NAME	= gkplugin
 IS_COMPONENT    = 1
-REQUIRES	= xpcom string java pref necko gtkxtbin webshell caps intl dom locale layout widget cookie mimetype oji exthandler appshell docshell webbrwsr nkcache gfx2 timer windowwatcher
+REQUIRES	= xpcom string java pref necko gtkxtbin webshell caps intl dom locale layout widget cookie mimetype oji exthandler docshell webbrwsr nkcache gfx2 timer windowwatcher

 CPPSRCS		= \
 		ns4xPlugin.cpp \
--- a/modules/plugin/nglsrc/Makefile.in
+++ b/modules/plugin/nglsrc/Makefile.in
@ -30,7 +30,7 @@ MODULE		= plugin
 XPIDL_MODULE	= layout
 LIBRARY_NAME	= gkplugin
 IS_COMPONENT    = 1
-REQUIRES	= xpcom string java pref necko gtkxtbin webshell caps intl dom locale layout widget cookie mimetype oji exthandler appshell docshell webbrwsr nkcache gfx2 timer windowwatcher
+REQUIRES	= xpcom string java pref necko gtkxtbin webshell caps intl dom locale layout widget cookie mimetype oji exthandler docshell webbrwsr nkcache gfx2 timer windowwatcher

 CPPSRCS		= \
 		ns4xPlugin.cpp \
--- a/modules/plugin/samples/simple/Makefile.in
+++ b/modules/plugin/samples/simple/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= npsimple
 LIBRARY_NAME	= npsimple
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string plugin
+REQUIRES	= xpcom string plugin widget

 XPIDLSRCS	= nsISimplePluginInstance.idl

--- a/modules/plugin/test/Makefile.in
+++ b/modules/plugin/test/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= npsimple
 LIBRARY_NAME	= npsimple
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string plugin
+REQUIRES	= xpcom string plugin widget

 XPIDLSRCS	= nsISimplePluginInstance.idl

--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= test_necko
-REQUIRES	= xpcom string necko nkcache timer cookie layout widget dom dbm
+REQUIRES	= xpcom string necko nkcache timer cookie dbm

 SHARED_LIBRARY_LIBS = $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX)

--- a/profile/pref-migrator/src/Makefile.in
+++ b/profile/pref-migrator/src/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= prefmigr
 LIBRARY_NAME	= nsprefm
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string pref appshell intl docshell dom necko rdf js layout locale uriloader widget webbrwsr uconv gfx2
+REQUIRES	= xpcom string pref appshell intl docshell dom necko rdf js layout locale uriloader widget webbrwsr uconv gfx2 mozcomps

 CPPSRCS		= \
 		nsPrefMigration.cpp \
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= uriloader
 LIBRARY_NAME	= uriloaderbase_s
-REQUIRES	= xpcom string necko dom exthandler pref js docshell layout widget caps htmlparser locale intl webshell
+REQUIRES	= xpcom string necko dom exthandler pref js docshell layout widget caps htmlparser locale intl webshell mozucth mozcomps

 CPPSRCS = 							\
 				nsURILoader.cpp 		\
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@ -33,7 +33,7 @@ endif

 MODULE = exthandler
 LIBRARY_NAME    = exthandler_s
-REQUIRES	= xpcom string mimetype uriloader dom necko rdf webshell
+REQUIRES	= xpcom string mimetype uriloader dom necko rdf webshell mozucth

 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 OSDIR	= os2
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 DIRS			:= public

+MODULE			= webshell_tests
 REQUIRES		= xpcom string webshell widget layout dom webbrwsr docshell util uriloader locale necko htmlparser view timer unicharutil pref intl editor chardet cookie gfx2

 PROGRAM			:= viewer$(BIN_SUFFIX)
--- a/webshell/tests/viewer/public/Makefile.in
+++ b/webshell/tests/viewer/public/Makefile.in
@ -26,6 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= webshell_tests
+
 EXPORTS		= \
 		nsIXPBaseWindow.h \
 		nsIWindowListener.h \
--- a/webshell/tests/viewer/unix/gtk/Makefile.in
+++ b/webshell/tests/viewer/unix/gtk/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= webshell_tests
 LIBRARY_NAME	= viewer_gtk_s
 REQUIRES	= xpcom string webbrwsr widget timer dom layout docshell uriloader locale webshell necko util gfx2

--- a/widget/src/gtksuperwin/Makefile.in
+++ b/widget/src/gtksuperwin/Makefile.in
@ -22,6 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= widget
 LIBRARY_NAME	= gtksuperwin


--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@ -30,7 +30,7 @@ IS_COMPONENT=1
 MODULE		= appshell
 LIBRARY_NAME	= nsappshell
 SHORT_LIBNAME	= appshell
-REQUIRES	= xpcom string widget docshell webshell layout dom necko uriloader js locale webbrwsr rdf pref xpconnect timer chardet intl wallet chrome profile prefmigr xul gfx2 windowwatcher
+REQUIRES	= xpcom string widget docshell webshell layout dom necko uriloader js locale webbrwsr rdf pref xpconnect timer chardet intl chrome profile prefmigr xul gfx2 windowwatcher browser mozcomps

 EXTRA_DSO_LIBS	= jsdom

--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= apprunner
-REQUIRES	= xpcom string webbrwsr widget dom js necko pref appshell wallet layout chrome rdf profile xpinstall uriloader editor view windowwatcher embed_base embedcomponents
+REQUIRES	= xpcom string webbrwsr widget dom js necko pref appshell wallet layout chrome rdf profile xpinstall uriloader editor view windowwatcher embed_base embedcomponents mpfilelocprovider browser mozcomps

 ifeq ($(USE_SHORT_LIBNAME),1)
 PROGRAM		= mozilla$(BIN_SUFFIX)
--- a/xpfe/browser/public/Makefile.in
+++ b/xpfe/browser/public/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= browser
 XPIDL_MODULE	= mozbrwsr

 XPIDLSRCS	= nsIBrowserInstance.idl nsIXULBrowserWindow.idl
--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@ -26,10 +26,10 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= mozbrwsr
+MODULE		= browser
 LIBRARY_NAME	= mozbrwsr
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string webshell necko shistory widget layout docshell appshell dom js timer uriloader locale pref editor appcomps rdf webbrwsr uconv chardet txmgr gfx2
+REQUIRES	= xpcom string webshell necko shistory widget layout docshell appshell dom js timer uriloader locale pref editor appcomps rdf webbrwsr uconv chardet txmgr gfx2 mozucth mozcomps

 CPPSRCS		= nsBrowserInstance.cpp

--- a/xpfe/components/autocomplete/public/Makefile.in
+++ b/xpfe/components/autocomplete/public/Makefile.in
@ -26,6 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+MODULE		= appcomps
 XPIDL_MODULE	= autocomplete

 XPIDLSRCS	= \
--- a/xpfe/components/autocomplete/src/Makefile.in
+++ b/xpfe/components/autocomplete/src/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=appcomps
+MODULE		= appcomps
 LIBRARY_NAME	= autocomplete_s
 REQUIRES	= xpcom string layout dom

--- a/xpfe/components/find/src/Makefile.in
+++ b/xpfe/components/find/src/Makefile.in
@ -30,7 +30,7 @@ MODULE		= appcomps
 XPIDL_MODULE	= mozfind
 LIBRARY_NAME	= mozfind
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string dom js layout widget appshell editor necko txtsvc docshell locale uriloader txmgr gfx2
+REQUIRES	= xpcom string dom js layout widget appshell editor necko txtsvc docshell locale uriloader txmgr gfx2 mozcomps

 CPPSRCS		= nsFindComponent.cpp

--- a/xpfe/components/public/Makefile.in
+++ b/xpfe/components/public/Makefile.in
@ -1,36 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDL_MODULE	= mozcomps
-
-EXPORTS		= nsIAppShellComponentImpl.h
-
-XPIDLSRCS	= nsIAppShellComponent.idl
-
-include $(topsrcdir)/config/rules.mk
-
--- a/xpfe/components/ucth/public/Makefile.in
+++ b/xpfe/components/ucth/public/Makefile.in
@ -1,35 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDL_MODULE	= mozucth
-
-XPIDLSRCS	= nsIUnkContentTypeHandler.idl \
-	          nsIHelperAppLauncherDialog.idl
-
-include $(topsrcdir)/config/rules.mk
-
--- a/xpfe/components/ucth/src/Makefile.in
+++ b/xpfe/components/ucth/src/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= mozucth
 LIBRARY_NAME	= mozucth
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string appshell dom js necko widget layout intl locale exthandler pref
+REQUIRES	= xpcom string appshell dom js necko widget layout intl locale exthandler pref mozcomps

 CPPSRCS		= nsUnknownContentTypeHandler.cpp

--- a/xpfe/components/xfer/public/Makefile.in
+++ b/xpfe/components/xfer/public/Makefile.in
@ -1,37 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDL_MODULE	= mozxfer
-
-XPIDLSRCS	= \
-		nsIStreamTransfer.idl \
-		nsIStreamTransferOperation.idl \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
--- a/xpfe/components/xfer/src/Makefile.in
+++ b/xpfe/components/xfer/src/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= mozxfer
 LIBRARY_NAME	= mozxfer
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string necko appshell dom js widget pref intl locale layout
+REQUIRES	= xpcom string necko appshell dom js widget pref intl locale layout mozcomps

 CPPSRCS		= \
 		nsStreamTransfer.cpp \
--- a/xpinstall/src/Makefile.in
+++ b/xpinstall/src/Makefile.in
@ -33,7 +33,7 @@ MODULE		= xpinstall
 LIBRARY_NAME	= xpinstall
 SHORT_LIBNAME	= xpinstal
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string jar chrome necko intl locale libreg js pref appshell widget layout uriloader xpconnect docshell dom gfx2
+REQUIRES	= xpcom string jar chrome necko intl locale libreg js pref appshell widget layout uriloader xpconnect docshell dom gfx2 mozcomps

 # XXX shouldn't need to export this
 EXPORTS		= nsXPITriggerInfo.h