Bug 73353: splitting the modules on the REQUIRES lines in Makefile.in across multiple lines to more clearly show the changes made. sr=alecf

accessible/build/Makefile.in

@@ -32,7 +32,10 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= access
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAccessibilityModule
-REQUIRES	= xpcom string dom
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  $(NULL)
 
 CPPSRCS		= nsAccessibilityFactory.cpp
 

accessible/src/Makefile.in

@@ -28,7 +28,24 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE    = accessibility
 LIBRARY_NAME  = accessibility_s
-REQUIRES  = xpcom string gfx layout content widget dom view locale intl docshell webshell necko htmlparser xuldoc imglib2 gfx2
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  dom \
+		  view \
+		  locale \
+		  intl \
+		  docshell \
+		  webshell \
+		  necko \
+		  htmlparser \
+		  xuldoc \
+		  imglib2 \
+		  gfx2 \
+		  $(NULL)
 
 CPPSRCS   = \
     nsAccessible.cpp \

caps/src/Makefile.in

@@ -32,7 +32,20 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsSecurityManagerModule
 
-REQUIRES	= xpcom string pref js dom xpconnect necko jar widget plugin intl docshell windowwatcher
+REQUIRES	= xpcom \
+		  string \
+		  pref \
+		  js \
+		  dom \
+		  xpconnect \
+		  necko \
+		  jar \
+		  widget \
+		  plugin \
+		  intl \
+		  docshell \
+		  windowwatcher \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsBasePrincipal.cpp \

content/base/src/Makefile.in

@@ -28,7 +28,30 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconbase_s
-REQUIRES	= xpcom string dom gfx layout widget view locale timer htmlparser js webshell necko caps lwbrk uconv chrome docshell pref xpconnect util unicharutil xsl_doc
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  gfx \
+		  layout \
+		  widget \
+		  view \
+		  locale \
+		  timer \
+		  htmlparser \
+		  js \
+		  webshell \
+		  necko \
+		  caps \
+		  lwbrk \
+		  uconv \
+		  chrome \
+		  docshell \
+		  pref \
+		  xpconnect \
+		  util \
+		  unicharutil \
+		  xsl_doc \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsCommentNode.cpp \

content/build/Makefile.in

@@ -35,7 +35,28 @@ SHORT_LIBNAME	= gkcontnt
 IS_COMPONENT	= 1
 MODULE_NAME	= nsContentModule
 EXTRA_DSO_LIBS	= gkgfx
-REQUIRES	= xpcom string gfx layout widget necko rdf docshell dom htmlparser uriloader webshell locale unicharutil lwbrk js pref xul xuldoc xultmpl timer
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  layout \
+		  widget \
+		  necko \
+		  rdf \
+		  docshell \
+		  dom \
+		  htmlparser \
+		  uriloader \
+		  webshell \
+		  locale \
+		  unicharutil \
+		  lwbrk \
+		  js \
+		  pref \
+		  xul \
+		  xuldoc \
+		  xultmpl \
+		  timer \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsContentDLF.cpp \

content/events/src/Makefile.in

@@ -28,7 +28,23 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconevents_s
-REQUIRES	= xpcom string dom js locale gfx layout widget timer caps xpconnect docshell webshell pref htmlparser view
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  js \
+		  locale \
+		  gfx \
+		  layout \
+		  widget \
+		  timer \
+		  caps \
+		  xpconnect \
+		  docshell \
+		  webshell \
+		  pref \
+		  htmlparser \
+		  view \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsEventListenerManager.cpp \

content/html/content/src/Makefile.in

@@ -28,7 +28,28 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconhtmlcon_s
-REQUIRES	= xpcom string gfx layout widget dom js locale webshell htmlparser necko view pref docshell xpconnect xuldoc caps editor uconv gfx2 imglib2
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  layout \
+		  widget \
+		  dom \
+		  js \
+		  locale \
+		  webshell \
+		  htmlparser \
+		  necko \
+		  view \
+		  pref \
+		  docshell \
+		  xpconnect \
+		  xuldoc \
+		  caps \
+		  editor \
+		  uconv \
+		  gfx2 \
+		  imglib2 \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsAttributeContent.cpp \

content/html/document/src/Makefile.in

@@ -28,7 +28,37 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconhtmldoc_s
-REQUIRES	= xpcom string gfx layout widget dom necko htmlparser locale view js intl webshell docshell cookie caps util timer uconv pref uriloader rdf chardet nkcache appcomps lwbrk gfx2 imglib2 xpconnect unicharutil
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  layout \
+		  widget \
+		  dom \
+		  necko \
+		  htmlparser \
+		  locale \
+		  view \
+		  js \
+		  intl \
+		  webshell \
+		  docshell \
+		  cookie \
+		  caps \
+		  util \
+		  timer \
+		  uconv \
+		  pref \
+		  uriloader \
+		  rdf \
+		  chardet \
+		  nkcache \
+		  appcomps \
+		  lwbrk \
+		  gfx2 \
+		  imglib2 \
+		  xpconnect \
+		  unicharutil \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsHTMLContentSink.cpp \

content/html/style/src/Makefile.in

@@ -28,7 +28,25 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconhtmlstyle_s
-REQUIRES	= xpcom string dom gfx layout widget caps locale js necko webshell xul htmlparser docshell uconv xuldoc xpconnect pref
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  gfx \
+		  layout \
+		  widget \
+		  caps \
+		  locale \
+		  js \
+		  necko \
+		  webshell \
+		  xul \
+		  htmlparser \
+		  docshell \
+		  uconv \
+		  xuldoc \
+		  xpconnect \
+		  pref \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsCSSDeclaration.cpp \

content/shared/src/Makefile.in

@@ -28,7 +28,19 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconshared_s
-REQUIRES	= xpcom string gfx layout widget locale dom webshell pref necko htmlparser unicharutil
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  layout \
+		  widget \
+		  locale \
+		  dom \
+		  webshell \
+		  pref \
+		  necko \
+		  htmlparser \
+		  unicharutil \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsCSSAtoms.cpp \

content/xbl/src/Makefile.in

@@ -28,7 +28,26 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconxbl_s
-REQUIRES	= xpcom string js dom gfx layout widget caps htmlparser necko xpconnect pref docshell chrome lwbrk xul xuldoc gfx2 imglib2
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  dom \
+		  gfx \
+		  layout \
+		  widget \
+		  caps \
+		  htmlparser \
+		  necko \
+		  xpconnect \
+		  pref \
+		  docshell \
+		  chrome \
+		  lwbrk \
+		  xul \
+		  xuldoc \
+		  gfx2 \
+		  imglib2 \
+		  $(NULL)
 
 CPPSRCS		= \
     nsXBLBinding.cpp \

content/xml/content/src/Makefile.in

@@ -28,7 +28,20 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconxmlcon_s
-REQUIRES	= xpcom string js dom gfx layout widget necko caps webshell docshell htmlparser xpconnect
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  dom \
+		  gfx \
+		  layout \
+		  widget \
+		  necko \
+		  caps \
+		  webshell \
+		  docshell \
+		  htmlparser \
+		  xpconnect \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsXMLElement.cpp \

