fix for bug 101761 - REQUIRES update - remove all REQUIRES that are no longer necessary.. r=cls, a=asa (build-only changes)

2002-06-06 20:28:14 +00:00 · 2002-06-06 20:28:14 +00:00 · bcf192e308
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@ -28,31 +28,25 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_base_s
-REQUIRES = \
-  content \
-  content_xul \
-  docshell \
-  dom \
-  gfx \
-  gfx2 \
-  htmlparser \
-  imglib2 \
-  intl \
-  layout \
-  layout_xul \
-  locale \
-  necko \
-  plugin \
-  pref \
-  string \
-  uriloader \
-  view \
-  webshell \
-  widget \
-  xpcom \
-  xuldoc \
-  webbrwsr \
-  $(NULL)
+REQUIRES	= content \
+		  docshell \
+		  dom \
+		  gfx \
+		  htmlparser \
+		  intl \
+		  layout \
+		  locale \
+		  necko \
+		  plugin \
+		  pref \
+		  string \
+		  uriloader \
+		  view \
+		  webshell \
+		  widget \
+		  xpcom \
+		  xuldoc \
+		  $(NULL)

 CPPSRCS = \
  nsAccessibilityService.cpp \
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@ -28,28 +28,25 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = accessibility
 LIBRARY_NAME = accessibility_html_s
-REQUIRES = \
-  content \
-  content_xul \
-  docshell \
-  dom \
-  gfx \
-  gfx2 \
-  htmlparser \
-  imglib2 \
-  intl \
-  layout \
-  locale \
-  necko \
-  plugin \
-  string \
-  uriloader \
-  view \
-  webshell \
-  widget \
-  xpcom \
-  webbrwsr \
-  $(NULL)
+REQUIRES	= content \
+		  docshell \
+		  dom \
+		  gfx \
+		  gfx2 \
+		  htmlparser \
+		  imglib2 \
+		  intl \
+		  layout \
+		  locale \
+		  necko \
+		  plugin \
+		  string \
+		  uriloader \
+		  view \
+		  webshell \
+		  widget \
+		  xpcom \
+		  $(NULL)

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

 MODULE = accessibility
 LIBRARY_NAME = accessibility_xul_s
-REQUIRES = \
-  content \
-  content_xul \
-  docshell \
-  dom \
-  gfx \
-  gfx2 \
-  htmlparser \
-  imglib2 \
-  intl \
-  layout \
-  layout_xul \
-  locale \
-  necko \
-  plugin \
-  pref \
-  string \
-  uriloader \
-  view \
-  webshell \
-  widget \
-  xpcom \
-  webbrwsr \
-  $(NULL)
+REQUIRES	= content \
+		  docshell \
+		  dom \
+		  gfx \
+		  htmlparser \
+		  intl \
+		  layout \
+		  locale \
+		  necko \
+		  pref \
+		  string \
+		  view \
+		  widget \
+		  xpcom \
+		  $(NULL)

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

 CPPSRCS		= \
--- a/content/build/Makefile.in
+++ b/content/build/Makefile.in
@ -60,7 +60,6 @@ REQUIRES	= xpcom \
 		  xul \
 		  xuldoc \
 		  xultmpl \
-		  timer \
 		  webbrwsr \
 		  caps \
 		  xpconnect \
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -44,7 +44,6 @@ REQUIRES	= xpcom \
 		  htmlparser \
 		  view \
 		  necko \
-      webbrwsr \
 		  unicharutil \
 		  $(NULL)

--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@ -42,7 +42,6 @@ REQUIRES	= xpcom \
 		  intl \
 		  webshell \
 		  docshell \
-		  cookie \
 		  caps \
 		  util \
 		  uconv \
@ -57,7 +56,6 @@ REQUIRES	= xpcom \
 		  imglib2 \
 		  xpconnect \
 		  unicharutil \
-      webbrwsr \
 		  $(NULL)

 CPPSRCS		= \
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@ -48,11 +48,9 @@ REQUIRES	= xpcom \
 		  lwbrk \
 		  xul \
 		  xuldoc \
-		  gfx2 \
 		  rdf \
 		  imglib2 \
 		  unicharutil \
