Clean up REQUIRES lines.

content/html/content/src/Makefile.in

@@ -32,7 +32,6 @@ REQUIRES	= xpcom \
 		  string \
 		  gfx \
 		  layout \
-		  uriloader \
 		  widget \
 		  dom \
 		  js \

dom/src/jsurl/Makefile.in

@@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  caps \
 		  widget \
 		  appshell \
-		  rdf \
 		  xpconnect \
 		  jsconsole \
 		  $(NULL)

editor/base/Makefile.in

@@ -1,160 +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	= 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 \
-		  $(NULL)
-
-CPPSRCS		=                           \
-		nsAOLCiter.cpp              \
-		ChangeAttributeTxn.cpp      \
-		CreateElementTxn.cpp        \
-		DeleteElementTxn.cpp        \
-		DeleteRangeTxn.cpp          \
-		DeleteTextTxn.cpp           \
-		EditAggregateTxn.cpp        \
-		EditTxn.cpp                 \
-		IMETextTxn.cpp              \
-		InsertElementTxn.cpp        \
-		InsertTextTxn.cpp           \
-		JoinElementTxn.cpp          \
-		nsEditorCommands.cpp        \
-		nsComposerCommands.cpp      \
-		nsEditorController.cpp      \
-		nsComposerController.cpp    \
-		nsEditor.cpp                \
-		nsEditorEventListeners.cpp  \
-		nsEditorUtils.cpp           \
-		nsEditProperty.cpp          \
-		nsTextEditUtils.cpp         \
-		nsHTMLEditUtils.cpp         \
-		nsInternetCiter.cpp         \
-		nsPlaintextDataTransfer.cpp \
-		nsPlaintextEditor.cpp       \
-		nsSelectionState.cpp        \
-		nsStyleSheetTxns.cpp        \
-		nsTextEditRules.cpp         \
-		nsWrapUtils.cpp             \
-		PlaceholderTxn.cpp          \
-		SplitElementTxn.cpp         \
-		TransactionFactory.cpp      \
-		$(NULL)
-                
-ifdef IBMBIDI
-CPPSRCS		+= \
-		nsTextEditRulesBidi.cpp \
-		$(NULL)
-endif                
-
-# MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY=1
-
-ifdef MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY
-
-# We're only building the Core PlainText Editor Source so just include
-# the plain text registration file.
-
-CPPSRCS += nsTextEditorReg.cpp
-
-DEFINES += -DMOZILLA_PLAINTEXT_EDITOR_ONLY
-
-else
-
-# Building the full blown HTML Editor  so add it's source files and objects:
-
-CPPSRCS += nsEditorParserObserver.cpp     \
-           nsEditorRegistration.cpp       \
-           nsEditorShell.cpp              \
-           nsEditorShellMouseListener.cpp \
-           nsEditorService.cpp            \
-           nsHTMLDataTransfer.cpp         \
-           nsHTMLEditor.cpp               \
-           nsHTMLEditorStyle.cpp          \
-           nsHTMLEditRules.cpp            \
-           nsInterfaceState.cpp           \
-           nsHTMLURIRefObject.cpp         \
-           nsTableEditor.cpp              \
-           nsWSRunObject.cpp              \
-           TextEditorTest.cpp             \
-           TypeInState.cpp                \
-           SetDocTitleTxn.cpp             \
-           $(NULL)
-           
-# Enable Editor API Logging!
-ENABLE_EDITOR_API_LOG=1
-
-ifdef ENABLE_EDITOR_API_LOG
-
-CPPSRCS += nsHTMLEditorLog.cpp \
-           nsEditorTxnLog.cpp  \
-           $(NULL)
-
-DEFINES += -DENABLE_EDITOR_API_LOG=1
-
-endif
-
-endif
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_NECKO_UTIL_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

editor/composer/src/Makefile.in

@@ -35,14 +35,12 @@ REQUIRES        = xpcom \
                   string \
                   dom \
                   layout \
-                  locale \
                   content \
                   uriloader \
                   txmgr \
                   htmlparser \
                   necko \
                   pref \
-                  view \
                   webshell \
                   timer \
                   intl \

editor/libeditor/base/Makefile.in

@@ -35,19 +35,12 @@ REQUIRES        = xpcom \
                   locale \
                   layout \
                   content \
-                  uriloader \
                   txmgr \
                   htmlparser \
                   necko \
                   pref \
                   view \
                   appshell \
-                  rdf \
-                  webshell \
-                  timer \
-                  txtsvc \
-                  intl \
-                  docshell \
                   gfx \
                   widget \
                   xuldoc \

editor/libeditor/build/Makefile.in