content/xml/document/src/Makefile.in

@@ -28,7 +28,28 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconxmldoc_s
-REQUIRES	= xpcom string js dom gfx layout widget caps htmlparser necko view docshell webshell uriloader pref xpconnect uconv chardet lwbrk exthandler mimetype
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  dom \
+		  gfx \
+		  layout \
+		  widget \
+		  caps \
+		  htmlparser \
+		  necko \
+		  view \
+		  docshell \
+		  webshell \
+		  uriloader \
+		  pref \
+		  xpconnect \
+		  uconv \
+		  chardet \
+		  lwbrk \
+		  exthandler \
+		  mimetype \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsXMLContentSink.cpp \

content/xsl/document/src/Makefile.in

@@ -24,7 +24,17 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = xsl_doc
 LIBRARY_NAME = gkconxsldoc_s
-REQUIRES = xpcom string htmlparser view widget dom necko gfx layout content
+REQUIRES	= xpcom \
+		  string \
+		  htmlparser \
+		  view \
+		  widget \
+		  dom \
+		  necko \
+		  gfx \
+		  layout \
+		  content \
+		  $(NULL)
 
 include $(topsrcdir)/config/config.mk
 

content/xul/content/src/Makefile.in

@@ -28,7 +28,27 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xul
 LIBRARY_NAME	= gkconxulcon_s
-REQUIRES	= xpcom string gfx layout content widget htmlparser necko dom js caps rdf xpconnect locale timer lwbrk pref xuldoc xultmpl webshell
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  htmlparser \
+		  necko \
+		  dom \
+		  js \
+		  caps \
+		  rdf \
+		  xpconnect \
+		  locale \
+		  timer \
+		  lwbrk \
+		  pref \
+		  xuldoc \
+		  xultmpl \
+		  webshell \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsRDFDOMNodeList.cpp \

content/xul/document/src/Makefile.in

@@ -28,7 +28,32 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xuldoc
 LIBRARY_NAME	= gkconxuldoc_s
-REQUIRES	= xpcom string exthandler mimetype gfx layout content widget dom rdf js xpconnect caps locale view necko uriloader htmlparser lwbrk timer chrome docshell pref xul xultmpl
+REQUIRES	= xpcom \
+		  string \
+		  exthandler \
+		  mimetype \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  dom \
+		  rdf \
+		  js \
+		  xpconnect \
+		  caps \
+		  locale \
+		  view \
+		  necko \
+		  uriloader \
+		  htmlparser \
+		  lwbrk \
+		  timer \
+		  chrome \
+		  docshell \
+		  pref \
+		  xul \
+		  xultmpl \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsControllerCommandManager.cpp \

content/xul/templates/src/Makefile.in

@@ -28,7 +28,23 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xultmpl
 LIBRARY_NAME	= gkconxultmpl_s
-REQUIRES	= xpcom string js xpconnect timer caps gfx layout content widget dom rdf necko locale xul xuldoc
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  xpconnect \
+		  timer \
+		  caps \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  dom \
+		  rdf \
+		  necko \
+		  locale \
+		  xul \
+		  xuldoc \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsClusterKey.cpp \

db/mork/build/Makefile.in

@@ -31,7 +31,8 @@ LIBRARY_NAME	= mork
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMorkModule
-REQUIRES	= xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 
 CPPSRCS		= nsMorkFactory.cpp
 

db/mork/src/Makefile.in

@@ -28,7 +28,8 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mork
 LIBRARY_NAME	= msgmork_s
-REQUIRES	= xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 FORCE_STATIC_LIB=1
 
 CPPSRCS		= \

directory/xpcom/base/src/Makefile.in

@@ -44,7 +44,10 @@ SHORT_LIBNAME	= mozldap
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLDAPProtocolModule
-REQUIRES	= xpcom string necko
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  $(NULL)
 
 
 CPPSRCS		= \

docshell/base/Makefile.in

@@ -25,7 +25,36 @@ VPATH		= @srcdir@
 
 MODULE		= docshell
 LIBRARY_NAME	= basedocshell_s
-REQUIRES	= xpcom string caps necko gfx layout content dom js uriloader exthandler htmlparser view pref locale webbrwsr xpconnect timer widget shistory intl plugin webshell chardet uconv appcomps xuldoc find nkcache
+REQUIRES	= xpcom \
+		  string \
+		  caps \
+		  necko \
+		  gfx \
+		  layout \
+		  content \
+		  dom \
+		  js \
+		  uriloader \
+		  exthandler \
+		  htmlparser \
+		  view \
+		  pref \
+		  locale \
+		  webbrwsr \
+		  xpconnect \
+		  timer \
+		  widget \
+		  shistory \
+		  intl \
+		  plugin \
+		  webshell \
+		  chardet \
+		  uconv \
+		  appcomps \
+		  xuldoc \
+		  find \
+		  nkcache \
+		  $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 

docshell/build/Makefile.in

@@ -31,7 +31,25 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= docshell
 EXPORT_LIBRARY = 1
-REQUIRES	= xpcom string dom shistory necko gfx layout uriloader timer webshell widget pref view intl htmlparser chardet appcomps find
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  shistory \
+		  necko \
+		  gfx \
+		  layout \
+		  uriloader \
+		  timer \
+		  webshell \
+		  widget \
+		  pref \
+		  view \
+		  intl \
+		  htmlparser \
+		  chardet \
+		  appcomps \
+		  find \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsDocShellModule.cpp		\

dom/src/base/Makefile.in

@@ -28,7 +28,38 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 LIBRARY_NAME	= jsdombase_s
-REQUIRES	= xpcom string webbrwsr js widget gfx layout content caps docshell xpconnect pref oji necko java locale uriloader sidebar xuldoc timer webshell view uconv shistory plugin windowwatcher htmlparser chardet transformiix xmlextras xsl_doc
+REQUIRES	= xpcom \
+		  string \
+		  webbrwsr \
+		  js \
+		  widget \
+		  gfx \
+		  layout \
+		  content \
+		  caps \
+		  docshell \
+		  xpconnect \
+		  pref \
+		  oji \
+		  necko \
+		  java \
+		  locale \
+		  uriloader \
+		  sidebar \
+		  xuldoc \
+		  timer \
+		  webshell \
+		  view \
+		  uconv \
+		  shistory \
+		  plugin \
+		  windowwatcher \
+		  htmlparser \
+		  chardet \
+		  transformiix \
+		  xmlextras \
+		  xsl_doc \
+		  $(NULL)
 
 CPPSRCS =			\
 	nsBarProps.cpp          \

dom/src/build/Makefile.in

@@ -29,7 +29,23 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= dom
 LIBRARY_NAME	= jsdom
 EXPORT_LIBRARY = 1
