Bug 73353: clean up MODULE/REQUIRES story. r=cls, sr=bryner

2003-07-13 22:29:00 +00:00 · 2003-07-13 22:29:00 +00:00 · 2d7ed90a69
--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@ -36,11 +36,8 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsAccessibilityModule
 GRE_MODULE	= 1

-REQUIRES = \
-	xpcom \
-	string \
-	dom \
-	$(NULL)
+REQUIRES	= xpcom \
+		  $(NULL)

 CPPSRCS		= nsAccessibilityFactory.cpp

--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@ -32,10 +32,8 @@ REQUIRES	= commandhandler \
 		  content \
 		  docshell \
 		  dom \
-		  js \
 		  editor \
 		  gfx \
-		  htmlparser \
 		  intl \
 		  layout \
 		  locale \
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@ -28,27 +28,22 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_html_s
-REQUIRES = \
-  appshell \
-  content \
-  docshell \
-  dom \
-  editor \
-  gfx \
-  htmlparser \
-  imglib2 \
-  intl \
-  layout \
-  locale \
-  necko \
-  plugin \
-  string \
-  uriloader \
-  view \
-  webshell \
-  widget \
-  xpcom \
-  $(NULL)
+REQUIRES	= content \
+		  dom \
+		  gfx \
+		  imglib2 \
+		  intl \
+		  layout \
+		  locale \
+		  necko \
+		  string \
+		  widget \
+		  xpcom \
+		  $(NULL)
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+REQUIRES += editor
+endif

 CPPSRCS = \
  nsHTMLAreaAccessible.cpp \
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@ -44,24 +44,15 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = accessibility
 LIBRARY_NAME = accessibility_toolkit_s
 REQUIRES	= content \
-		  docshell \
 		  dom \
 		  editor \
 		  gfx \
-		  htmlparser \
 		  intl \
-		  layout \
-		  locale \
-		  necko \
-		  plugin \
-		  pref \
 		  string \
 		  uriloader \
 		  view \
-		  webshell \
 		  widget \
 		  xpcom \
-		  xuldoc \
 		  $(NULL)

 CPPSRCS = \
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@ -28,27 +28,22 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_xul_s
-REQUIRES = \
-  appshell \
-  content \
-  docshell \
-  dom \
-  editor \
-  gfx \
-  htmlparser \
-  intl \
-  layout \
-  locale \
-  necko \
-  plugin \
-  pref \
-  string \
-  view \
-  webbrwsr \
-  webshell \
-  widget \
-  xpcom \
-  $(NULL)
+REQUIRES	= content \
+		  dom \
+		  gfx \
+		  intl \
+		  layout \
+		  locale \
+		  necko \
+		  pref \
+		  string \
+		  widget \
+		  xpcom \
+		  $(NULL)
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+REQUIRES += editor
+endif

 CPPSRCS = \
  nsXULColorPickerAccessible.cpp \
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -56,7 +56,6 @@ REQUIRES	= xpcom \
 		  imglib2 \
 		  uriloader \
 		  webbrwsr \
-		  debug \
 		  plugin \
 		  $(NULL)

--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -40,7 +40,6 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  docshell \
 		  pref \
-		  htmlparser \
 		  view \
 		  necko \
 		  unicharutil \
--- a/content/html/style/src/Makefile.in
+++ b/content/html/style/src/Makefile.in
@ -41,7 +41,6 @@ REQUIRES	= xpcom \
 		  necko \
 		  mimetype \
 		  webshell \
-		  xul \
 		  htmlparser \
 		  uconv \
 		  xuldoc \
--- a/content/shared/src/Makefile.in
+++ b/content/shared/src/Makefile.in
@ -36,9 +36,7 @@ REQUIRES	= xpcom \
 		  locale \
 		  dom \
 		  necko \
-		  htmlparser \
 		  unicharutil \
-		  uconv \
 		  $(NULL)

 CPPSRCS		= \
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@ -46,7 +46,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  xpconnect \
 		  uconv \
-		  chardet \
 		  lwbrk \
 		  exthandler \
 		  mimetype \
--- a/dom/src/base/Makefile.in
+++ b/dom/src/base/Makefile.in
@ -55,7 +55,6 @@ REQUIRES	= xpcom \
 		  shistory \
 		  plugin \
 		  windowwatcher \
-		  htmlparser \
 		  chardet \
 		  find \
 		  appshell \
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@ -39,23 +39,16 @@ REQUIRES	= xpcom \
 		  content \
 		  uriloader \
 		  txmgr \
-		  htmlparser \
 		  necko \
 		  pref \
 		  webshell \
-		  intl \
 		  docshell \
 		  gfx \
 		  widget \
 		  xuldoc \
 		  txtsvc \
-		  appcomps \
-		  windowwatcher \
 		  chrome \
-		  mimetype \
 		  imglib2 \
-		  webbrwsr \
-		  unicharutil \
 		  commandhandler \
 		  composer \
 		  appshell \
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@ -36,14 +36,12 @@ REQUIRES	= xpcom \
 		  layout \
 		  content \
 		  txmgr \
-		  txtsvc \
 		  htmlparser \
 		  necko \
 		  pref \
 		  view \
 		  gfx \
 		  widget \