@@ -40,23 +40,11 @@ REQUIRES        = xpcom \
                   string \
                   dom \
                   layout \
-                  locale \
                   content \
-                  uriloader \
                   txmgr \
                   htmlparser \
-                  necko \
-                  pref \
-                  view \
-                  webshell \
-                  timer \
-                  intl \
-                  docshell \
-                  gfx \
-                  widget \
                   appshell \
                   xuldoc \
-                  txtsvc \
                   $(NULL)
 
 # MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY=1

editor/libeditor/html/Makefile.in

@@ -35,16 +35,10 @@ REQUIRES        = xpcom \
                   layout \
                   locale \
                   content \
-                  uriloader \
                   txmgr \
                   htmlparser \
                   necko \
                   pref \
-                  view \
-                  webshell \
-                  timer \
-                  intl \
-                  docshell \
                   gfx \
                   widget \
                   $(NULL)

editor/libeditor/text/Makefile.in

@@ -36,18 +36,12 @@ REQUIRES        = xpcom \
                   locale \
                   layout \
                   content \
-                  uriloader \
                   txmgr \
                   htmlparser \
                   necko \
                   pref \
                   view \
-                  webshell \
-                  timer \
-                  txtsvc \
-                  intl \
                   lwbrk \
-                  docshell \
                   gfx \
                   widget \
                   $(NULL)

embedding/base/Makefile.in

@@ -35,11 +35,8 @@ REQUIRES	= xpcom \
 		  view \
 		  dom \
 		  necko \
-		  rdf \
-		  appshell \
 		  uriloader \
 		  gfx \
-		  editor \
 		  intl \
 		  chrome \
 		  embedcomponents \

gfx/src/Makefile.in

@@ -32,7 +32,6 @@ LIBRARY_NAME	= gkgfx
 EXPORT_LIBRARY = 1
 REQUIRES	= xpcom \
 		  string \
-		  content \
 		  widget \
 		  locale \
 		  view \

intl/locale/src/Makefile.in

@@ -33,7 +33,6 @@ REQUIRES	= xpcom \
 		  uconv \
 		  unicharutil \
 		  necko \
-		  intl \
 		  $(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)

intl/uconv/src/Makefile.in

@@ -40,7 +40,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  chardet \
 		  necko \
-		  pref \
 		  $(NULL)
 
 CSRCS		= \

js/jsd/Makefile.in

@@ -37,7 +37,6 @@ REQUIRES	= xpcom \
 		  js \
 		  xpconnect \
 		  widget \
-		  appshell \
 		  pref \
 		  $(NULL)
 

js/src/xpconnect/src/Makefile.in

@@ -48,7 +48,6 @@ MODULE_NAME	= xpconnect
 REQUIRES	= xpcom \
 		  string \
 		  js \
-		  dom \
 		  caps \
 		  $(NULL)
 

profile/pref-migrator/src/Makefile.in

@@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  docshell \
 		  dom \
 		  necko \
-		  rdf \
 		  widget \
 		  webbrwsr \
 		  uconv \

profile/src/Makefile.in

@@ -45,7 +45,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  prefmigr \
 		  appshell \
-		  rdf \
 		  uconv \
 		  appcomps \
 		  windowwatcher \

xpcom/glue/Makefile.in

@@ -30,7 +30,7 @@ MODULE		= xpcom
 XPIDL_MODULE	= xpcom_glue
 LIBRARY_NAME	= xpcomglue
 
-REQUIRES	= string
+REQUIRES	= $(NULL)
 
 CPPSRCS		= \
 		nsCOMPtr.cpp \

xpfe/bootstrap/Makefile.in

@@ -39,10 +39,8 @@ REQUIRES	= xpcom \
 		  appshell \
 		  gfx \
 		  chrome \
-		  rdf \
 		  xpinstall \
 		  uriloader \
-		  editor \
 		  view \
 		  windowwatcher \
 		  embed_base \

xpfe/browser/src/Makefile.in

@@ -48,7 +48,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  editor \
 		  appcomps \
-		  rdf \
 		  webbrwsr \
 		  uconv \
 		  chardet \

xpinstall/src/Makefile.in

@@ -51,7 +51,6 @@ REQUIRES	= xpcom \
 		  libreg \
 		  js \
 		  pref \
-		  appshell \
 		  widget \
 		  layout \
 		  content \
@@ -59,7 +58,6 @@ REQUIRES	= xpcom \
 		  xpconnect \
 		  docshell \
 		  dom \
-		  mozcomps \
 		  windowwatcher \
 		  $(ZLIB_REQUIRES) \
 		  $(NULL)