-REQUIRES	= xpcom string js xpconnect widget gfx layout content caps timer webbrwsr xuldoc docshell sidebar plugin necko
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  xpconnect \
+		  widget \
+		  gfx \
+		  layout \
+		  content \
+		  caps \
+		  timer \
+		  webbrwsr \
+		  xuldoc \
+		  docshell \
+		  sidebar \
+		  plugin \
+		  necko \
+		  $(NULL)
 IS_COMPONENT    = 1
 MODULE_NAME	= DOM_components
 

dom/src/events/Makefile.in

@@ -28,7 +28,12 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 LIBRARY_NAME	= jsdomevents_s
-REQUIRES	= xpcom string js caps xpconnect
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  caps \
+		  xpconnect \
+		  $(NULL)
 
 CPPSRCS =				\
 	nsJSEventListener.cpp		\

dom/src/jsurl/Makefile.in

@@ -31,7 +31,18 @@ LIBRARY_NAME	= jsurl
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= javascript__protocol
-REQUIRES	= xpcom string js dom necko caps widget appshell rdf xpconnect jsconsole
+REQUIRES	= xpcom \
+		  string \
+		  js \
+		  dom \
+		  necko \
+		  caps \
+		  widget \
+		  appshell \
+		  rdf \
+		  xpconnect \
+		  jsconsole \
+		  $(NULL)
 
 XPIDLSRCS	= \
 		nsIEvaluateStringProxy.idl \

editor/base/Makefile.in

@@ -31,7 +31,35 @@ LIBRARY_NAME	= editor
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsEditorModule
-REQUIRES	= xpcom string dom locale gfx layout content uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome appcomps xuldoc windowwatcher exthandler mimetype
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  locale \
+		  gfx \
+		  layout \
+		  content \
+		  uriloader \
+		  widget \
+		  txmgr \
+		  htmlparser \
+		  necko \
+		  pref \
+		  view \
+		  appshell \
+		  rdf \
+		  webshell \
+		  timer \
+		  txtsvc \
+		  intl \
+		  lwbrk \
+		  docshell \
+		  chrome \
+		  appcomps \
+		  xuldoc \
+		  windowwatcher \
+		  exthandler \
+		  mimetype \
+		  $(NULL)
 
 CPPSRCS		=                           \
 		nsAOLCiter.cpp              \

editor/composer/src/Makefile.in

@@ -31,7 +31,34 @@ LIBRARY_NAME	= composer
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsComposerModule
-REQUIRES	= xpcom string dom js locale gfx layout content uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  js \
+		  locale \
+		  gfx \
+		  layout \
+		  content \
+		  uriloader \
+		  widget \
+		  txmgr \
+		  htmlparser \
+		  necko \
+		  pref \
+		  view \
+		  appshell \
+		  rdf \
+		  webshell \
+		  timer \
+		  txtsvc \
+		  intl \
+		  lwbrk \
+		  docshell \
+		  chrome \
+		  caps \
+		  appcomps \
+		  xuldoc \
+		  $(NULL)
 
 CPPSRCS  = \
            nsEditorShell.cpp              \

editor/libeditor/base/src/Makefile.in

@@ -1,70 +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
-
-MODULE		= editor
-LIBRARY_NAME	= editorbase_s
-REQUIRES	= xpcom string dom js locale gfx layout content uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc
-
-# Internal header files, needed by other editor sublibs:
-INTERNAL_HDR_DIR = ../internal
-
-CPPSRCS		=                           \
-		nsEditor.cpp                \
-		nsEditorCommands.cpp        \
-                nsEditorController.cpp      \
-		nsEditorService.cpp         \
-		nsEditorUtils.cpp           \
-		nsSelectionState.cpp        \
-		$(NULL)
-
-# Transactions: we'd like to split these off,
-# but currently they and nsEditor are too intertwined!
-CPPSRCS		+=                          \
-		EditTxn.cpp                 \
-		IMETextTxn.cpp              \
-		PlaceholderTxn.cpp          \
-		ChangeAttributeTxn.cpp      \
-		CreateElementTxn.cpp        \
-		DeleteElementTxn.cpp        \
-		DeleteRangeTxn.cpp          \
-		DeleteTextTxn.cpp           \
-		EditAggregateTxn.cpp        \
-		InsertElementTxn.cpp        \
-		InsertTextTxn.cpp           \
-		JoinElementTxn.cpp          \
-		SetDocTitleTxn.cpp          \
-		SplitElementTxn.cpp         \
-		nsStyleSheetTxns.cpp        \
-		TransactionFactory.cpp      \
-		$(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-

editor/libeditor/build/Makefile.in

@@ -37,7 +37,34 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS)    \
 		$(MOZ_JS_LIBS)           \
 		$(NULL)
-REQUIRES	= xpcom string dom js locale gfx layout content uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  js \
+		  locale \
+		  gfx \
+		  layout \
+		  content \
+		  uriloader \
+		  widget \
+		  txmgr \
+		  htmlparser \
+		  necko \
+		  pref \
+		  view \
+		  appshell \
+		  rdf \
+		  webshell \
+		  timer \
+		  txtsvc \
+		  intl \
+		  lwbrk \
+		  docshell \
+		  chrome \
+		  caps \
+		  appcomps \
+		  xuldoc \
+		  $(NULL)
 
 # MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY=1
 ifdef MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY

editor/libeditor/html/src/Makefile.in

@@ -1,60 +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
-
-MODULE		= editor
-LIBRARY_NAME	= htmleditor_s
-REQUIRES	= xpcom string dom js locale gfx layout content uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc
-
-# Building the full blown HTML Editor  so add it's source files and objects:
-
-CPPSRCS  = \
-           nsEditProperty.cpp             \
-           nsHTMLDataTransfer.cpp         \
-           nsHTMLEditor.cpp               \
-           nsHTMLEditorStyle.cpp          \
-           nsHTMLEditRules.cpp            \
-           nsHTMLEditUtils.cpp            \
-           nsTableEditor.cpp              \
-           TypeInState.cpp                \
-           TextEditorTest.cpp             \
-           $(NULL)
-
-# don't want the shared lib; force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-ifdef ENABLE_EDITOR_API_LOG
-CPPSRCS += nsHTMLEditorLog.cpp             \
-           nsEditorTxnLog.cpp              \
-           $(NULL)
-
-DEFINES += -DENABLE_EDITOR_API_LOG
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES        += -I../../base/src -I../../text/src

editor/libeditor/text/src/Makefile.in

@@ -1,50 +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
-
-MODULE		= editor
-LIBRARY_NAME	= texteditor_s
-REQUIRES	= xpcom string dom js locale gfx layout content uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc
-
-CPPSRCS		=                           \
-		nsPlaintextDataTransfer.cpp \
-		nsPlaintextEditor.cpp       \
-		nsTextEditUtils.cpp         \
-		nsTextEditRules.cpp         \
-		nsEditorEventListeners.cpp  \
-		nsWrapUtils.cpp  \
-		nsInternetCiter.cpp  \
-		nsAOLCiter.cpp  \
-		$(NULL)
-
-# don't want the shared lib; force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES        += -I../../base/src
-