-		  webbrwsr \
 		  locale \
 		  $(NULL)

--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@ -53,9 +53,7 @@ REQUIRES	= xpcom \
 		  xul \
 		  xultmpl \
 		  webshell \
-      webbrwsr \
 		  unicharutil \
-		  commandhandler \
 		  $(NULL)

 CPPSRCS		= \
--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@ -32,7 +32,6 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMorkModule
 REQUIRES	= xpcom \
-		  string \
 		  $(NULL)

 CPPSRCS		= nsMorkFactory.cpp
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@ -31,36 +31,34 @@ LIBRARY_NAME	= composer
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsComposerModule
-REQUIRES        = xpcom \
-                  string \
-                  dom \
-                  layout \
-                  content \
-                  uriloader \
-                  txmgr \
-                  htmlparser \
-                  necko \
-                  pref \
-                  webshell \
-                  intl \
-                  docshell \
-                  gfx \
-                  widget \
-                  xuldoc \
-                  txtsvc \
-                  appshell \
-                  appcomps \
-                  windowwatcher \
-                  chrome \
-                  exthandler \
-                  mimetype \
-                  imglib2 \
-                  gfx2 \
-                  webbrwsr \
-                  unicharutil \
-                  commandhandler \
-                  composer \
-                  $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  layout \
+		  content \
+		  uriloader \
+		  txmgr \
+		  htmlparser \
+		  necko \
+		  pref \
+		  webshell \
+		  intl \
+		  docshell \
+		  gfx \
+		  widget \
+		  xuldoc \
+		  txtsvc \
+		  appcomps \
+		  windowwatcher \
+		  chrome \
+		  mimetype \
+		  imglib2 \
+		  gfx2 \
+		  webbrwsr \
+		  unicharutil \
+		  commandhandler \
+		  composer \
+		  $(NULL)

 CPPSRCS  = \
           nsEditorShell.cpp              \
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@ -29,25 +29,24 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= editor
 LIBRARY_NAME	= editorbase_s

-REQUIRES        = xpcom \
-                  string \
-                  dom \
-                  locale \
-                  layout \
-                  content \
-                  txmgr \
-                  htmlparser \
-                  necko \
-                  pref \
-                  view \
-                  appshell \
-                  gfx \
-                  widget \
-                  xuldoc \
-                  unicharutil \
-                  webbrwsr \
-			commandhandler \
-                  $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  locale \
+		  layout \
+		  content \
+		  txmgr \
+		  htmlparser \
+		  necko \
+		  pref \
+		  view \
+		  appshell \
+		  gfx \
+		  widget \
+		  xuldoc \
+		  unicharutil \
+		  commandhandler \
+		  $(NULL)

 # Internal header files, needed by other editor sublibs:
 INTERNAL_HDR_DIR = ../internal
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@ -29,21 +29,20 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= editor
 LIBRARY_NAME	= htmleditor_s

-REQUIRES        = xpcom \
-                  string \
-                  dom \
-                  layout \
-                  locale \
-                  unicharutil \
-                  content \
-                  txmgr \
-                  htmlparser \
-                  necko \
-                  pref \
-                  gfx \
-                  widget \
-                  webbrwsr \
-                  $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  layout \
+		  locale \
+		  unicharutil \
+		  content \
+		  txmgr \
+		  htmlparser \
+		  necko \
+		  pref \
+		  gfx \
+		  widget \
+		  $(NULL)

 # Building the full blown HTML Editor  so add its source files and objects:

--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@ -30,23 +30,22 @@ MODULE		= editor
 LIBRARY_NAME	= texteditor_s
 IS_COMPONENT	= 1

-REQUIRES        = xpcom \
-                  string \
-                  dom \
-                  locale \
-                  layout \
-                  content \
-                  txmgr \
-                  htmlparser \
-                  necko \
-                  pref \
-                  view \
-                  lwbrk \
-                  gfx \
-                  widget \
-                  webbrwsr \
-            		  unicharutil \
-                  $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  locale \
+		  layout \
+		  content \
+		  txmgr \
+		  htmlparser \
+		  necko \
+		  pref \
+		  view \
+		  lwbrk \
+		  gfx \
+		  widget \
+		  unicharutil \
+		  $(NULL)

 CPPSRCS		=                           \
 		nsPlaintextDataTransfer.cpp \
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  content \
 		  dom \
 		  widget \