-		  xuldoc \
 		  unicharutil \
 		  commandhandler \
 		  docshell \
--- a/editor/libeditor/build/Makefile.in
+++ b/editor/libeditor/build/Makefile.in
@ -52,7 +52,6 @@ REQUIRES	= xpcom \
 		  txmgr \
 		  htmlparser \
 		  necko \
-		  appshell \
 		  xuldoc \
 		  commandhandler \
 		  gfx \
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@ -38,7 +38,6 @@ REQUIRES	= xpcom \
 		  content \
 		  dom \
 		  widget \
-		  unicharutil \
 		  lwbrk \
 		  $(NULL)

--- a/embedding/base/Makefile.in
+++ b/embedding/base/Makefile.in
@ -31,8 +31,6 @@ include $(DEPTH)/config/autoconf.mk

 REQUIRES	= xpcom \
 		  string \
-		  view \
-		  uriloader \
 		  intl \
 		  embedcomponents \
 		  $(NULL)
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@ -39,8 +39,6 @@ REQUIRES	= xpcom \
 		  js \
 		  necko \
 		  uriloader \
-		  history \
-		  toolkitcomps \
 		  shistory \
 		  webshell \
 		  windowwatcher \
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@ -49,7 +49,6 @@ REQUIRES	= js \
 		  htmlparser \
 		  embed_base \
 		  dom \
-		  txtsvc \
 		  lwbrk \
 		  mimetype \
 		  content \
--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@ -29,7 +29,6 @@ REQUIRES	= string \
 		  xpcom \
 		  dom \
 		  widget \
-		  layout \
 		  content \
 		  xuldoc \
 		  caps \
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@ -32,16 +32,9 @@ REQUIRES	= xpcom \
 		  windowwatcher \
 		  widget \
 		  gfx \
-		  js \
-		  xpconnect \
-		  caps \
 		  content \
-		  necko \
 		  uriloader \
-		  docshell \
 		  webbrwsr \
-		  embed_base \
-		  intl \
 		  $(NULL)

 DIRS      = printpde
--- a/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/embedding/components/webbrowserpersist/src/Makefile.in
@ -31,7 +31,6 @@ REQUIRES	= xpcom \
 		  dom \
 		  content \
 		  necko \
-		  necko2 \
 		  widget \
 		  exthandler \
 		  uriloader \
--- a/embedding/components/windowwatcher/src/Makefile.in
+++ b/embedding/components/windowwatcher/src/Makefile.in
@ -31,14 +31,12 @@ REQUIRES	= xpcom \
 		  dom \
 		  windowwatcher \
 		  widget \
-		  gfx \
 		  js \
 		  xpconnect \
 		  caps \
 		  content \
 		  pref \
 		  necko \
-		  uriloader \
 		  docshell \
 		  webbrwsr \
 		  embed_base \
--- a/embedding/lite/Makefile.in
+++ b/embedding/lite/Makefile.in
@ -33,13 +33,7 @@ REQUIRES	= xpcom \
 		  string \
 		  chrome \
 		  necko \
-		  history \
 		  pref \
-		  content \
-		  caps \
-		  xpconnect \
-		  js \
-		  xuldoc \
 		  appcomps \
 		  $(NULL)

--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@ -40,7 +40,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  content \
 		  pref \
-		  intl \
 		  uriloader \
 		  windowwatcher \
 		  docshell \
--- a/extensions/layout-debug/src/Makefile.in
+++ b/extensions/layout-debug/src/Makefile.in
@ -32,24 +32,21 @@ EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutDebugModule

-REQUIRES=	xpcom \
-		string \
-		windowwatcher \
-		docshell \
-		string \
-		dom \
-		gfx \
-		content \
-		necko \
-		layout \
-		widget \
-		locale \
-		view \
-		pref \
-		imglib2 \
-		unicharutil \
-		appshell \
-		$(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  windowwatcher \
+		  docshell \
+		  dom \
+		  gfx \
+		  content \
+		  necko \
+		  layout \
+		  widget \
+		  locale \
+		  view \
+		  pref \
+		  appshell \
+		  $(NULL)

 XPIDLSRCS	= \
 		nsILayoutRegressionTester.idl \
--- a/extensions/p3p/src/Makefile.in
+++ b/extensions/p3p/src/Makefile.in
@ -47,16 +47,13 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT   = 1
 MODULE_NAME	   = nsP3PModule

-REQUIRES = xpcom  \
-	string     \
-	necko      \
-	pref       \
-	cookie     \
-	xmlextras  \
-	dom        \
-	content    \
-	widget     \
-	$(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  cookie \
+		  xmlextras \
+		  dom \
+		  $(NULL)

 CPPSRCS =                 \
 		nsP3PService.cpp      \
--- a/extensions/typeaheadfind/src/Makefile.in
+++ b/extensions/typeaheadfind/src/Makefile.in
@ -38,25 +38,22 @@ SHORT_LIBNAME = typahead
 endif
 GRE_MODULE	= 1

-REQUIRES        = appcomps \
+REQUIRES	= appcomps \
 		  embedcomponents \
 		  content \
 		  docshell \
 		  dom \
-		  js \
 		  find \
 		  intl \
 		  gfx \
 		  layout \
 		  locale \
-		  mozcomps \
 		  necko \
 		  pref \
 		  string \
 		  unicharutil \
 		  uriloader \
 		  view \
-		  webBrowser_core \
 		  webshell \
 		  widget \
 		  webbrwsr \
--- a/extensions/webservices/build/src/Makefile.in
+++ b/extensions/webservices/build/src/Makefile.in
@ -40,8 +40,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  caps \
 		  necko \
-		  webbrwsr \
-		  embedcomponents \
 		  xpconnect \
 		  xmlextras \
 		  $(NULL)
--- a/extensions/webservices/proxy/src/Makefile.in
+++ b/extensions/webservices/proxy/src/Makefile.in
@ -28,15 +28,12 @@ include $(DEPTH)/config/autoconf.mk

 MODULE    = websrvcs
 LIBRARY_NAME	= websrvcsproxy_s
-REQUIRES 	= xpcom \
-		string \
-		xpconnect \
-		caps \
-		js \
-		necko \
-		dom \
-		iiextras \
-		$(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  xpconnect \
+		  js \
+		  dom \
+		  $(NULL)

 CPPSRCS=			\
 	wspinfoservice.cpp	\
--- a/extensions/webservices/proxy/tests/Makefile.in
+++ b/extensions/webservices/proxy/tests/Makefile.in
@ -33,16 +33,12 @@ XPIDL_MODULE	= wsproxytest
 IS_COMPONENT	= 1
 MODULE_NAME	= WSPProxyTestModule

-REQUIRES = xpcom \
-	   string \
-	   xmlextras \
-	   xpconnect \
-	   caps \
-	   js \
-	   necko \
-	   dom \
-	   websrvcs \
-	   $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  xpconnect \
+		  dom \
+		  websrvcs \
+		  $(NULL)

 XPIDLSRCS       = \
 		nsIWSPProxyTest.idl \
--- a/extensions/webservices/wsdl/src/Makefile.in
+++ b/extensions/webservices/wsdl/src/Makefile.in
@ -28,19 +28,18 @@ include $(DEPTH)/config/autoconf.mk

 MODULE    = websrvcs
 LIBRARY_NAME	= websrvcswsdl_s
-REQUIRES = xpcom \
-	   string \
-	   dom \
-	   xpconnect \
-	   caps \
-	   layout \
-	   widget \
-	   content \
-	   js \
-	   necko \
-	   pref \
-	   xmlextras \
-	   $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  xpconnect \
+		  caps \
+		  widget \
+		  content \
+		  js \
+		  necko \
+		  pref \
+		  xmlextras \
+		  $(NULL)

 CPPSRCS	= 				\
 		nsWSDLLoader.cpp	\
--- a/extensions/xmlextras/base/src/Makefile.in
+++ b/extensions/xmlextras/base/src/Makefile.in
@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  caps \
 		  uconv \
 		  necko \
-		  docshell \
 		  xpconnect \
 		  htmlparser \
 		  windowwatcher \
--- a/extensions/xmlextras/build/src/Makefile.in
+++ b/extensions/xmlextras/build/src/Makefile.in
@ -44,7 +44,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  caps \
 		  necko \
-		  webbrwsr \
 		  embedcomponents \
 		  xpconnect \
 		  $(NULL)
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -38,7 +38,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  view \
 		  pref \
-		  imglib2 \
 		  unicharutil \
 		  $(NULL)

--- a/gfx/src/mac/Makefile.in
+++ b/gfx/src/mac/Makefile.in
@ -30,23 +30,18 @@ IS_COMPONENT    = 1
 MODULE_NAME     = nsGfxMacModule
 GRE_MODULE	= 1

-REQUIRES    = xpcom \
-        string \
-        img \
-        widget \
-        view \
-        util \
-        pref \
-        js \
-        uconv \
-        necko \
-        unicharutil \
-        mozcomps \
-        content \
-        layout \
-        locale \
-        dom \
-        $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  view \
+		  pref \
+		  uconv \
+		  necko \
+		  unicharutil \
+		  content \
+		  layout \
+		  locale \
+		  $(NULL)

 CPPSRCS = \
        nsATSUIUtils.cpp \
--- a/htmlparser/robot/test/Makefile.in
+++ b/htmlparser/robot/test/Makefile.in
@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 PROGRAM		= htmlrobot$(BIN_SUFFIX)
 REQUIRES	= xpcom \
 		  string \
-		  webshell \
 		  $(NULL)

 CPPSRCS		= RobotMain.cpp
--- a/htmlparser/tests/html/Makefile.in
+++ b/htmlparser/tests/html/Makefile.in
@ -28,12 +28,10 @@ include $(DEPTH)/config/autoconf.mk

 PROGRAM		= TestParser$(BIN_SUFFIX)

-REQUIRES	= \
-   xpcom \
-	 string \
-	 necko \
-   htmlparser \
-	 $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  $(NULL)

 CPPSRCS		= \
  TestParser.cpp\
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@ -36,7 +36,6 @@ REQUIRES	= xpcom \
 		  chardet \
 		  uconv \
 		  lwbrk \
-		  unicharutil \
 		  intl \
 		  locale \
 		  htmlparser \
--- a/intl/locale/src/mac/Makefile.in
+++ b/intl/locale/src/mac/Makefile.in
@ -49,9 +49,7 @@ FORCE_STATIC_LIB	= 1
 REQUIRES	= xpcom \
 		  string \
 		  unicharutil \
-		  pref \
 		  uconv \
-		  intl \
 		  $(NULL)

 CPPSRCS		= \
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@ -38,8 +38,6 @@ ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME  = mozuconv
 endif
 REQUIRES	= xpcom \
-                  mozreg \
-                  xpcom_obsolete \
 		  string \
 		  intl \
 		  locale \
--- a/intl/uconv/ucvibm/Makefile.in
+++ b/intl/uconv/ucvibm/Makefile.in
@ -42,7 +42,6 @@ LIBRARY_NAME	= ucvibm_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsUCvIBMModule
 REQUIRES	= xpcom \
-		  string \
 		  uconv \
 		  $(NULL)

--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@ -31,7 +31,6 @@ LIBRARY_NAME	= ucvlatin_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsUCvLatinModule
 REQUIRES	= xpcom \
-		  string \
 		  uconv \
 		  $(NULL)

--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@ -31,7 +31,6 @@ LIBRARY_NAME	= ucvtw_s
 MODULE_NAME	= nsUCvTWModule
 FORCE_STATIC_LIB=1
 REQUIRES	= xpcom \
-		  string \
 		  uconv \
 		  $(NULL)

--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@ -33,7 +33,6 @@ LIBRARY_NAME	= ucvtw2_s
 FORCE_STATIC_LIB=1
 MODULE_NAME	= nsUCvTW2Module
 REQUIRES	= xpcom \
-		  string \
 		  uconv \
 		  $(NULL)

--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@ -34,7 +34,6 @@ FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsUCUtil
 REQUIRES	= xpcom \
 		  string \
-		  uconv \
 		  $(NULL)

 CPPSRCS		= \
--- a/js/src/xpconnect/shell/Makefile.in
+++ b/js/src/xpconnect/shell/Makefile.in
@ -42,7 +42,6 @@ MODULE		= xpcshell
 SIMPLE_PROGRAMS	= xpcshell$(BIN_SUFFIX)
 REQUIRES	= xpconnect \
 		  xpcom \
-		  string \
 		  js \
 		  $(NULL)

--- a/layout/base/src/Makefile.in
+++ b/layout/base/src/Makefile.in
@ -36,7 +36,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  view \
 		  locale \
-		  htmlparser \
 		  webshell \
 		  necko \
 		  uconv \
--- a/layout/html/forms/src/Makefile.in
+++ b/layout/html/forms/src/Makefile.in
@ -36,11 +36,8 @@ REQUIRES	= xpcom \
 		  widget \
 		  view \
 		  dom \
-		  js \
-		  htmlparser \
 		  necko \
 		  webshell \
-		  caps \
 		  editor \
 		  intl \
 		  uconv \
@ -48,7 +45,6 @@ REQUIRES	= xpcom \
 		  xuldoc \
 		  imglib2 \
 		  accessibility \
-		  xpconnect \
 		  unicharutil \
 		  commandhandler \
 		  $(NULL)
--- a/layout/html/style/src/Makefile.in
+++ b/layout/html/style/src/Makefile.in
@ -31,7 +31,6 @@ LIBRARY_NAME	= gkhtmlstyle_s
 REQUIRES	= xpcom \
 		  string \
 		  dom \
-		  js \
 		  content \
 		  gfx \
 		  widget \
--- a/layout/html/table/src/Makefile.in
+++ b/layout/html/table/src/Makefile.in
@ -35,7 +35,6 @@ REQUIRES	= xpcom \
 		  gfx \
 		  widget \
 		  locale \
-		  webshell \
 		  view \
 		  accessibility \
 		  necko \
--- a/layout/mathml/content/src/Makefile.in
+++ b/layout/mathml/content/src/Makefile.in
@ -34,7 +34,6 @@ REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  gfx \
-		  content \
 		  $(NULL)

 include $(topsrcdir)/config/config.mk
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -38,8 +38,6 @@ REQUIRES	= xpcom \
 		  view \
 		  docshell \
 		  necko \
-		  editor \
-		  htmlparser \
 		  webshell \
 		  pref \
 		  intl \
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@ -37,7 +37,6 @@ REQUIRES	= xpcom \
 		  appshell \
 		  dom \
 		  layout \
-		  content \
 		  widget \
 		  mork \
 		  docshell \
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@ -38,7 +38,6 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgBaseModule
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
-		  xpobsolete \
 		  string \
 		  necko \
 		  intl \
@ -51,15 +50,13 @@ REQUIRES	= xpcom \
 		  mime \
 		  uriloader \
 		  mailnews \
-          addrbook \
+		  addrbook \
 		  mork \
 		  txmgr \
 		  pref \
 		  msgcompose \
 		  msgbaseutil \
-		  appcomps \
 		  msgdb \
-		  editor \
 		  appshell \
 		  msgnews \
 		  msgimap \
@ -68,6 +65,10 @@ REQUIRES	= xpcom \
 		  content \
 		  $(NULL)

+ifeq ($(OS_ARCH),WINNT)
+REQUIRES	+= appcomps
+endif
+
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS = msgbsutl
 else
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@ -34,16 +34,13 @@ REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  dom \
-		  js \
 		  appshell \
-		  appcomps \
 		  uconv \
 		  intl \
 		  htmlparser \
 		  widget \
 		  docshell \
 		  rdf \
-		  editor \
 		  gfx \
 		  layout \
 		  content \
@ -67,7 +64,6 @@ REQUIRES	= xpcom \
 		  mime \
 		  mimetype \
 		  windowwatcher \
-		  profile \
 		  webbrwsr \
 		  exthandler \
 		  $(NULL)
@ -93,15 +89,15 @@ CPPSRCS		= \
 		nsMsgStatusFeedback.cpp \
 		nsMsgWindow.cpp \
 		nsMessengerMigrator.cpp \
-		nsMsgServiceProvider.cpp	\
-		nsSubscribeDataSource.cpp	\
+		nsMsgServiceProvider.cpp \
+		nsSubscribeDataSource.cpp \
 		nsSubscribableServer.cpp \
-		nsMsgPrintEngine.cpp	\
+		nsMsgPrintEngine.cpp \
 		nsStatusBarBiffManager.cpp \
 		nsMsgDBView.cpp \
 		nsMsgThreadedDBView.cpp \
 		nsMsgSpecialViews.cpp \
-    nsMsgQuickSearchDBView.cpp \
+		nsMsgQuickSearchDBView.cpp \
 		nsMsgSearchDBView.cpp \
 		nsMsgOfflineManager.cpp \
 		nsMsgProgress.cpp \
@ -116,6 +112,9 @@ REQUIRES += macmorefiles
 endif

 ifeq ($(OS_ARCH),WINNT)
+REQUIRES	+= appcomps \
+		   profile \
+		   $(NULL)
 CPPSRCS		+= nsMessengerWinIntegration.cpp 
 endif

--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@ -30,7 +30,7 @@ MODULE		= msgcompose
 LIBRARY_NAME	= msgcompose_s
 META_COMPONENT = mail
 REQUIRES	= xpcom \
-                  xpcom_obsolete \
+		  xpcom_obsolete \
 		  string \
 		  dom \
 		  js \
@ -60,7 +60,6 @@ REQUIRES	= xpcom \
 		  txmgr \
 		  caps \
 		  exthandler \
-		  mork \
 		  nkcache \
 		  mimetype \
 		  windowwatcher \
--- a/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
@ -34,13 +34,8 @@ SHORT_LIBNAME	= bayesflt
 IS_COMPONENT	= 1
 MODULE_NAME	= nsBayesianFilterModule
 REQUIRES	= xpcom \
-		  string \
 		  mailnews \
-		  mime \
 		  msgbase \
-		  msgbaseutil \
-		  msgdb \
-		  necko \
 		  lwbrk \
 		  $(NULL)

--- a/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
@ -36,7 +36,6 @@ REQUIRES	= xpcom \
 		  mailnews \
 		  msgbaseutil \
 		  msgdb \
-		  mime \
 		  profile \
 		  lwbrk \
 		  $(NULL)
--- a/mailnews/extensions/mdn/src/Makefile.in
+++ b/mailnews/extensions/mdn/src/Makefile.in
@ -32,7 +32,6 @@ META_COMPONENT = mail
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
 		  string \
-		  dom \
 		  msgbase \
 		  mailnews \
 		  necko \
--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@ -44,7 +44,7 @@ endif
 META_COMPONENT	= mail

 REQUIRES	= xpcom \
-          xpcom_obsolete \
+		  xpcom_obsolete \
 		  string \
 		  import \
 		  intl \
@ -53,7 +53,6 @@ REQUIRES	= xpcom \
 		  mork \
 		  msgcompose \
 		  msgbase \
-		  editor \
 		  dom \
 		  uriloader \
 		  mailnews \
--- a/mailnews/import/src/Makefile.in
+++ b/mailnews/import/src/Makefile.in
@ -47,7 +47,6 @@ REQUIRES	= xpcom \
 		  mailnews \
 		  addrbook \
 		  uconv \
-		  mork \
 		  msgbase \
 		  msgbaseutil \
 		  intl \
--- a/mailnews/mime/build/Makefile.in
+++ b/mailnews/mime/build/Makefile.in
@ -33,7 +33,6 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= mime_services
 REQUIRES	= xpcom \
-                  xpcom_obsolete \
 		  string \
 		  necko \
 		  msgbase \
--- a/mailnews/mime/emitters/src/Makefile.in
+++ b/mailnews/mime/emitters/src/Makefile.in
@ -30,9 +30,8 @@ MODULE		= mimeemitter
 LIBRARY_NAME	= emitterutil_s
 META_COMPONENT = mail
 REQUIRES	= xpcom \
-                  xpcom_obsolete \
-		  string \
 		  xpcom_obsolete \
+		  string \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
--- a/mailnews/mime/src/Makefile.in
+++ b/mailnews/mime/src/Makefile.in
@ -38,7 +38,7 @@ MODULE		= mime
 LIBRARY_NAME	= mime_s
 META_COMPONENT = mail
 REQUIRES	= xpcom \
-                  xpcom_obsolete \
+		  xpcom_obsolete \
 		  string \
 		  msgbase \
 		  msgbaseutil \
@ -48,7 +48,6 @@ REQUIRES	= xpcom \
 		  uconv \
 		  unicharutil \
 		  msgcompose \
-		  editor \
 		  dom \
 		  intl \
 		  msgimap \
--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@ -40,8 +40,6 @@ REQUIRES	= xpcom \
 		  java \
 		  pref \
 		  necko \
-		  gtkxtbin \
-		  webshell \
 		  caps \
 		  intl \
 		  uconv \
@ -54,14 +52,18 @@ REQUIRES	= xpcom \
 		  oji \
 		  exthandler \
 		  docshell \
-		  webbrwsr \
 		  windowwatcher \
 		  imglib2 \
 		  layout \
 		  js \
 		  $(NULL)
-# for xlib port
+
+ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
+REQUIRES	+= gtkxtbin
+endif
+ifeq ($(MOZ_WIDGET_TOOLKIT),xlib)
 REQUIRES	+= xlibxtbin xlibrgb
+endif

 CPPSRCS		= \
 		ns4xPlugin.cpp \
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@ -32,7 +32,6 @@ REQUIRES	= xpcom \
 		  string \
 		  exthandler \
 		  mimetype \
-		  intl \
 		  uconv \
 		  locale \
 		  pref \
--- a/netwerk/build2/Makefile.in
+++ b/netwerk/build2/Makefile.in
@ -42,7 +42,6 @@ GRE_MODULE	= 1
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  nkcache \
 		  $(NULL)

 CPPSRCS		= nsNetModule2.cpp
--- a/netwerk/mime/src/Makefile.in
+++ b/netwerk/mime/src/Makefile.in
@ -32,7 +32,6 @@ REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  uconv \
-		  pref \
 		  $(NULL)

 CPPSRCS		= \
--- a/netwerk/protocol/ftp/src/Makefile.in
+++ b/netwerk/protocol/ftp/src/Makefile.in
@ -30,11 +30,9 @@ MODULE		= necko
 LIBRARY_NAME	= nkftp_s
 REQUIRES	= xpcom \
 		  string \
-		  exthandler \
 		  mimetype \
 		  pref \
 		  intl \
-		  necko \
 		  nkcache \
 		  $(NULL)

--- a/netwerk/protocol/http/src/Makefile.in
+++ b/netwerk/protocol/http/src/Makefile.in
@ -34,7 +34,6 @@ REQUIRES	= xpcom \
 		  nkcache \
 		  mimetype \
 		  intl \
-		  exthandler \
 		  caps \
 		  xpconnect \
 		  js \
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@ -30,7 +30,6 @@ MODULE		= test_necko
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  nkcache \
 		  util \
 		  $(NULL)

--- a/parser/htmlparser/robot/test/Makefile.in
+++ b/parser/htmlparser/robot/test/Makefile.in
@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 PROGRAM		= htmlrobot$(BIN_SUFFIX)
 REQUIRES	= xpcom \
 		  string \
-		  webshell \
 		  $(NULL)

 CPPSRCS		= RobotMain.cpp
--- a/parser/htmlparser/tests/html/Makefile.in
+++ b/parser/htmlparser/tests/html/Makefile.in
@ -28,12 +28,10 @@ include $(DEPTH)/config/autoconf.mk

 PROGRAM		= TestParser$(BIN_SUFFIX)

-REQUIRES	= \
-   xpcom \
-	 string \
-	 necko \
-   htmlparser \
-	 $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  $(NULL)

 CPPSRCS		= \
  TestParser.cpp\
--- a/profile/build/Makefile.in
+++ b/profile/build/Makefile.in
@ -50,22 +50,9 @@ GRE_MODULE	= 1

 REQUIRES	= xpcom \
 		  xpcom_obsolete \
-		  libreg \
 		  string \
-		  chrome \
-		  docshell \
-		  webbrwsr \
-		  dom \
-		  widget \
-		  necko \
 		  uriloader \
-		  intl \
-		  pref \
-		  prefmigr \
 		  appshell \
-		  uconv \
-		  windowwatcher \
-		  profdirserviceprovider \
 		  $(NULL)

 CPPSRCS		= \
--- a/profile/src/Makefile.in
+++ b/profile/src/Makefile.in
@ -30,8 +30,7 @@ MODULE		= profile
 LIBRARY_NAME	= profile_s
 REQUIRES	= xpcom \
 		  xpcom_obsolete \
-		  xpcom_obsolete \
-	          string \
+		  string \
 		  chrome \
 		  docshell \
 		  webbrwsr \
--- a/rdf/datasource/src/Makefile.in
+++ b/rdf/datasource/src/Makefile.in
@ -31,7 +31,6 @@ LIBRARY_NAME	= rdfdatasource_s
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  uconv \
 		  $(NULL)

 CPPSRCS		= \
--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@ -63,17 +63,13 @@ REQUIRES	= nspr \
 		  xpcom \
 		  string \
 		  necko \
-		  necko2 \
 		  uriloader \
 		  dom \
 		  intl \
-		  js \
 		  docshell \
 		  widget \
 		  layout \
 		  content \
-		  unicharutil \
-		  pipnss \
 		  pref \
 		  $(NULL)

--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@ -68,7 +68,6 @@ REQUIRES	= nspr \
 		  necko \
 		  pipnss \
 		  layout \
-		  pipboot \
 		  $(NULL)

 INCLUDES	+= \
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@ -101,7 +101,6 @@ REQUIRES	= nspr \
 		  widget \
 		  layout \
 		  content \
-		  pippki \
 		  xpconnect \
 		  jar \
 		  unicharutil \
--- a/string/embed/Makefile.in
+++ b/string/embed/Makefile.in
@ -53,8 +53,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../obsolete \
 		$(NULL)

-REQUIRES	= string \
-		  xpcom \
+REQUIRES	= xpcom \
 		  $(NULL)

 STRING_LCSRCS   = \
--- a/string/embed/standalone/Makefile.in
+++ b/string/embed/standalone/Makefile.in
@ -51,8 +51,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../obsolete \
 		$(NULL)

-REQUIRES	= string \
-		  xpcom \
+REQUIRES	= xpcom \
 		  $(NULL)

 STRING_LCSRCS   = \
--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@ -29,14 +29,13 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= prefetch
 LIBRARY_NAME	= prefetch_s
 REQUIRES	= xpcom \
-			string \
-			necko \
-			uriloader \
-			nkcache \
-			htmlparser \
-			chardet \
-			pref \
-			$(NULL)
+		  string \
+		  necko \
+		  uriloader \
+		  nkcache \
+		  chardet \
+		  pref \
+		  $(NULL)

 CPPSRCS = \
 		nsPrefetchService.cpp \
--- a/widget/src/mac/Makefile.in
+++ b/widget/src/mac/Makefile.in
@ -30,7 +30,7 @@ MODULE_NAME	= nsWidgetMacModule
 XPIDL_MODULE	= widget_mac
 GRE_MODULE	= 1

-REQUIRES = xpcom \
+REQUIRES	= xpcom \
 		  gfx \
 		  string \
 		  uconv \
@ -46,7 +46,6 @@ REQUIRES = xpcom \
 		  nkcache \
 		  locale \
 		  pref \
-		  appshell \
 		  intl \
 		  mimetype \
 		  unicharutil \
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@ -33,8 +33,7 @@ LIBRARY_NAME	= xpcom
 #EXPORT_LIBRARY = 1
 GRE_MODULE	= 1

-REQUIRES	= libreg \
-		  string \
+REQUIRES	= string \
 		  $(NULL)

 # pull in MoreFiles for MacOSX
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@ -31,8 +31,7 @@ XPIDL_MODULE	= xpcom_components
 LIBRARY_NAME	= xpcomcomponents_s
 GRE_MODULE	= 1

-REQUIRES	= libreg \
-		  string \
+REQUIRES	= string \
 		  $(NULL)

 CPPSRCS		= \
--- a/xpcom/obsolete/Makefile.in
+++ b/xpcom/obsolete/Makefile.in
@ -36,9 +36,7 @@ GRE_MODULE	= 1

 DIRS            = component

-REQUIRES	= xpcom  \
-		  mozreg \
-		  libreg \
+REQUIRES	= xpcom \
 		  string \
 		  $(NULL)

@ -56,6 +54,7 @@ CPPSRCS         = \
 		$(NULL)

 ifeq ($(OS_ARCH),WINNT)
+REQUIRES	+= libreg
 CPPSRCS		+= dlldeps.cpp
 endif

--- a/xpcom/proxy/tests/Makefile.in
+++ b/xpcom/proxy/tests/Makefile.in
@ -28,8 +28,7 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= xpcom
 XPIDL_MODULE	= proxytest
-REQUIRES	= string \
-		  $(NULL)
+REQUIRES	= $(NULL)

 CPPSRCS		= proxytests.cpp
 XPIDLSRCS	= nsITestProxy.idl
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@ -42,7 +42,6 @@ DEFINES		+= -DXPCOM_GLUE
 REQUIRES	= string \
 		  embedstring \
 		  xpcom \
-		  xpcomsample \
 		  $(NULL)

 CPPSRCS		=		   \
--- a/xpcom/string/embed/Makefile.in
+++ b/xpcom/string/embed/Makefile.in
@ -53,8 +53,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../obsolete \
 		$(NULL)

-REQUIRES	= string \
-		  xpcom \
+REQUIRES	= xpcom \
 		  $(NULL)

 STRING_LCSRCS   = \
--- a/xpcom/string/embed/standalone/Makefile.in
+++ b/xpcom/string/embed/standalone/Makefile.in
@ -51,8 +51,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../obsolete \
 		$(NULL)

-REQUIRES	= string \
-		  xpcom \
+REQUIRES	= xpcom \
 		  $(NULL)

 STRING_LCSRCS   = \
--- a/xpcom/tools/registry/Makefile.in
+++ b/xpcom/tools/registry/Makefile.in
@ -33,8 +33,7 @@ DEFINES		+= -DXPCOM_GLUE

 REQUIRES	= string \
 		  embedstring \
-		  xpcom \
-	          $(NULL)
+		  $(NULL)


 LOCAL_INCLUDES	= \
--- a/xpcom_obsolete/Makefile.in
+++ b/xpcom_obsolete/Makefile.in
@ -36,9 +36,7 @@ GRE_MODULE	= 1

 DIRS            = component

-REQUIRES	= xpcom  \
-		  mozreg \
-		  libreg \
+REQUIRES	= xpcom \
 		  string \
 		  $(NULL)

@ -56,6 +54,7 @@ CPPSRCS         = \
 		$(NULL)

 ifeq ($(OS_ARCH),WINNT)
+REQUIRES	+= libreg
 CPPSRCS		+= dlldeps.cpp
 endif

--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@ -52,13 +52,11 @@ REQUIRES	= xpcom \
 		  pref \
 		  xpconnect \
 		  intl \
-		  xul \
 		  windowwatcher \
 		  browser \
 		  caps \
 		  profile \
 		  unicharutil \
-		  embed_base \
 		  uconv \
 		  exthandler \
 		  $(NULL)
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@ -51,7 +51,6 @@ endif

 MODULE		= apprunner
 REQUIRES	= xpcom \
-		  xpconnect \
 		  string \
 		  webbrwsr \
 		  widget \
@ -63,34 +62,24 @@ REQUIRES	= xpcom \
 		  chrome \
 		  xpinstall \
 		  uriloader \
-		  view \
 		  windowwatcher \
 		  embed_base \
 		  embedcomponents \
-		  browser \
 		  docshell \
-		  uconv \
 		  locale \
-		  xremoteservice \
 		  profile \
 		  $(NULL)
 # for jprof
 REQUIRES	+= jprof
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-REQUIRES	+= \
-		  intl \
-		  profile \
-		  $(NULL)
-DIRS		+= os2turbo
-endif
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-REQUIRES	+= intl profile appcomps
-endif

 ifdef NS_TRACE_MALLOC
 REQUIRES	+= tracemalloc
 endif

+ifdef MOZ_ENABLE_XREMOTE
+REQUIRES	+= xremoteservice
+endif
+
 include $(topsrcdir)/config/config.mk

 ifeq ($(USE_SHORT_LIBNAME),1)
@ -203,6 +192,8 @@ LIBS += -lphexlib -lph
 endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+DIRS += os2turbo
+REQUIRES += xpconnect intl profile
 CPPSRCS += nsNativeAppSupportOS2.cpp
 CPPSRCS += nsNativeAppSupportBase.cpp
 RESFILE = splashos2.res
@ -231,6 +222,7 @@ LIBS += $(MOZ_GTK2_LIBS)
 endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+REQUIRES += xpconnect intl appcomps
 RCINCLUDE = splash.rc
 CPPSRCS += nsNativeAppSupportWin.cpp nsNativeAppSupportBase.cpp
 OS_LIBS	+= $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32)
--- a/xpfe/bootstrap/appleevents/Makefile.in
+++ b/xpfe/bootstrap/appleevents/Makefile.in
@ -34,19 +34,11 @@ REQUIRES	= xpcom \
 		  content \
 		  gfx \
 		  widget \
-		  locale \
-		  view \
 		  necko \
-		  webshell \
 		  pref \
 		  docshell \
-		  plugin \
-		  xuldoc \
-		  imglib2 \
-		  gfx2 \
-	 	  webbrwsr \
+		  webbrwsr \
 		  appshell \
-		  layout \
 		  caps \
 		  uriloader \
 		  $(NULL)
--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@ -46,7 +46,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  appcomps \
 		  webbrwsr \
-		  chardet \
 		  windowwatcher \
 		  $(NULL)

--- a/xpfe/components/bookmarks/src/Makefile.in
+++ b/xpfe/components/bookmarks/src/Makefile.in
@ -41,7 +41,6 @@ REQUIRES	= xpcom \
 		  profile \
 		  dom \
 		  intl \
-		  webshell \
 		  windowwatcher \
 		  unicharutil \
 		  txmgr \
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@ -38,18 +38,16 @@ REQUIRES	= xpcom \
 		  content \
 		  rdf \
 		  necko \
-		  necko2 \
 		  nkcache \
 		  intl \
 		  locale \
 		  mork \
 		  widget \
 		  dom \
-                  alerts\
-                  uriloader \
-                  mimetype \
-                  webbrowserpersist \
-                  progressDlg \
+		  uriloader \
+		  mimetype \
+		  webbrowserpersist \
+		  progressDlg \
 		  pref \
 		  docshell \
 		  webshell \
--- a/xpfe/components/directory/Makefile.in
+++ b/xpfe/components/directory/Makefile.in
@ -33,7 +33,6 @@ XPIDLSRCS	= nsIHTTPIndex.idl
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  necko2 \
 		  rdf \
 		  content \
 		  js \
--- a/xpfe/components/find/src/Makefile.in
+++ b/xpfe/components/find/src/Makefile.in
@ -34,15 +34,6 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsFindComponent
 REQUIRES	= xpcom \
 		  string \
-		  dom \
-		  gfx \
-		  layout \
-		  content \
-		  widget \
-		  editor \
-		  necko \
-		  txtsvc \
-		  docshell \
 		  $(NULL)

 CPPSRCS		= \
--- a/Показать больше
+++ b/Показать больше