editor/txmgr/src/Makefile.in

@@ -31,7 +31,9 @@ LIBRARY_NAME	= txmgr
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsTransactionManagerModule
-REQUIRES	= xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsTransactionItem.cpp \

editor/txmgr/tests/Makefile.in

@@ -26,7 +26,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-REQUIRES	= xpcom txmgr
+REQUIRES	= xpcom \
+		  txmgr \
+		  $(NULL)
 
 PROGRAM		= TestTXMgr$(BIN_SUFFIX)
 

editor/txtsvc/src/Makefile.in

@@ -31,7 +31,15 @@ LIBRARY_NAME	= txtsvc
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsTextServicesModule
-REQUIRES	= xpcom string editor gfx layout content dom widget
+REQUIRES	= xpcom \
+		  string \
+		  editor \
+		  gfx \
+		  layout \
+		  content \
+		  dom \
+		  widget \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsFindAndReplace.cpp \

embedding/base/Makefile.in

@@ -29,7 +29,21 @@ XPIDL_MODULE	= embed_base
 
 include $(DEPTH)/config/autoconf.mk
 
-REQUIRES	= xpcom string widget view dom necko rdf appshell uriloader gfx editor intl chrome embedcomponents
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  view \
+		  dom \
+		  necko \
+		  rdf \
+		  appshell \
+		  uriloader \
+		  gfx \
+		  editor \
+		  intl \
+		  chrome \
+		  embedcomponents \
+		  $(NULL)
 
 EXPORTS         = \
                 nsEmbedAPI.h \

embedding/browser/build/Makefile.in

@@ -32,7 +32,20 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= webbrwsr
 EXPORT_LIBRARY = 1
-REQUIRES	= xpcom string docshell dom widget gfx layout content necko uriloader shistory timer windowwatcher
+REQUIRES	= xpcom \
+		  string \
+		  docshell \
+		  dom \
+		  widget \
+		  gfx \
+		  layout \
+		  content \
+		  necko \
+		  uriloader \
+		  shistory \
+		  timer \
+		  windowwatcher \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsWebBrowserModule.cpp		\

embedding/browser/gtk/src/Makefile.in

@@ -28,7 +28,24 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= gtkembedmoz
 LIBRARY_NAME	= gtkembedmoz
 EXPORT_LIBRARY = 1
-REQUIRES	= xpcom string docshell webshell necko widget dom gfx layout content uriloader webbrwsr shistory embed_base pref windowwatcher mpfilelocprovider
+REQUIRES	= xpcom \
+		  string \
+		  docshell \
+		  webshell \
+		  necko \
+		  widget \
+		  dom \
+		  gfx \
+		  layout \
+		  content \
+		  uriloader \
+		  webbrwsr \
+		  shistory \
+		  embed_base \
+		  pref \
+		  windowwatcher \
+		  mpfilelocprovider \
+		  $(NULL)
 
 CPPSRCS		= \
 		gtkmozembed2.cpp \

embedding/browser/gtk/tests/Makefile.in

@@ -26,7 +26,10 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= gtkembedmoz
-REQUIRES	= xpcom string dom
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  $(NULL)
 
 CPPSRCS		= \
 		TestGtkEmbed.cpp \

embedding/browser/webBrowser/Makefile.in

@@ -26,7 +26,26 @@ VPATH		= @srcdir@
 MODULE		= webbrwsr
 XPIDL_MODULE	= webBrowser_core
 LIBRARY_NAME	= nsWebBrowser_s
-REQUIRES	= xpcom string docshell widget gfx layout content dom js necko uriloader shistory webshell mimetype exthandler timer windowwatcher wallet appcomps
+REQUIRES	= xpcom \
+		  string \
+		  docshell \
+		  widget \
+		  gfx \
+		  layout \
+		  content \
+		  dom \
+		  js \
+		  necko \
+		  uriloader \
+		  shistory \
+		  webshell \
+		  mimetype \
+		  exthandler \
+		  timer \
+		  windowwatcher \
+		  wallet \
+		  appcomps \
+		  $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 

embedding/components/appstartup/src/Makefile.in

@@ -26,7 +26,9 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= embedcomponents
 LIBRARY_NAME	= appstartupnotifier_s
-REQUIRES	= xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 
 CPPSRCS		= nsAppStartupNotifier.cpp \
                   $(NULL)

embedding/components/build/Makefile.in

@@ -29,7 +29,16 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= embedcmp
 IS_COMPONENT	= 1
 MODULE_NAME	= embedcomponents
-REQUIRES	= js xpcom string windowwatcher jsconsole find embed_base dom txtsvc
+REQUIRES	= js \
+		  xpcom \
+		  string \
+		  windowwatcher \
+		  jsconsole \
+		  find \
+		  embed_base \
+		  dom \
+		  txtsvc \
+		  $(NULL)
 
 CPPSRCS		= nsModule.cpp
 

embedding/components/find/src/Makefile.in

@@ -26,7 +26,17 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= embedcomponents
 LIBRARY_NAME	= find_s
-REQUIRES	= string xpcom find txtsvc dom docshell gfx layout content widget
+REQUIRES	= string \
+		  xpcom \
+		  find \
+		  txtsvc \
+		  dom \
+		  docshell \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  $(NULL)
 
 CPPSRCS		= nsWebBrowserFind.cpp \
                   $(NULL)

embedding/components/jsconsole/src/Makefile.in

@@ -26,7 +26,13 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= embedcomponents
 LIBRARY_NAME	= jsconsole_s
-REQUIRES	= jsconsole xpcom string dom windowwatcher js
+REQUIRES	= jsconsole \
+		  xpcom \
+		  string \
+		  dom \
+		  windowwatcher \
+		  js \
+		  $(NULL)
 
 CPPSRCS		= nsJSConsoleService.cpp \
                   $(NULL)

embedding/components/windowwatcher/src/Makefile.in

@@ -26,7 +26,23 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= embedcomponents
 LIBRARY_NAME	= windowwatcher_s
-REQUIRES	= xpcom string dom windowwatcher widget js xpconnect caps layout content necko docshell webbrwsr embed_base wallet intl
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  windowwatcher \
+		  widget \
+		  js \
+		  xpconnect \
+		  caps \
+		  layout \
+		  content \
+		  necko \
+		  docshell \
+		  webbrwsr \
+		  embed_base \
+		  wallet \
+		  intl \
+		  $(NULL)
 
 CPPSRCS		= nsDialogParamBlock.cpp \
                   nsPrompt.cpp \

embedding/tests/gtkEmbed/Makefile.in