-      webbrwsr \
 		  unicharutil \
 		  $(NULL)

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

 REQUIRES	= xpcom \
 		  string \
-		  widget \
 		  view \
-		  dom \
 		  uriloader \
-		  gfx \
 		  intl \
 		  embedcomponents \
-		  timer \
 		  $(NULL)

 EXPORTS         = \
--- a/embedding/browser/activex/src/control/Makefile.in
+++ b/embedding/browser/activex/src/control/Makefile.in
@ -31,30 +31,28 @@ EXPORT_LIBRARY	= 1
 FORCE_SHARED_LIB= 1


-REQUIRES = \
-	xpcom \
-	string \
-	js \
-	widget \
-	gfx \
-	view \
-	cookie \
-	necko \
-	pref \
-	webbrwsr \
-	docshell \
-	dom \
-	uriloader \
-	layout \
-	content \
-	editor \
-	webshell \
-	profile \
-	embed_base \
-	necko \
-	windowwatcher \
-        webbrowserpersist \
-	$(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  widget \
+		  gfx \
+		  view \
+		  necko \
+		  pref \
+		  webbrwsr \
+		  docshell \
+		  dom \
+		  uriloader \
+		  layout \
+		  content \
+		  editor \
+		  webshell \
+		  profile \
+		  embed_base \
+		  necko \
+		  windowwatcher \
+		  webbrowserpersist \
+		  $(NULL)

 CPPSRCS =                              \
    StdAfx.cpp             \
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@ -39,7 +39,6 @@ REQUIRES	= js \
 		  xpcom \
 		  string \
 		  windowwatcher \
-		  printingui \
 		  webbrwsr \
 		  gfx \
 		  webbrowserpersist \
--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@ -29,11 +29,9 @@ REQUIRES	= string \
 		  xpcom \
 		  dom \
 		  widget \
-		  docshell \
 		  layout \
 		  content \
 		  xuldoc \
-		  commandhandler \
 		  $(NULL)

 LIBRARY_NAME	= commandhandler_s
--- a/embedding/components/printingui/src/win/Makefile.in
+++ b/embedding/components/printingui/src/win/Makefile.in
@ -32,17 +32,12 @@ REQUIRES	= xpcom \
 		  windowwatcher \
 		  widget \
 		  gfx \
-		  js \
 		  xpconnect \
-		  caps \
 		  content \
-		  necko \
 		  uriloader \
 		  docshell \
 		  webbrwsr \
-		  embed_base \
 		  intl \
-		  windowwatcher \
 		  pref \
 		  $(NULL)

--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  docshell \
 		  dom \
 		  widget \
-		  layout \
 		  uriloader \
 		  shistory \
 		  webbrowserpersist \
--- a/extensions/cookie/tests/Makefile.in
+++ b/extensions/cookie/tests/Makefile.in
@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk

 REQUIRES	= xpcom \
 		  string \
-		  cookie \
 		  necko \
 		  intl \
 		  $(NULL)
--- a/extensions/transformiix/build/Makefile.in
+++ b/extensions/transformiix/build/Makefile.in
@ -35,19 +35,14 @@ endif
 REQUIRES	= xpcom \
 		  string \
 		  dom \
-		  layout \
 		  content \
 		  content_xsl \
 		  widget \
 		  necko \
 		  js \
-		  appshell \
 		  xpconnect \
-		  caps \
 		  locale \
-		  unicharutil \
 		  htmlparser \
-		  webshell \
 		  docshell \
 		  $(NULL)
 IS_COMPONENT	= 1
--- a/extensions/wallet/src/Makefile.in
+++ b/extensions/wallet/src/Makefile.in
@ -43,7 +43,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  webshell \
 		  docshell \
-		  appshell \
 		  intl \
 		  unicharutil \
 		  windowwatcher \
--- a/extensions/wallet/src/singsign.cpp
+++ b/extensions/wallet/src/singsign.cpp
@ -378,9 +378,6 @@ si_3ButtonConfirm(PRUnichar * szMessage, nsIDOMWindowInternal* window) {
  return Wallet_3ButtonConfirm(szMessage, window);
 }

-// This will go away once select is passed a prompter interface
-#include "nsAppShellCIDs.h" // TODO remove later
-
 PRIVATE PRBool
 si_SelectDialog(const PRUnichar* szMessage, nsIPrompt* dialog, PRUnichar** pList, PRInt32* pCount) {
  if (si_UserHasBeenSelected) {
--- a/extensions/webservices/schema/src/Makefile.in
+++ b/extensions/webservices/schema/src/Makefile.in
@ -29,17 +29,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextrasschema_s

-REQUIRES = xpcom \
-	   string \
-	   dom \
-	   xpconnect \
-	   caps \
-	   layout \
-	   widget \
-	   content \
-	   js \
-	   necko \
-	   $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  xpconnect \
+		  caps \
+		  widget \
+		  content \
+		  js \
+		  necko \
+		  $(NULL)

 CPPSRCS	= 				\
 		nsSchema.cpp				\
--- a/extensions/webservices/soap/src/Makefile.in
+++ b/extensions/webservices/soap/src/Makefile.in
@ -44,7 +44,14 @@ include $(DEPTH)/config/autoconf.mk

 MODULE                = xmlextras
 LIBRARY_NAME        = xmlextrassoap_s
-REQUIRES        = xpcom string caps dom js widget xpconnect necko schema
+REQUIRES	= xpcom \
+		  string \
+		  caps \
+		  dom \
+		  js \
+		  xpconnect \
+		  necko \
+		  $(NULL)

 CPPSRCS        =                                 \
                nsDefaultSOAPEncoder.cpp\
--- a/extensions/xmlextras/schema/src/Makefile.in
+++ b/extensions/xmlextras/schema/src/Makefile.in
@ -29,17 +29,16 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextrasschema_s

-REQUIRES = xpcom \
-	   string \
-	   dom \
-	   xpconnect \
-	   caps \
-	   layout \
-	   widget \
-	   content \
-	   js \
-	   necko \
-	   $(NULL)
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  xpconnect \
+		  caps \
+		  widget \
+		  content \
+		  js \
+		  necko \
+		  $(NULL)

 CPPSRCS	= 				\
 		nsSchema.cpp				\
--- a/extensions/xmlextras/soap/src/Makefile.in
+++ b/extensions/xmlextras/soap/src/Makefile.in
@ -44,7 +44,14 @@ include $(DEPTH)/config/autoconf.mk

 MODULE                = xmlextras
 LIBRARY_NAME        = xmlextrassoap_s
-REQUIRES        = xpcom string caps dom js widget xpconnect necko schema
+REQUIRES	= xpcom \
+		  string \
+		  caps \
+		  dom \
+		  js \
+		  xpconnect \
+		  necko \
+		  $(NULL)

 CPPSRCS        =                                 \
                nsDefaultSOAPEncoder.cpp\
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -30,19 +30,18 @@ MODULE      = gfx
 EXPORTS         = nsFontList.h
 LIBRARY_NAME    = gkgfx
 EXPORT_LIBRARY = 1
-REQUIRES    = xpcom \
-			windowwatcher \
-			dom \
-          string \
-          widget \
-          locale \
-          view \
-          pref \
-          gfx2 \
-          imglib2 \
-          uconv \
-          unicharutil \
-          $(NULL)
+REQUIRES	= xpcom \
+		  windowwatcher \
+		  dom \
+		  string \
+		  widget \
+		  locale \
+		  view \
+		  pref \
+		  gfx2 \
+		  imglib2 \
+		  unicharutil \
+		  $(NULL)

 DIRS        =

@ -107,6 +106,7 @@ CPPSRCS += nsTransform2D.cpp
 endif

 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
+REQUIRES += uconv
 CPPSRCS += nsCompressedCharMap.cpp
 endif

--- a/gfx2/src/Makefile.in
+++ b/gfx2/src/Makefile.in
@ -38,7 +38,6 @@ EXTRA_DSO_LIBS	= gkgfx
 endif

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

--- 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 \
-		  htmlparser \
 		  webshell \
 		  $(NULL)

--- a/htmlparser/tests/outsinks/Makefile.in
+++ b/htmlparser/tests/outsinks/Makefile.in
@ -33,7 +33,6 @@ REQUIRES	= xpcom \
 		  necko \
 		  layout \
 		  content \
-		  dom \
 		  $(NULL)

 CPPSRCS		= \
--- a/intl/chardet/tests/Makefile.in
+++ b/intl/chardet/tests/Makefile.in
@ -26,11 +26,9 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 PROGRAM		= DetectCharset$(BIN_SUFFIX)

--- a/js/src/liveconnect/Makefile.in
+++ b/js/src/liveconnect/Makefile.in
@ -46,7 +46,6 @@ LIBRARY_NAME	= jsj$(MOZ_BITS)$(VERSION_NUMBER)
 MAPFILE		= $(LIBRARY_NAME).map
 endif
 REQUIRES	= js \
-		  string \
 		  xpcom \
 		  xpconnect \
 		  $(NULL)
--- a/js/src/xpconnect/tests/components/Makefile.in
+++ b/js/src/xpconnect/tests/components/Makefile.in
@ -49,7 +49,6 @@ REQUIRES	= xpconnect \
 		  string \
 		  js \
 		  xpconnect_tests \
-		  timer \
 		  $(NULL)

 CPPSRCS		= \
--- a/layout/base/src/Makefile.in
+++ b/layout/base/src/Makefile.in
@ -30,7 +30,7 @@ MODULE		= layout
 LIBRARY_NAME	= gkbase_s
 REQUIRES	= xpcom \
 		  string \
-      dom \
+		  dom \
 		  content \
 		  gfx \
 		  widget \
@ -42,11 +42,9 @@ REQUIRES	= xpcom \
 		  uconv \
 		  pref \
 		  uriloader \
-		  unicharutil \
 		  docshell \
 		  imglib2 \
 		  gfx2 \
-      webbrwsr \
 		  $(NULL)

 CPPSRCS		= \
--- a/layout/html/base/src/Makefile.in
+++ b/layout/html/base/src/Makefile.in
@ -35,7 +35,6 @@ REQUIRES	= xpcom \
 		  content \
 		  gfx \
 		  widget \
-      layout_xul \
 		  locale \
 		  view \
 		  necko \
--- a/layout/html/document/src/Makefile.in
+++ b/layout/html/document/src/Makefile.in
@ -43,11 +43,9 @@ REQUIRES	= xpcom \
 		  caps \
 		  pref \
 		  uriloader \
-		  shistory \
 		  xpconnect \
 		  accessibility \
 		  webbrwsr \
-		  webBrowser_core \
 		  $(NULL)

 CPPSRCS		= \
--- a/layout/html/forms/src/Makefile.in
+++ b/layout/html/forms/src/Makefile.in
@ -51,8 +51,6 @@ REQUIRES	= xpcom \
 		  accessibility \
 		  xpconnect \
 		  unicharutil \
-		  pref \
-      webbrwsr \
 		  $(NULL)

 CPPSRCS		= \
--- a/layout/html/style/src/Makefile.in
+++ b/layout/html/style/src/Makefile.in
@ -44,7 +44,6 @@ REQUIRES	= xpcom \
 		  xuldoc \
 		  imglib2 \
 		  gfx2 \
-      webbrwsr \
 		  $(NULL)

 CPPSRCS		= \
--- a/layout/html/table/src/Makefile.in
+++ b/layout/html/table/src/Makefile.in
@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  view \
 		  accessibility \
 		  necko \
-		  webbrwsr \
 		  $(NULL)

 CPPSRCS		= \
--- a/layout/mathml/base/src/Makefile.in
+++ b/layout/mathml/base/src/Makefile.in
@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  intl \
 		  unicharutil \
-		  view \
 		  necko \
 		  docshell \
 		  webbrwsr \
--- a/layout/mathml/content/src/Makefile.in
+++ b/layout/mathml/content/src/Makefile.in
@ -33,7 +33,6 @@ LIBRARY_NAME = gkmathmlcon_s
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  content \
 		  gfx \
 		  $(NULL)

--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -49,7 +49,6 @@ REQUIRES	= xpcom \
 		  gfx2 \
 		  imglib2 \
 		  unicharutil \
-		  webbrwsr \
 		  xpconnect \
 		  js \
 		  $(NULL)
--- a/layout/xul/base/src/grid/Makefile.in
+++ b/layout/xul/base/src/grid/Makefile.in
@ -36,7 +36,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  view \
 		  necko \
-      webbrwsr \
 		  $(NULL)

 CPPSRCS	= \
--- a/layout/xul/base/src/tree/src/Makefile.in
+++ b/layout/xul/base/src/tree/src/Makefile.in
@ -41,7 +41,6 @@ REQUIRES	= xpcom \
 		  necko \
 		  gfx2 \
 		  imglib2 \
-		  webbrwsr \
 		  xpconnect \
 		  js \
 		  $(NULL)
--- a/mailnews/absync/src/Makefile.in
+++ b/mailnews/absync/src/Makefile.in
@ -34,7 +34,6 @@ REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  mime \
-		  cookie \
 		  docshell \
 		  uriloader \
 		  pref \
--- a/mailnews/addrbook/build/Makefile.in
+++ b/mailnews/addrbook/build/Makefile.in
@ -35,7 +35,6 @@ MODULE_NAME	= nsAbModule
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  msgcompose \
 		  mime \
 		  rdf \
 		  msgbase \
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@ -44,12 +44,10 @@ REQUIRES	= xpcom \
 		  necko \
 		  locale \
 		  unicharutil \
-		  webshell \
 		  uconv \
 		  msgbase \
 		  msgbaseutil \
 		  mime \
-		  msgcompose \
 		  appcomps \
 		  intl \
 		  import \
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@ -46,7 +46,6 @@ REQUIRES	= xpcom \
 		  docshell \
 		  widget \
 		  layout \
-		  webshell \
 		  mime \
 		  uriloader \
 		  mailnews \
--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@ -47,7 +47,6 @@ REQUIRES	= xpcom \
 		  msgcompose \
 		  docshell \
 		  webshell \
-		  wallet \
 		  uriloader \
 		  appshell \
 		  msgimap \
--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@ -50,7 +50,6 @@ REQUIRES	= xpcom \
 		  appshell \
 		  msgimap \
 		  msgnews \
-		  uconv \
 		  docshell \
 		  webshell \
 		  addrbook \
@ -59,11 +58,9 @@ REQUIRES	= xpcom \
 		  txmgr \
 		  exthandler \
 		  mork \
-		  wallet \
 		  nkcache \
 		  mimetype \
 		  windowwatcher \
-      webbrwsr \
 		  $(NULL)

 CPPSRCS		= \
--- a/mailnews/extensions/mdn/build/Makefile.in
+++ b/mailnews/extensions/mdn/build/Makefile.in
@ -39,10 +39,8 @@ REQUIRES	= xpcom \
 		  mime \
 		  msgbase \
 		  msgbaseutil \
-		  msgcompose \
 		  msgdb \
 		  necko \
-		  intl \
 		  $(NULL)

 ifeq ($(USE_SHORT_LIBNAME),1)
--- a/mailnews/extensions/mdn/src/Makefile.in
+++ b/mailnews/extensions/mdn/src/Makefile.in
@ -31,7 +31,6 @@ LIBRARY_NAME	= msgmdn_s
 META_COMPONENT = mail
 REQUIRES	= xpcom \
 		  string \
-		  editor \
 		  dom \
 		  msgbase \
 		  mailnews \
@ -39,11 +38,9 @@ REQUIRES	= xpcom \
 		  mime \
 		  pref \
 		  intl \
-		  locale \
 		  msgbaseutil \
 		  msgdb \
 		  msgimap \
-		  msgnews \
 		  mimetype \
 		  msgcompose \
 		  $(NULL)
--- a/mailnews/import/comm4x/src/Makefile.in
+++ b/mailnews/import/comm4x/src/Makefile.in
@ -62,12 +62,10 @@ REQUIRES	= xpcom \
 		  import \
 		  necko \
 		  msgbase \
-		  mailnews \
 		  msgbaseutil \
 		  profile \
 		  prefmigr \
 		  unicharutil \
-		  uconv \
 		  $(NULL)

 CPPSRCS		= 	nsComm4xMailFactory.cpp 	\
--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@ -51,7 +51,6 @@ REQUIRES	= xpcom \
 		  msglocal \
 		  mimetype \
 		  unicharutil \
-			mime \
 		  pref \
 		  $(NULL)

--- a/mailnews/import/oexpress/Makefile.in
+++ b/mailnews/import/oexpress/Makefile.in
@ -46,7 +46,6 @@ REQUIRES	= xpcom \
 		  msgbaseutil \
 		  msgcompose \
 		  msglocal \
-			mime \
 		  $(NULL)

 CPPSRCS		= \
--- a/mailnews/import/outlook/src/Makefile.in
+++ b/mailnews/import/outlook/src/Makefile.in
@ -55,7 +55,6 @@ REQUIRES	= xpcom \
 		  msgdb \
 		  msglocal \
 		  mimetype \
-			mime \
 		  unicharutil \
 		  pref \
 		  $(NULL)
--- a/mailnews/import/src/Makefile.in
+++ b/mailnews/import/src/Makefile.in
@ -45,7 +45,6 @@ REQUIRES	= xpcom \
 		  rdf \
 		  msgdb \
 		  unicharutil \
-			mime \
 		  $(NULL)

 ifeq ($(USE_SHORT_LIBNAME),1)
--- a/mailnews/local/src/Makefile.in
+++ b/mailnews/local/src/Makefile.in
@ -45,7 +45,6 @@ REQUIRES	= xpcom \
 		  txmgr \
 		  docshell \
 		  msgimap \
-		  chrome \
 		  nkcache \
 		  $(NULL)

--- a/mailnews/mime/cthandlers/smimestub/Makefile.in
+++ b/mailnews/mime/cthandlers/smimestub/Makefile.in
@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  necko \
 		  uconv \
-		  intl \
 		  $(NULL)

 ifeq ($(OS_ARCH),WINNT)
--- a/mailnews/mime/emitters/src/Makefile.in
+++ b/mailnews/mime/emitters/src/Makefile.in
@ -40,7 +40,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  mailnews \
 		  msgdb \
-		  addrbook \
 		  mimetype \
 		  msgnews \
 		  unicharutil \
--- a/mailnews/news/src/Makefile.in
+++ b/mailnews/news/src/Makefile.in
@ -48,7 +48,6 @@ REQUIRES	= xpcom \
 		  mime \
 		  intl \
 		  webshell \
-		  wallet \
 		  rdfutil \
 		  nkcache \
 		  windowwatcher \
--- a/modules/libpr0n/decoders/mng/Makefile.in
+++ b/modules/libpr0n/decoders/mng/Makefile.in
@ -32,8 +32,7 @@ MODULE_NAME	= nsMNGDecoderModule

 EXTRA_DSO_LIBS	= gkgfx

-REQUIRES	= string \
-		  xpcom \
+REQUIRES	= xpcom \
 		  gfx \
 		  gfx2 \
 		  imglib2 \
--- a/modules/libpr0n/src/Makefile.in
+++ b/modules/libpr0n/src/Makefile.in
@ -42,7 +42,6 @@ REQUIRES	= xpcom \
 		  nkcache \
 		  gfx \
 		  gfx2 \
-		  mimetype \
 		  $(NULL)

 CPPSRCS		= \
--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@ -46,10 +46,8 @@ REQUIRES	= xpcom \
 		  unicharutil \
 		  dom \
 		  gfx \
-		  layout \
 		  content \
 		  widget \
-		  cookie \
 		  mimetype \
 		  oji \
 		  exthandler \
--- a/modules/plugin/samples/default/windows/Makefile.in
+++ b/modules/plugin/samples/default/windows/Makefile.in
@ -31,10 +31,9 @@ LIBRARY_NAME	= npnul32
 RESFILE		= npnul32.res
 DEFFILE		= $(srcdir)/npnul32.def
 REQUIRES	= java \
-                  plugin \
-                  xpcom \
-                  pref \
-                  $(NULL)
+		  xpcom \
+		  pref \
+		  $(NULL)

 CPPSRCS		= \
 		maindll.cpp \
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@ -31,7 +31,6 @@ REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  nkcache \
-		  cookie \
 		  dbm \
 		  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 \
-		  htmlparser \
 		  webshell \
 		  $(NULL)

--- a/parser/htmlparser/tests/outsinks/Makefile.in
+++ b/parser/htmlparser/tests/outsinks/Makefile.in
@ -33,7 +33,6 @@ REQUIRES	= xpcom \
 		  necko \
 		  layout \
 		  content \
-		  dom \
 		  $(NULL)

 CPPSRCS		= \
--- a/profile/src/Makefile.in
+++ b/profile/src/Makefile.in
@ -40,13 +40,11 @@ REQUIRES	= xpcom \
 		  widget \
 		  necko \
 		  uriloader \
-		  cookie \
 		  intl \
 		  pref \
 		  prefmigr \
 		  appshell \
 		  uconv \
-		  appcomps \
 		  windowwatcher \
 		  $(NULL)

--- a/rdf/base/src/Makefile.in
+++ b/rdf/base/src/Makefile.in
@ -30,7 +30,6 @@ MODULE		= rdf
 LIBRARY_NAME	= rdfbase_s
 REQUIRES	= xpcom \
 		  string \
-		  rdf \
 		  rdfutil \
 		  necko \
 		  layout \
--- a/rdf/chrome/build/Makefile.in
+++ b/rdf/chrome/build/Makefile.in
@ -35,7 +35,6 @@ MODULE_NAME	= nsChromeModule
 REQUIRES	= xpcom \
 		  string \
 		  rdf \
-		  gfx \
 		  necko \
 		  content \
 		  $(NULL)
--- a/rdf/chrome/src/Makefile.in
+++ b/rdf/chrome/src/Makefile.in
@ -41,7 +41,6 @@ REQUIRES	= xpcom \
 		  widget \
 		  js \
 		  appshell \
-		  chrome \
 		  caps \
 		  pref \
 		  docshell \
--- a/rdf/chrome/tools/chromereg/Makefile.in
+++ b/rdf/chrome/tools/chromereg/Makefile.in
@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 REQUIRES	= xpcom \
 		  chrome \
 		  necko \
-		  string \
 		  $(NULL)

 CPPSRCS		= regchrome.cpp
--- a/rdf/tests/rdfcat/Makefile.in
+++ b/rdf/tests/rdfcat/Makefile.in
@ -29,14 +29,8 @@ include $(DEPTH)/config/autoconf.mk
 PROGRAM		= rdfcat$(BIN_SUFFIX)
 CPPSRCS		= rdfcat.cpp
 REQUIRES	= xpcom \
-		  string \
 		  rdf \
 		  necko \
-		  widget \
-		  view \
-		  dom \
-		  uriloader \
-		  gfx \
 		  $(NULL)

 LIBS		= \
--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@ -32,9 +32,6 @@ REQUIRES	= xpcom \
 		  string \
 		  rdf \
 		  necko \
-		  layout \
-		  dom \
-		  htmlparser \
 		  $(NULL)

 LIBS		= \
--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@ -63,16 +63,13 @@ REQUIRES	= nspr \
 		  necko \
 		  necko2 \
 		  uriloader \
-		  caps \
 		  dom \
 		  intl \
-		  profile \
 		  js \
 		  docshell \
 		  widget \
 		  layout \
 		  content \
-		  xpconnect \
 		  unicharutil \
 		  pipnss \
 		  $(NULL)
--- a/tools/trace-malloc/Makefile.in
+++ b/tools/trace-malloc/Makefile.in
@ -26,7 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 SIMPLECSRCS	+= \
 		bloatblame.c \
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@ -50,7 +50,6 @@ REQUIRES	= xpcom \
 		  intl \
 		  unicharutil \
 		  editor \
-		  cookie \
 		  windowwatcher \
 		  xpconnect \
 		  js \