@@ -1,64 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Mozilla browser.
-# 
-# The Initial Developer of the Original Code is Christopher
-# Blizzard. Portions created by Christopher Blizzard are
-# Copyright (C) 1999, Mozilla.  All Rights Reserved.
-# 
-# Contributor(s):
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-REQUIRES	= xpcom string webbrwsr widget necko docshell gfx layout webshell dom uriloader embed_base windowwatcher pref mpfilelocprovider
-
-CPPSRCS	 = \
-	WebBrowserChrome.cpp  \
-	WindowCreator.cpp \
-	PromptService.cpp \
-	main.cpp \
-	$(NULL)
-
-PROGRAM = gtkEmbed
-
-LIBS= \
-		$(DIST)/lib/libembed_base_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libmpfilelocprovider_s.$(LIB_SUFFIX) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(XPCOM_LIBS) \
-		-lgtksuperwin \
-		$(PROFILE_LIBS) \
-		$(NULL)
-
-LIBS += $(TK_LIBS)
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS        += $(MOZ_GTK_CFLAGS)
-
-ifeq ($(OS_ARCH), SunOS)
-ifndef GNU_CC
-# When using Sun's WorkShop compiler, including
-# /wherever/workshop-5.0/SC5.0/include/CC/std/time.h
-# causes most of these compiles to fail with:
-# line 29: Error: Multiple declaration for std::tm.
-# So, this gets around the problem.
-DEFINES		+= -D_TIME_H=1
-endif
-endif
-
-

extensions/access-builtin/accessproxy/Makefile.in

@@ -36,7 +36,19 @@ MODULE = accessproxy
 XPIDL_MODULE = accessproxy
 LIBRARY_NAME = accessproxy
 SHORT_LIBNAME = accproxy
-REQUIRES = xpcom string docshell dom widget gfx layout content uriloader locale mozcomps pref
+REQUIRES	= xpcom \
+		  string \
+		  docshell \
+		  dom \
+		  widget \
+		  gfx \
+		  layout \
+		  content \
+		  uriloader \
+		  locale \
+		  mozcomps \
+		  pref \
+		  $(NULL)
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME	= nsAccessProxy

extensions/cookie/Makefile.in

@@ -31,7 +31,18 @@ LIBRARY_NAME	= cookie
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsCookieModule
-REQUIRES	= xpcom string necko dom widget layout content pref intl uriloader windowwatcher
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  dom \
+		  widget \
+		  layout \
+		  content \
+		  pref \
+		  intl \
+		  uriloader \
+		  windowwatcher \
+		  $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS		= tests

extensions/cookie/tests/Makefile.in

@@ -26,7 +26,12 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-REQUIRES	= xpcom string cookie necko intl
+REQUIRES	= xpcom \
+		  string \
+		  cookie \
+		  necko \
+		  intl \
+		  $(NULL)
 
 PROGRAM		= TestCookie$(BIN_SUFFIX)
 CPPSRCS		= TestCookie.cpp

extensions/ctl/src/Makefile.in

@@ -31,7 +31,13 @@ MODULE		= ctl
 LIBRARY_NAME	= ctl
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
-REQUIRES	= xpcom string uconv locale
+
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  locale \
+		  $(NULL)
+
 EXTRA_DSO_LIBS	= mozpango
 
 CPPSRCS		= \

extensions/datetime/Makefile.in

@@ -28,7 +28,9 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 LIBRARY_NAME	= nkdatetm_s
-REQUIRES	= xpcom string
+REQUIRES	= xpcom \
+		  string \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsDateTimeHandler.cpp \

extensions/finger/Makefile.in

@@ -27,7 +27,10 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 LIBRARY_NAME	= nkfinger_s
-REQUIRES	= xpcom string mimetype
+REQUIRES	= xpcom \
+		  string \
+		  mimetype \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsFingerHandler.cpp \

extensions/inspector/base/src/Makefile.in

@@ -28,7 +28,27 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE=inspector
 LIBRARY_NAME=inspector_s
-REQUIRES=xpcom string dom rdf rdfutil gfx layout content widget locale gfx2 necko docshell view timer imglib2 mimetype exthandler $(PNG_REQUIRES) $(ZLIB_REQUIRES)
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  rdf \
+		  rdfutil \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  locale \
+		  gfx2 \
+		  necko \
+		  docshell \
+		  view \
+		  timer \
+		  imglib2 \
+		  mimetype \
+		  exthandler \
+		  $(PNG_REQUIRES) \
+		  $(ZLIB_REQUIRES) \
+		  $(NULL)
 
 CPPSRCS= \
 	inDOMDataSource.cpp \

extensions/inspector/build/src/Makefile.in

@@ -30,7 +30,21 @@ MODULE = inspector
 LIBRARY_NAME = inspector
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME = inspectr
-REQUIRES = xpcom string gfx layout content dom widget rdf rdfutil locale gfx2 timer necko imglib2
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  layout \
+		  content \
+		  dom \
+		  widget \
+		  rdf \
+		  rdfutil \
+		  locale \
+		  gfx2 \
+		  timer \
+		  necko \
+		  imglib2 \
+		  $(NULL)
 IS_COMPONENT = 1
 MODULE_NAME	= nsInspectorModule
 

extensions/p3p/src/Makefile.in

@@ -1,68 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 imitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is International
-# Business Machines Corporation. Portions created by IBM
-# Corporation are Copyright (C) 2000 International Business
-# Machines Corporation. All Rights Reserved.
-#
-# Contributor(s): IBM Corporation.
-#
-
-DEPTH     = ../../..
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE       = p3p
-LIBRARY_NAME = p3p
-EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-MODULE_NAME	= nsP3PModule
-
-REQUIRES     = xpcom string docshell necko dom gfx layout content rdf widget xmlextras cookie pref intl uriloader htmlparser windowwatcher
-
-CPPSRCS      =                      \
-		nsP3PModule.cpp             \
-		nsP3PService.cpp            \
-		nsP3PUIService.cpp          \
-		nsP3PHTTPNotify.cpp         \
-		nsP3PObserverHTML.cpp       \
-		nsP3PObserverXML.cpp        \
-		nsP3PObserverUtils.cpp      \
-		nsP3PObserverLayout.cpp     \
-		nsP3PObserverFormSubmit.cpp \
-		nsP3PURIInformation.cpp     \
-		nsP3PReference.cpp          \
-		nsP3PXMLProcessor.cpp       \
-		nsP3PPolicyRefFile.cpp      \
-		nsP3PPolicy.cpp             \
-		nsP3PDataSchema.cpp         \
-		nsP3PPrivacyResult.cpp      \
-		nsP3PTags.cpp               \
-		nsP3PDataStruct.cpp         \
-		nsP3PXMLUtils.cpp           \
-		nsP3PPreferences.cpp        \
-		nsP3PUI.cpp                 \
-		nsP3PSimpleEnumerator.cpp   \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS =    \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NSPR_LIBS)  \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk

extensions/transformiix/build/Makefile.in

@@ -30,7 +30,15 @@ MODULE		= transformiix
 LIBRARY_NAME	= transformiix
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= t8iix
-REQUIRES	= xpcom string dom layout content widget xsl_doc necko
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  layout \
+		  content \
+		  widget \
+		  xsl_doc \
+		  necko \
+		  $(NULL)
 IS_COMPONENT	= 1
 MODULE_NAME	= TransformiixModule
 

extensions/transformiix/source/base/Makefile.in

@@ -28,7 +28,9 @@ include $(DEPTH)/config/autoconf.mk
 
 ifndef TX_EXE
 MODULE = transformiix
-REQUIRES = string xpcom
+REQUIRES	= string \
+		  xpcom \
+		  $(NULL)
 endif
 
 CPPSRCS	= ArrayList.cpp             \

extensions/transformiix/source/net/Makefile.in

@@ -28,7 +28,10 @@ include $(DEPTH)/config/autoconf.mk
 
 ifndef TX_EXE
 MODULE = transformiix
-REQUIRES = string xpcom necko
+REQUIRES	= string \
+		  xpcom \
+		  necko \
+		  $(NULL)
 endif
 
 CPPSRCS = URIUtils.cpp

extensions/transformiix/source/xml/Makefile.in

@@ -28,7 +28,13 @@ include $(DEPTH)/config/autoconf.mk
 
 ifndef TX_EXE
 MODULE = transformiix
-REQUIRES = string xpcom dom layout content widget
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  content \
+		  widget \
+		  $(NULL)
 endif
 
 DIRS            = dom parser util

extensions/transformiix/source/xml/dom/mozImpl/Makefile.in

@@ -27,7 +27,14 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
-REQUIRES = string xpcom dom layout content widget necko
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  content \
+		  widget \
+		  necko \
+		  $(NULL)
 
 CPPSRCS = MozillaAttr.cpp \
         MozillaCDATASection.cpp \

extensions/transformiix/source/xml/parser/Makefile.in

@@ -28,7 +28,18 @@ include $(DEPTH)/config/autoconf.mk
 
 ifndef TX_EXE
 MODULE = transformiix
-REQUIRES = string xpcom necko dom layout content widget js appshell xpconnect caps
+REQUIRES	= string \
+		  xpcom \
+		  necko \
+		  dom \
+		  layout \
+		  content \
+		  widget \
+		  js \
+		  appshell \
+		  xpconnect \
+		  caps \
+		  $(NULL)
 endif
 
 CPPSRCS = XMLParser.cpp

extensions/transformiix/source/xml/util/Makefile.in

@@ -1,40 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 Transformiix XSLT Processor.
-# 
-# The Initial Developer of the Original Code is Axel Hecht.
-# Portions created by Axel Hecht are  Copyright (C) Axel Hecht.
-# All Rights Reserved.
-# 
-# Contributor(s):
-#	Axel Hecht <axel@pike.org>
-# 
-
-DEPTH           = ../../../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifndef TX_EXE
-MODULE = transformiix
-REQUIRES = string xpcom dom layout content widget
-endif
-
-CPPSRCS = DOMHelper.cpp
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../dom
-
-install:: $(OBJS)

extensions/transformiix/source/xpath/Makefile.in

@@ -28,7 +28,13 @@ include $(DEPTH)/config/autoconf.mk
 
 ifndef TX_EXE
 MODULE = transformiix
-REQUIRES = string xpcom dom layout content widget
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  content \
+		  widget \
+		  $(NULL)
 endif
 
 CPPSRCS = AdditiveExpr.cpp \

extensions/transformiix/source/xslt/Makefile.in

@@ -30,7 +30,15 @@ DIRS            = functions util
 
 ifndef TX_EXE
 MODULE = transformiix
-REQUIRES = string xpcom dom layout content widget necko xsl_doc
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  content \
+		  widget \
+		  necko \
+		  xsl_doc \
+		  $(NULL)
 endif
 
 CPPSRCS = Names.cpp \

extensions/transformiix/source/xslt/functions/Makefile.in

@@ -28,7 +28,13 @@ include $(DEPTH)/config/autoconf.mk
 
 ifndef TX_EXE
 MODULE = transformiix
-REQUIRES = string xpcom dom layout content widget
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  content \
+		  widget \
+		  $(NULL)
 endif
 
 CPPSRCS = CurrentFunctionCall.cpp      \

extensions/transformiix/source/xslt/util/Makefile.in

@@ -28,7 +28,13 @@ include $(DEPTH)/config/autoconf.mk
 
 ifndef TX_EXE
 MODULE = transformiix
-REQUIRES = string xpcom dom layout content widget
+REQUIRES	= string \
+		  xpcom \
+		  dom \
+		  layout \
+		  content \
+		  widget \
+		  $(NULL)
 endif
 
 CPPSRCS = NodeSorter.cpp NodeStack.cpp

extensions/universalchardet/src/Makefile.in

@@ -32,7 +32,11 @@ EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsUniversalCharDetModule
 SHORT_LIBNAME	= ucdet
-REQUIRES	= xpcom string uconv chardet
+REQUIRES	= xpcom \
+		  string \
+		  uconv \
+		  chardet \
+		  $(NULL)
 
 CPPSRCS = \
 		CharDistribution.cpp \

extensions/universalchardet/tests/Makefile.in

@@ -27,7 +27,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= universalchardet
-REQUIRES	= xpcom chardet
+REQUIRES	= xpcom \
+		  chardet \
+		  $(NULL)
 
 CPPSRCS		= \
 		UniversalChardetTest.cpp \

extensions/vixen/base/src/Makefile.in

@@ -1,43 +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
-
-MODULE = vixen
-LIBRARY_NAME = vixen_s
-REQUIRES	= xpcom string gfx layout content dom widget
-
-CPPSRCS = \
-	nsVixenShell.cpp \
-	$(NULL)
-
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-install::
-	$(INSTALL) $(srcdir)/vxVixenService.js $(DIST)/bin/components
-

extensions/vixen/build/src/Makefile.in

@@ -1,51 +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
-
-MODULE = vixen
-LIBRARY_NAME = vixen
-EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-MODULE_NAME	= nsVixenModule
-REQUIRES	= xpcom string
-
-CPPSRCS 	= \
-		nsVixenModule.cpp \
-		$(NULL)
-
-LOCAL_INCLUDES += -I$(srcdir)/../../base/src
-
-SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libvixen_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

extensions/wallet/build/Makefile.in

@@ -32,7 +32,8 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= wlltvwrs
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWalletViewerModule
-REQUIRES	= xpcom
+REQUIRES	= xpcom \
+		  $(NULL)
 
 CPPSRCS		= nsWalletViewerFactory.cpp
 

extensions/wallet/cookieviewer/Makefile.in

@@ -29,7 +29,21 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= walletviewers
 LIBRARY_NAME	= cookieviewer_s
 XPIDL_MODULE	= cookieviewer
-REQUIRES	= xpcom string dom js gfx layout content widget cookie docshell uriloader locale necko gfx2
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  js \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  cookie \
+		  docshell \
+		  uriloader \
+		  locale \
+		  necko \
+		  gfx2 \
+		  $(NULL)
 
 CPPSRCS		= nsCookieViewer.cpp
 

extensions/wallet/editor/Makefile.in

@@ -29,7 +29,14 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= walletviewers
 LIBRARY_NAME	= walleteditor_s
 XPIDL_MODULE	= walleteditor
-REQUIRES	= xpcom string wallet dom docshell necko widget
+REQUIRES	= xpcom \
+		  string \
+		  wallet \
+		  dom \
+		  docshell \
+		  necko \
+		  widget \
+		  $(NULL)
 
 CPPSRCS		= nsWalletEditor.cpp
 

extensions/wallet/signonviewer/Makefile.in

@@ -29,7 +29,13 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= walletviewers
 LIBRARY_NAME	= signonviewer_s
 XPIDL_MODULE	= signonviewer
-REQUIRES	= xpcom string wallet dom widget necko
+REQUIRES	= xpcom \
+		  string \
+		  wallet \
+		  dom \
+		  widget \
+		  necko \
+		  $(NULL)
 
 CPPSRCS		= nsSignonViewer.cpp
 

extensions/wallet/src/Makefile.in

@@ -31,7 +31,22 @@ LIBRARY_NAME	= wallet
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWalletModule
-REQUIRES	= xpcom string necko dom gfx layout content widget uriloader pref webshell docshell appshell intl windowwatcher
+REQUIRES	= xpcom \
+		  string \
+		  necko \
+		  dom \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  uriloader \
+		  pref \
+		  webshell \
+		  docshell \
+		  appshell \
+		  intl \
+		  windowwatcher \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsWalletFactory.cpp \

extensions/wallet/walletpreview/Makefile.in

@@ -29,7 +29,14 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= walletviewers
 LIBRARY_NAME	= walletpreview_s
 XPIDL_MODULE	= walletpreview
-REQUIRES	= xpcom string wallet dom widget necko docshell
+REQUIRES	= xpcom \
+		  string \
+		  wallet \
+		  dom \
+		  widget \
+		  necko \
+		  docshell \
+		  $(NULL)
 
 CPPSRCS		= nsWalletPreview.cpp
 

extensions/webservices/schema/src/Makefile.in

@@ -28,7 +28,13 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextrasschema_s
-REQUIRES	= xpcom string dom caps necko xpconnect
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  caps \
+		  necko \
+		  xpconnect \
+		  $(NULL)
 
 CPPSRCS	= 				\
 		nsSchema.cpp				\

extensions/webservices/soap/src/Makefile.in

@@ -28,7 +28,18 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextrassoap_s
-REQUIRES	= xpcom string caps dom js widget gfx layout content xpconnect necko
+REQUIRES	= xpcom \
+		  string \
+		  caps \
+		  dom \
+		  js \
+		  widget \
+		  gfx \
+		  layout \
+		  content \
+		  xpconnect \
+		  necko \
+		  $(NULL)
 
 CPPSRCS	= 				\
 		nsSOAPCall.cpp		\

extensions/webservices/wsdl/src/Makefile.in

@@ -28,7 +28,13 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextraswsdl_s
-REQUIRES	= xpcom string dom caps necko xpconnect
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  caps \
+		  necko \
+		  xpconnect \
+		  $(NULL)
 
 CPPSRCS	= 				\
 		nsWSDLLoader.cpp	\

extensions/xmlextras/base/src/Makefile.in

@@ -28,22 +28,22 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextrasbase_s
-REQUIRES	= \
-		xpcom \
-		string \
-		dom \
-		js \
-		gfx \
-		layout \
-		content \
-		widget \
-		caps \
-		uconv \
-		necko \
-		docshell \
-		xpconnect \
-		webbrwsr \
-		htmlparser
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  js \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  caps \
+		  uconv \
+		  necko \
+		  docshell \
+		  xpconnect \
+		  webbrwsr \
+		  htmlparser \
+		  $(NULL)
 
 CPPSRCS	= 				\
 		nsDOMSerializer.cpp	\

extensions/xmlextras/build/src/Makefile.in

@@ -32,7 +32,18 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= xmlextra
 IS_COMPONENT	= 1
 MODULE_NAME	= nsXMLExtrasModule
-REQUIRES	= xpcom string dom js layout content widget caps necko webbrwsr embedcomponents
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  js \
+		  layout \
+		  content \
+		  widget \
+		  caps \
+		  necko \
+		  webbrwsr \
+		  embedcomponents \
+		  $(NULL)
 
 CPPSRCS		= nsXMLExtrasModule.cpp
 

extensions/xmlextras/schema/src/Makefile.in

@@ -28,7 +28,13 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextrasschema_s
-REQUIRES	= xpcom string dom caps necko xpconnect
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  caps \
+		  necko \
+		  xpconnect \
+		  $(NULL)
 
 CPPSRCS	= 				\
 		nsSchema.cpp				\

extensions/xmlextras/soap/src/Makefile.in

@@ -28,7 +28,18 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextrassoap_s
-REQUIRES	= xpcom string caps dom js widget gfx layout content xpconnect necko
+REQUIRES	= xpcom \
+		  string \
+		  caps \
+		  dom \
+		  js \
+		  widget \
+		  gfx \
+		  layout \
+		  content \
+		  xpconnect \
+		  necko \
+		  $(NULL)
 
 CPPSRCS	= 				\
 		nsSOAPCall.cpp		\

extensions/xmlextras/tests/Makefile.in

@@ -26,7 +26,15 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-REQUIRES	= xpcom string xmlextras necko dom layout content widget
+REQUIRES	= xpcom \
+		  string \
+		  xmlextras \
+		  necko \
+		  dom \
+		  layout \
+		  content \
+		  widget \
+		  $(NULL)
 
 CPPSRCS		= \
 		TestXMLExtras.cpp \

extensions/xmlextras/wsdl/src/Makefile.in

@@ -28,7 +28,13 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xmlextras
 LIBRARY_NAME	= xmlextraswsdl_s
-REQUIRES	= xpcom string dom caps necko xpconnect
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  caps \
+		  necko \
+		  xpconnect \
+		  $(NULL)
 
 CPPSRCS	= 				\
 		nsWSDLLoader.cpp	\

extensions/xmlterm/base/Makefile.in

@@ -67,7 +67,23 @@ CPPSRCS = \
 MODULE = xmlterm
 LIBRARY_NAME = xmlterm_s
 
-REQUIRES     = xpcom string gfx layout content docshell caps pref dom view widget necko webshell uriloader appshell locale
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  layout \
+		  content \
+		  docshell \
+		  caps \
+		  pref \
+		  dom \
+		  view \
+		  widget \
+		  necko \
+		  webshell \
+		  uriloader \
+		  appshell \
+		  locale \
+		  $(NULL)
 
 XPIDLSRCS = \
 	mozILineTerm.idl      \

extensions/xmlterm/build/Makefile.in

@@ -52,7 +52,17 @@ EXPORT_LIBRARY  = 1
 SHORT_LIBNAME	= xmlterm
 IS_COMPONENT	= 1
 
-REQUIRES	= xpcom string dom gfx layout content widget uriloader webshell necko
+REQUIRES	= xpcom \
+		  string \
+		  dom \
+		  gfx \
+		  layout \
+		  content \
+		  widget \
+		  uriloader \
+		  webshell \
+		  necko \
+		  $(NULL)
 
 
 MODULE_NAME	= XMLTermModule

extensions/xmlterm/lineterm/Makefile.in

@@ -76,7 +76,7 @@ EXPORTS = lineterm.h tracelog.h unistring.h ptystream.h
 MODULE = xmlterm
 LIBRARY_NAME = lineterm_s
 
-REQUIRES     =
+REQUIRES	= $(NULL)
 
 FORCE_STATIC_LIB = 1
 

gfx/src/Makefile.in

@@ -30,7 +30,19 @@ MODULE		= gfx
 EXPORTS         = nsFontList.h
 LIBRARY_NAME	= gkgfx
 EXPORT_LIBRARY = 1
-REQUIRES	= xpcom string layout content widget locale view necko pref gfx2 imglib2 intl
+REQUIRES	= xpcom \
+		  string \
+		  layout \
+		  content \
+		  widget \
+		  locale \
+		  view \
+		  necko \
+		  pref \
+		  gfx2 \
+		  imglib2 \
+		  intl \
+		  $(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 DIRS		=

gfx/src/beos/Makefile.in

@@ -47,7 +47,17 @@ CPPSRCS		= \
 		nsScreenManagerBeOS.cpp \
 		$(NULL)
 
-REQUIRES	= xpcom string pref widget view intl uconv dom windowwatcher unicharutil
+REQUIRES	= xpcom \
+		  string \
+		  pref \
+		  widget \
+		  view \
+		  intl \
+		  uconv \
+		  dom \
+		  windowwatcher \
+		  unicharutil \
+		  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

gfx/src/gtk/Makefile.in

@@ -31,7 +31,19 @@ LIBRARY_NAME	= gfx_gtk
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxGTKModule
-REQUIRES	= xpcom string widget view util dom pref uconv unicharutil windowwatcher locale intl
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  view \
+		  util \
+		  dom \
+		  pref \
+		  uconv \
+		  unicharutil \
+		  windowwatcher \
+		  locale \
+		  intl \
+		  $(NULL)
 
 CSRCS		= nsPrintdGTK.c
 

gfx/src/mac/Makefile.in

@@ -28,7 +28,22 @@ EXPORT_LIBRARY = 1
 MODULE		= gfx
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxMacModule
-REQUIRES	= xpcom string img widget view util dom pref js uconv necko unicharutil gfx2 mozcomps windowwatcher
+REQUIRES	= xpcom \
+		  string \
+		  img \
+		  widget \
+		  view \
+		  util \
+		  dom \
+		  pref \
+		  js \
+		  uconv \
+		  necko \
+		  unicharutil \
+		  gfx2 \
+		  mozcomps \
+		  windowwatcher \
+		  $(NULL)
 
 CPPSRCS = \
 		nsATSUIUtils.cpp \

gfx/src/photon/Makefile.in

@@ -31,7 +31,19 @@ LIBRARY_NAME	= gfx_photon
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxPhModule
-REQUIRES	= xpcom string widget view util dom pref uconv unicharutil windowwatcher locale intl
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  view \
+		  util \
+		  dom \
+		  pref \
+		  uconv \
+		  unicharutil \
+		  windowwatcher \
+		  locale \
+		  intl \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsDeviceContextPh.cpp \

gfx/src/ps/Makefile.in

@@ -32,7 +32,17 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxPSModule
 EXTRA_DSO_LIBS = mozutil_s
-REQUIRES	= xpcom string widget pref uconv view gfx2 necko imglib2 intl
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  pref \
+		  uconv \
+		  view \
+		  gfx2 \
+		  necko \
+		  imglib2 \
+		  intl \
+		  $(NULL)
 EXTRA_DSO_LIBS += gkgfx
 
 CSRCS		= font_metrics.c

gfx/src/qt/Makefile.in

@@ -30,7 +30,23 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= gfx
 LIBRARY_NAME	= gfx_qt
 EXPORT_LIBRARY = 1
-REQUIRES	= xpcom string widget view gfx2 uconv pref dom util js appshell mozcomps windowwatcher unicharutil intl locale
+REQUIRES	= xpcom \
+		  string \
+		  widget \
+		  view \
+		  gfx2 \
+		  uconv \
+		  pref \
+		  dom \
+		  util \
+		  js \
+		  appshell \
+		  mozcomps \
+		  windowwatcher \
+		  unicharutil \
+		  intl \
+		  locale \
+		  $(NULL)
 IS_COMPONENT    = 1
 MODULE_NAME	= nsGfxQTModule
 

gfx/src/xlib/Makefile.in

@@ -33,7 +33,28 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxXlibModule
 
-REQUIRES	= xpcom string xlibrgb widget dom layout content appshell js necko pref util view uconv locale unicharutil gfx2 imglib2 mozcomps windowwatcher intl
+REQUIRES	= xpcom \
+		  string \
+		  xlibrgb \
+		  widget \
+		  dom \
+		  layout \
+		  content \
+		  appshell \
+		  js \
+		  necko \
+		  pref \
+		  util \
+		  view \
+		  uconv \
+		  locale \
+		  unicharutil \
+		  gfx2 \
+		  imglib2 \
+		  mozcomps \
+		  windowwatcher \
+		  intl \
+		  $(NULL)
 
 CPPSRCS		= \
 		nsDeviceContextSpecFactoryX.cpp \

gfx/src/xprint/Makefile.in

@@ -34,7 +34,19 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsGfxXprintModule
 
 EXTRA_DSO_LIBS	= gkgfx
-REQUIRES	= xpcom string xlibrgb widget view pref locale uconv unicharutil gfx2 imglib2 intl
+REQUIRES	= xpcom \
+		  string \
+		  xlibrgb \
+		  widget \
+		  view \
+		  pref \
+		  locale \
+		  uconv \
+		  unicharutil \
+		  gfx2 \
+		  imglib2 \
+		  intl \
+		  $(NULL)
 
 CSRCS		= \
 		xprintutil.c \

gfx/tests/Makefile.in

@@ -26,7 +26,10 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-REQUIRES	= xpcom string gfx
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  $(NULL)
 
 CPPSRCS		= \
 		DumpColors.cpp \

gfx2/src/Makefile.in

@@ -33,7 +33,9 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfx2Module
 
-REQUIRES	= xpcom gfx
+REQUIRES	= xpcom \
+		  gfx \
+		  $(NULL)
 
 CPPSRCS		= \
 		gfxImageFrame.cpp \

htmlparser/robot/Makefile.in

@@ -28,7 +28,14 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= DebugRobot
 SHORT_LIBNAME	= dbgrobot
-REQUIRES	= xpcom string htmlparser necko docshell dom uriloader
+REQUIRES	= xpcom \
+		  string \
+		  htmlparser \
+		  necko \
+		  docshell \
+		  dom \
+		  uriloader \
+		  $(NULL)
 
 CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp