diff --git a/mozilla/accessible/src/Makefile.in b/mozilla/accessible/src/Makefile.in index c2d10d1ee04..8d3117458ff 100644 --- a/mozilla/accessible/src/Makefile.in +++ b/mozilla/accessible/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = accessibility LIBRARY_NAME = accessibility_s -REQUIRES = xpcom string layout widget dom view locale intl docshell webshell necko htmlparser xuldoc imglib2 gfx2 +REQUIRES = xpcom string layout content widget dom view locale intl docshell webshell necko htmlparser xuldoc imglib2 gfx2 CPPSRCS = \ nsAccessible.cpp \ diff --git a/mozilla/content/base/public/Makefile.in b/mozilla/content/base/public/Makefile.in index ff680c77ccf..5ee87a524f6 100644 --- a/mozilla/content/base/public/Makefile.in +++ b/mozilla/content/base/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content XPIDL_MODULE = content_base EXPORTS = \ diff --git a/mozilla/content/base/src/Makefile.in b/mozilla/content/base/src/Makefile.in index 821d24ea30c..5480f7e9e9c 100644 --- a/mozilla/content/base/src/Makefile.in +++ b/mozilla/content/base/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content LIBRARY_NAME = gkconbase_s -REQUIRES = xpcom string dom widget view locale timer htmlparser js webshell necko caps lwbrk uconv chrome docshell pref xpconnect util unicharutil xsl_doc +REQUIRES = xpcom string dom layout widget view locale timer htmlparser js webshell necko caps lwbrk uconv chrome docshell pref xpconnect util unicharutil xsl_doc CPPSRCS = \ nsCommentNode.cpp \ diff --git a/mozilla/content/build/Makefile.in b/mozilla/content/build/Makefile.in index 0a3930f5a6f..6dcf7168e2f 100644 --- a/mozilla/content/build/Makefile.in +++ b/mozilla/content/build/Makefile.in @@ -28,14 +28,14 @@ include $(DEPTH)/config/autoconf.mk BUILD_DATE = gbdate.h -MODULE = layout +MODULE = content LIBRARY_NAME = gkcontent EXPORT_LIBRARY = 1 SHORT_LIBNAME = gkcontnt IS_COMPONENT = 1 MODULE_NAME = nsContentModule EXTRA_DSO_LIBS = gkgfx -REQUIRES = xpcom string widget necko rdf docshell dom htmlparser uriloader webshell locale unicharutil lwbrk js pref xul xuldoc xultmpl timer +REQUIRES = xpcom string layout widget necko rdf docshell dom htmlparser uriloader webshell locale unicharutil lwbrk js pref xul xuldoc xultmpl timer CPPSRCS = \ nsContentDLF.cpp \ diff --git a/mozilla/content/events/public/Makefile.in b/mozilla/content/events/public/Makefile.in index 3e743193684..cc7c2caf759 100644 --- a/mozilla/content/events/public/Makefile.in +++ b/mozilla/content/events/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content EXPORTS = \ nsMutationEvent.h \ diff --git a/mozilla/content/events/src/Makefile.in b/mozilla/content/events/src/Makefile.in index e0d5b43b51c..545dfc3feaa 100644 --- a/mozilla/content/events/src/Makefile.in +++ b/mozilla/content/events/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content LIBRARY_NAME = gkconevents_s -REQUIRES = xpcom string dom js locale widget timer caps xpconnect docshell webshell pref htmlparser view +REQUIRES = xpcom string dom js locale layout widget timer caps xpconnect docshell webshell pref htmlparser view CPPSRCS = \ nsEventListenerManager.cpp \ diff --git a/mozilla/content/html/content/public/Makefile.in b/mozilla/content/html/content/public/Makefile.in index 1147364a4da..5764e460b19 100644 --- a/mozilla/content/html/content/public/Makefile.in +++ b/mozilla/content/html/content/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content EXPORTS = \ nsIBodySuper.h \ diff --git a/mozilla/content/html/content/src/Makefile.in b/mozilla/content/html/content/src/Makefile.in index b15b88bf18b..340510e93c9 100644 --- a/mozilla/content/html/content/src/Makefile.in +++ b/mozilla/content/html/content/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content LIBRARY_NAME = gkconhtmlcon_s -REQUIRES = xpcom string widget dom js locale webshell htmlparser necko view pref docshell xpconnect xuldoc caps editor uconv gfx2 imglib2 +REQUIRES = xpcom string layout widget dom js locale webshell htmlparser necko view pref docshell xpconnect xuldoc caps editor uconv gfx2 imglib2 CPPSRCS = \ nsAttributeContent.cpp \ diff --git a/mozilla/content/html/document/public/Makefile.in b/mozilla/content/html/document/public/Makefile.in index a90b1d8c5e0..d63515283a0 100644 --- a/mozilla/content/html/document/public/Makefile.in +++ b/mozilla/content/html/document/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/html/document/src/Makefile.in b/mozilla/content/html/document/src/Makefile.in index 8a6d91cd7df..2a0e74cdf9b 100644 --- a/mozilla/content/html/document/src/Makefile.in +++ b/mozilla/content/html/document/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content LIBRARY_NAME = gkconhtmldoc_s -REQUIRES = xpcom string 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 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 CPPSRCS = \ nsHTMLContentSink.cpp \ diff --git a/mozilla/content/html/style/public/Makefile.in b/mozilla/content/html/style/public/Makefile.in index 829f6caf890..9d955bf9282 100644 --- a/mozilla/content/html/style/public/Makefile.in +++ b/mozilla/content/html/style/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content EXPORTS = \ nsICSSLoader.h \ diff --git a/mozilla/content/html/style/src/Makefile.in b/mozilla/content/html/style/src/Makefile.in index d88774ff18b..1a6757e7bd5 100644 --- a/mozilla/content/html/style/src/Makefile.in +++ b/mozilla/content/html/style/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content LIBRARY_NAME = gkconhtmlstyle_s -REQUIRES = xpcom string dom widget caps locale js necko webshell xul htmlparser docshell uconv xuldoc xpconnect pref +REQUIRES = xpcom string dom layout widget caps locale js necko webshell xul htmlparser docshell uconv xuldoc xpconnect pref CPPSRCS = \ nsCSSDeclaration.cpp \ diff --git a/mozilla/content/shared/public/Makefile.in b/mozilla/content/shared/public/Makefile.in index 3de11d25b15..0837f2387e8 100644 --- a/mozilla/content/shared/public/Makefile.in +++ b/mozilla/content/shared/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content EXPORTS = \ nsCSSAtomList.h \ diff --git a/mozilla/content/shared/src/Makefile.in b/mozilla/content/shared/src/Makefile.in index 785d157234a..625cc97b06a 100644 --- a/mozilla/content/shared/src/Makefile.in +++ b/mozilla/content/shared/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content LIBRARY_NAME = gkconshared_s -REQUIRES = xpcom string widget locale dom webshell pref necko htmlparser unicharutil +REQUIRES = xpcom string layout widget locale dom webshell pref necko htmlparser unicharutil CPPSRCS = \ nsCSSAtoms.cpp \ diff --git a/mozilla/content/xbl/public/Makefile.in b/mozilla/content/xbl/public/Makefile.in index b4aff9109e1..90d7e3a4324 100644 --- a/mozilla/content/xbl/public/Makefile.in +++ b/mozilla/content/xbl/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content EXPORTS = \ nsIBindingManager.h \ diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in index 787ea72cd26..607f57fea32 100644 --- a/mozilla/content/xbl/src/Makefile.in +++ b/mozilla/content/xbl/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content LIBRARY_NAME = gkconxbl_s -REQUIRES = xpcom string js dom widget caps htmlparser necko xpconnect pref docshell chrome lwbrk xul xuldoc gfx2 imglib2 +REQUIRES = xpcom string js dom layout widget caps htmlparser necko xpconnect pref docshell chrome lwbrk xul xuldoc gfx2 imglib2 CPPSRCS = \ nsXBLBinding.cpp \ diff --git a/mozilla/content/xml/content/public/Makefile.in b/mozilla/content/xml/content/public/Makefile.in index 0c3071f87da..974d5d02543 100644 --- a/mozilla/content/xml/content/public/Makefile.in +++ b/mozilla/content/xml/content/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content EXPORTS = nsIXMLContent.h EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) diff --git a/mozilla/content/xml/content/src/Makefile.in b/mozilla/content/xml/content/src/Makefile.in index 848bf6d2184..3749981602a 100644 --- a/mozilla/content/xml/content/src/Makefile.in +++ b/mozilla/content/xml/content/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content LIBRARY_NAME = gkconxmlcon_s -REQUIRES = xpcom string js dom widget necko caps webshell docshell htmlparser xpconnect +REQUIRES = xpcom string js dom layout widget necko caps webshell docshell htmlparser xpconnect CPPSRCS = \ nsXMLElement.cpp \ diff --git a/mozilla/content/xml/document/public/Makefile.in b/mozilla/content/xml/document/public/Makefile.in index 263a04e6338..5d1e9babffd 100644 --- a/mozilla/content/xml/document/public/Makefile.in +++ b/mozilla/content/xml/document/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content EXPORTS = \ nsIXMLContentSink.h \ diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in index de5938eb01e..347bfecc36c 100644 --- a/mozilla/content/xml/document/src/Makefile.in +++ b/mozilla/content/xml/document/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = content LIBRARY_NAME = gkconxmldoc_s -REQUIRES = xpcom string js dom widget caps htmlparser necko view docshell webshell uriloader pref xpconnect uconv chardet lwbrk exthandler mimetype +REQUIRES = xpcom string js dom layout widget caps htmlparser necko view docshell webshell uriloader pref xpconnect uconv chardet lwbrk exthandler mimetype CPPSRCS = \ nsXMLContentSink.cpp \ diff --git a/mozilla/content/xsl/document/src/Makefile.in b/mozilla/content/xsl/document/src/Makefile.in index 59ee277fe6e..174dc8a7dec 100755 --- a/mozilla/content/xsl/document/src/Makefile.in +++ b/mozilla/content/xsl/document/src/Makefile.in @@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xsl_doc LIBRARY_NAME = gkconxsldoc_s -REQUIRES = xpcom string htmlparser view widget dom necko layout +REQUIRES = xpcom string htmlparser view widget dom necko layout content include $(topsrcdir)/config/config.mk diff --git a/mozilla/content/xul/content/src/Makefile.in b/mozilla/content/xul/content/src/Makefile.in index 403419f6448..94ff50c0990 100644 --- a/mozilla/content/xul/content/src/Makefile.in +++ b/mozilla/content/xul/content/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = xul LIBRARY_NAME = gkconxulcon_s -REQUIRES = xpcom string widget htmlparser necko dom js caps rdf xpconnect locale timer lwbrk pref xul xuldoc xultmpl webshell +REQUIRES = xpcom string layout content widget htmlparser necko dom js caps rdf xpconnect locale timer lwbrk pref xuldoc xultmpl webshell CPPSRCS = \ nsRDFDOMNodeList.cpp \ diff --git a/mozilla/content/xul/document/src/Makefile.in b/mozilla/content/xul/document/src/Makefile.in index eff728ca875..a4a18b2c597 100644 --- a/mozilla/content/xul/document/src/Makefile.in +++ b/mozilla/content/xul/document/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = xuldoc LIBRARY_NAME = gkconxuldoc_s -REQUIRES = xpcom string exthandler mimetype widget dom rdf js xpconnect caps locale view necko uriloader htmlparser lwbrk timer chrome docshell pref xul xuldoc xultmpl +REQUIRES = xpcom string exthandler mimetype layout content widget dom rdf js xpconnect caps locale view necko uriloader htmlparser lwbrk timer chrome docshell pref xul xultmpl CPPSRCS = \ nsControllerCommandManager.cpp \ diff --git a/mozilla/content/xul/templates/src/Makefile.in b/mozilla/content/xul/templates/src/Makefile.in index 7fa7e01c1b1..15bd2a5ff29 100644 --- a/mozilla/content/xul/templates/src/Makefile.in +++ b/mozilla/content/xul/templates/src/Makefile.in @@ -26,9 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = layout +MODULE = xultmpl LIBRARY_NAME = gkconxultmpl_s -REQUIRES = xpcom string js xpconnect timer caps widget dom rdf necko locale xul xuldoc xultmpl +REQUIRES = xpcom string js xpconnect timer caps layout content widget dom rdf necko locale xul xuldoc CPPSRCS = \ nsClusterKey.cpp \ diff --git a/mozilla/docshell/base/Makefile.in b/mozilla/docshell/base/Makefile.in index 17e64a9b84e..a9355bb8512 100644 --- a/mozilla/docshell/base/Makefile.in +++ b/mozilla/docshell/base/Makefile.in @@ -25,7 +25,7 @@ VPATH = @srcdir@ MODULE = docshell LIBRARY_NAME = basedocshell_s -REQUIRES = xpcom string caps necko layout 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 layout content dom js uriloader exthandler htmlparser view pref locale webbrwsr xpconnect timer widget shistory intl plugin webshell chardet uconv appcomps xuldoc find nkcache include $(DEPTH)/config/autoconf.mk diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index 0e90d9b91a6..cc9793ace3e 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/dom/src/base/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdombase_s -REQUIRES = xpcom string webbrwsr js widget layout caps docshell xpconnect pref oji necko java locale uriloader sidebar xuldoc timer webshell view uconv shistory plugin windowwatcher htmlparser chardet transformiix xmlextras xsl_doc +REQUIRES = xpcom string webbrwsr js widget 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 CPPSRCS = \ nsBarProps.cpp \ diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in index 3f79531c5fc..46f9abdf196 100644 --- a/mozilla/dom/src/build/Makefile.in +++ b/mozilla/dom/src/build/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdom EXPORT_LIBRARY = 1 -REQUIRES = xpcom string js xpconnect widget layout caps timer webbrwsr xuldoc docshell sidebar plugin necko +REQUIRES = xpcom string js xpconnect widget layout content caps timer webbrwsr xuldoc docshell sidebar plugin necko IS_COMPONENT = 1 MODULE_NAME = DOM_components diff --git a/mozilla/editor/base/Makefile.in b/mozilla/editor/base/Makefile.in index 4f57dfbd6c2..d449177a44f 100644 --- a/mozilla/editor/base/Makefile.in +++ b/mozilla/editor/base/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = editor EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsEditorModule -REQUIRES = xpcom string dom locale layout 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 layout content uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome appcomps xuldoc windowwatcher exthandler mimetype CPPSRCS = \ nsAOLCiter.cpp \ diff --git a/mozilla/editor/composer/src/Makefile.in b/mozilla/editor/composer/src/Makefile.in index 852dcea8b77..f4268a096e5 100644 --- a/mozilla/editor/composer/src/Makefile.in +++ b/mozilla/editor/composer/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = composer EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsComposerModule -REQUIRES = xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc +REQUIRES = xpcom string dom js locale layout content uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc CPPSRCS = \ nsEditorShell.cpp \ diff --git a/mozilla/editor/libeditor/base/src/Makefile.in b/mozilla/editor/libeditor/base/src/Makefile.in index 21d1101c96e..59cf6333f76 100644 --- a/mozilla/editor/libeditor/base/src/Makefile.in +++ b/mozilla/editor/libeditor/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = editor LIBRARY_NAME = editorbase_s -REQUIRES = xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc +REQUIRES = xpcom string dom js locale 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 diff --git a/mozilla/editor/libeditor/build/Makefile.in b/mozilla/editor/libeditor/build/Makefile.in index ac3b2c7a43b..14fc6ef532e 100644 --- a/mozilla/editor/libeditor/build/Makefile.in +++ b/mozilla/editor/libeditor/build/Makefile.in @@ -37,7 +37,7 @@ EXTRA_DSO_LDOPTS = \ $(MOZ_COMPONENT_LIBS) \ $(MOZ_JS_LIBS) \ $(NULL) -REQUIRES = xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc +REQUIRES = xpcom string dom js locale layout content uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc # MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY=1 ifdef MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY diff --git a/mozilla/editor/libeditor/html/src/Makefile.in b/mozilla/editor/libeditor/html/src/Makefile.in index 3cff2232c88..faee43fa588 100644 --- a/mozilla/editor/libeditor/html/src/Makefile.in +++ b/mozilla/editor/libeditor/html/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = editor LIBRARY_NAME = htmleditor_s -REQUIRES = xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc +REQUIRES = xpcom string dom js locale 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: diff --git a/mozilla/editor/libeditor/text/src/Makefile.in b/mozilla/editor/libeditor/text/src/Makefile.in index 4d6676924c4..0e4362ee02b 100644 --- a/mozilla/editor/libeditor/text/src/Makefile.in +++ b/mozilla/editor/libeditor/text/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = editor LIBRARY_NAME = texteditor_s -REQUIRES = xpcom string dom js locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc +REQUIRES = xpcom string dom js locale layout content uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome caps appcomps xuldoc CPPSRCS = \ nsPlaintextDataTransfer.cpp \ diff --git a/mozilla/editor/txtsvc/src/Makefile.in b/mozilla/editor/txtsvc/src/Makefile.in index 0a0994a57b3..143815660e5 100644 --- a/mozilla/editor/txtsvc/src/Makefile.in +++ b/mozilla/editor/txtsvc/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = txtsvc EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsTextServicesModule -REQUIRES = xpcom string editor layout dom widget +REQUIRES = xpcom string editor layout content dom widget CPPSRCS = \ nsFindAndReplace.cpp \ diff --git a/mozilla/embedding/browser/build/Makefile.in b/mozilla/embedding/browser/build/Makefile.in index d0b2c64cb86..e490a22b05a 100644 --- a/mozilla/embedding/browser/build/Makefile.in +++ b/mozilla/embedding/browser/build/Makefile.in @@ -32,7 +32,7 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = webbrwsr EXPORT_LIBRARY = 1 -REQUIRES = xpcom string docshell dom widget layout necko uriloader shistory timer windowwatcher +REQUIRES = xpcom string docshell dom widget layout content necko uriloader shistory timer windowwatcher CPPSRCS = \ nsWebBrowserModule.cpp \ diff --git a/mozilla/embedding/browser/gtk/src/Makefile.in b/mozilla/embedding/browser/gtk/src/Makefile.in index 8ab48e643b8..4f2e0e94fb5 100644 --- a/mozilla/embedding/browser/gtk/src/Makefile.in +++ b/mozilla/embedding/browser/gtk/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = gtkembedmoz LIBRARY_NAME = gtkembedmoz EXPORT_LIBRARY = 1 -REQUIRES = xpcom string docshell webshell necko widget dom layout uriloader webbrwsr shistory embed_base pref windowwatcher mpfilelocprovider +REQUIRES = xpcom string docshell webshell necko widget dom layout content uriloader webbrwsr shistory embed_base pref windowwatcher mpfilelocprovider CPPSRCS = \ gtkmozembed2.cpp \ diff --git a/mozilla/embedding/browser/webBrowser/Makefile.in b/mozilla/embedding/browser/webBrowser/Makefile.in index 254adcb5873..35a988b76f8 100644 --- a/mozilla/embedding/browser/webBrowser/Makefile.in +++ b/mozilla/embedding/browser/webBrowser/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ MODULE = webbrwsr XPIDL_MODULE = webBrowser_core LIBRARY_NAME = nsWebBrowser_s -REQUIRES = xpcom string docshell widget layout dom js necko uriloader shistory webshell mimetype exthandler timer windowwatcher wallet appcomps +REQUIRES = xpcom string docshell widget layout content dom js necko uriloader shistory webshell mimetype exthandler timer windowwatcher wallet appcomps include $(DEPTH)/config/autoconf.mk diff --git a/mozilla/embedding/components/find/src/Makefile.in b/mozilla/embedding/components/find/src/Makefile.in index f6725eb481e..40aa90d785f 100644 --- a/mozilla/embedding/components/find/src/Makefile.in +++ b/mozilla/embedding/components/find/src/Makefile.in @@ -26,7 +26,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = embedcomponents LIBRARY_NAME = find_s -REQUIRES = string xpcom find txtsvc dom docshell layout widget +REQUIRES = string xpcom find txtsvc dom docshell layout content widget CPPSRCS = nsWebBrowserFind.cpp \ $(NULL) diff --git a/mozilla/embedding/components/windowwatcher/src/Makefile.in b/mozilla/embedding/components/windowwatcher/src/Makefile.in index e8d1c5b2d68..c71366b0c82 100644 --- a/mozilla/embedding/components/windowwatcher/src/Makefile.in +++ b/mozilla/embedding/components/windowwatcher/src/Makefile.in @@ -26,7 +26,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = embedcomponents LIBRARY_NAME = windowwatcher_s -REQUIRES = xpcom string dom windowwatcher widget js xpconnect caps layout 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 CPPSRCS = nsDialogParamBlock.cpp \ nsPrompt.cpp \ diff --git a/mozilla/extensions/access-builtin/accessproxy/Makefile.in b/mozilla/extensions/access-builtin/accessproxy/Makefile.in index 9f9bd498aab..5ad86f04a6a 100644 --- a/mozilla/extensions/access-builtin/accessproxy/Makefile.in +++ b/mozilla/extensions/access-builtin/accessproxy/Makefile.in @@ -36,7 +36,7 @@ MODULE = accessproxy XPIDL_MODULE = accessproxy LIBRARY_NAME = accessproxy SHORT_LIBNAME = accproxy -REQUIRES = xpcom string docshell dom widget layout uriloader locale mozcomps pref +REQUIRES = xpcom string docshell dom widget layout content uriloader locale mozcomps pref EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsAccessProxy diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in index e25467059db..eec8d0282b0 100644 --- a/mozilla/extensions/cookie/Makefile.in +++ b/mozilla/extensions/cookie/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = cookie EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsCookieModule -REQUIRES = xpcom string necko dom widget layout pref intl uriloader windowwatcher +REQUIRES = xpcom string necko dom widget layout content pref intl uriloader windowwatcher ifdef ENABLE_TESTS DIRS = tests diff --git a/mozilla/extensions/inspector/base/src/Makefile.in b/mozilla/extensions/inspector/base/src/Makefile.in index acee6a81199..4d2774bef19 100644 --- a/mozilla/extensions/inspector/base/src/Makefile.in +++ b/mozilla/extensions/inspector/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE=inspector LIBRARY_NAME=inspector_s -REQUIRES=xpcom string dom rdf rdfutil layout widget locale gfx2 necko docshell view timer imglib2 mimetype exthandler $(PNG_REQUIRES) $(ZLIB_REQUIRES) +REQUIRES=xpcom string dom rdf rdfutil layout content widget locale gfx2 necko docshell view timer imglib2 mimetype exthandler $(PNG_REQUIRES) $(ZLIB_REQUIRES) CPPSRCS= \ inDOMDataSource.cpp \ diff --git a/mozilla/extensions/inspector/build/src/Makefile.in b/mozilla/extensions/inspector/build/src/Makefile.in index 9dfe18cb94f..e0baf973d74 100644 --- a/mozilla/extensions/inspector/build/src/Makefile.in +++ b/mozilla/extensions/inspector/build/src/Makefile.in @@ -30,7 +30,7 @@ MODULE = inspector LIBRARY_NAME = inspector EXPORT_LIBRARY = 1 SHORT_LIBNAME = inspectr -REQUIRES = xpcom string layout dom widget rdf rdfutil locale gfx2 timer necko imglib2 +REQUIRES = xpcom string layout content dom widget rdf rdfutil locale gfx2 timer necko imglib2 IS_COMPONENT = 1 MODULE_NAME = nsInspectorModule diff --git a/mozilla/extensions/p3p/src/Makefile.in b/mozilla/extensions/p3p/src/Makefile.in index 69cf8b67582..56d4dbdbd7b 100644 --- a/mozilla/extensions/p3p/src/Makefile.in +++ b/mozilla/extensions/p3p/src/Makefile.in @@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsP3PModule -REQUIRES = xpcom string docshell necko dom layout rdf widget xmlextras cookie pref intl uriloader htmlparser windowwatcher +REQUIRES = xpcom string docshell necko dom layout content rdf widget xmlextras cookie pref intl uriloader htmlparser windowwatcher CPPSRCS = \ nsP3PModule.cpp \ diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in index e2af96b71ee..7a4354a84cf 100644 --- a/mozilla/extensions/transformiix/build/Makefile.in +++ b/mozilla/extensions/transformiix/build/Makefile.in @@ -30,7 +30,7 @@ MODULE = transformiix LIBRARY_NAME = transformiix EXPORT_LIBRARY = 1 SHORT_LIBNAME = t8iix -REQUIRES = xpcom string dom layout widget xsl_doc necko +REQUIRES = xpcom string dom layout content widget xsl_doc necko IS_COMPONENT = 1 MODULE_NAME = TransformiixModule diff --git a/mozilla/extensions/transformiix/source/xml/Makefile.in b/mozilla/extensions/transformiix/source/xml/Makefile.in index 9d060a78174..ac964f212c6 100644 --- a/mozilla/extensions/transformiix/source/xml/Makefile.in +++ b/mozilla/extensions/transformiix/source/xml/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk ifndef TX_EXE MODULE = transformiix -REQUIRES = string xpcom dom layout widget +REQUIRES = string xpcom dom layout content widget endif DIRS = dom parser util diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in index dafcc02b8e5..532c33f1d82 100644 --- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in +++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in @@ -27,7 +27,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = transformiix -REQUIRES = string xpcom dom layout widget necko +REQUIRES = string xpcom dom layout content widget necko CPPSRCS = MozillaAttr.cpp \ MozillaCDATASection.cpp \ diff --git a/mozilla/extensions/transformiix/source/xml/parser/Makefile.in b/mozilla/extensions/transformiix/source/xml/parser/Makefile.in index a353fa3d4dc..a1015ca3491 100644 --- a/mozilla/extensions/transformiix/source/xml/parser/Makefile.in +++ b/mozilla/extensions/transformiix/source/xml/parser/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk ifndef TX_EXE MODULE = transformiix -REQUIRES = string xpcom necko dom layout widget js appshell xpconnect caps +REQUIRES = string xpcom necko dom layout content widget js appshell xpconnect caps endif CPPSRCS = XMLParser.cpp diff --git a/mozilla/extensions/transformiix/source/xml/util/Makefile.in b/mozilla/extensions/transformiix/source/xml/util/Makefile.in index d5d5bb77077..3ed0584718a 100644 --- a/mozilla/extensions/transformiix/source/xml/util/Makefile.in +++ b/mozilla/extensions/transformiix/source/xml/util/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk ifndef TX_EXE MODULE = transformiix -REQUIRES = string xpcom dom layout widget +REQUIRES = string xpcom dom layout content widget endif CPPSRCS = DOMHelper.cpp diff --git a/mozilla/extensions/transformiix/source/xpath/Makefile.in b/mozilla/extensions/transformiix/source/xpath/Makefile.in index 43e1cc0905e..54012694edd 100644 --- a/mozilla/extensions/transformiix/source/xpath/Makefile.in +++ b/mozilla/extensions/transformiix/source/xpath/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk ifndef TX_EXE MODULE = transformiix -REQUIRES = string xpcom dom layout widget +REQUIRES = string xpcom dom layout content widget endif CPPSRCS = AdditiveExpr.cpp \ diff --git a/mozilla/extensions/transformiix/source/xslt/Makefile.in b/mozilla/extensions/transformiix/source/xslt/Makefile.in index 44590a13322..492b3e0db56 100644 --- a/mozilla/extensions/transformiix/source/xslt/Makefile.in +++ b/mozilla/extensions/transformiix/source/xslt/Makefile.in @@ -30,7 +30,7 @@ DIRS = functions util ifndef TX_EXE MODULE = transformiix -REQUIRES = string xpcom dom layout widget necko xsl_doc +REQUIRES = string xpcom dom layout content widget necko xsl_doc endif CPPSRCS = Names.cpp \ diff --git a/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in b/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in index 25383f7afaa..0f10f2d7e6f 100644 --- a/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in +++ b/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk ifndef TX_EXE MODULE = transformiix -REQUIRES = string xpcom dom layout widget +REQUIRES = string xpcom dom layout content widget endif CPPSRCS = CurrentFunctionCall.cpp \ diff --git a/mozilla/extensions/transformiix/source/xslt/util/Makefile.in b/mozilla/extensions/transformiix/source/xslt/util/Makefile.in index a28e2d177e8..fd16f54de9a 100644 --- a/mozilla/extensions/transformiix/source/xslt/util/Makefile.in +++ b/mozilla/extensions/transformiix/source/xslt/util/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk ifndef TX_EXE MODULE = transformiix -REQUIRES = string xpcom dom layout widget +REQUIRES = string xpcom dom layout content widget endif CPPSRCS = NodeSorter.cpp NodeStack.cpp diff --git a/mozilla/extensions/vixen/base/src/Makefile.in b/mozilla/extensions/vixen/base/src/Makefile.in index 41b63a38ad0..c0a01cabd32 100644 --- a/mozilla/extensions/vixen/base/src/Makefile.in +++ b/mozilla/extensions/vixen/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = vixen LIBRARY_NAME = vixen_s -REQUIRES = xpcom string layout dom widget +REQUIRES = xpcom string layout content dom widget CPPSRCS = \ nsVixenShell.cpp \ diff --git a/mozilla/extensions/wallet/cookieviewer/Makefile.in b/mozilla/extensions/wallet/cookieviewer/Makefile.in index 49b0c003379..645a4a0e14c 100644 --- a/mozilla/extensions/wallet/cookieviewer/Makefile.in +++ b/mozilla/extensions/wallet/cookieviewer/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = walletviewers LIBRARY_NAME = cookieviewer_s XPIDL_MODULE = cookieviewer -REQUIRES = xpcom string dom js layout widget cookie docshell uriloader locale necko gfx2 +REQUIRES = xpcom string dom js layout content widget cookie docshell uriloader locale necko gfx2 CPPSRCS = nsCookieViewer.cpp diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in index b9a2c7cdd83..18cf7867233 100644 --- a/mozilla/extensions/wallet/src/Makefile.in +++ b/mozilla/extensions/wallet/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = wallet EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWalletModule -REQUIRES = xpcom string necko dom layout widget uriloader pref webshell docshell appshell intl windowwatcher +REQUIRES = xpcom string necko dom layout content widget uriloader pref webshell docshell appshell intl windowwatcher CPPSRCS = \ nsWalletFactory.cpp \ diff --git a/mozilla/extensions/webservices/soap/src/Makefile.in b/mozilla/extensions/webservices/soap/src/Makefile.in index 9c92f703175..767ed39df56 100644 --- a/mozilla/extensions/webservices/soap/src/Makefile.in +++ b/mozilla/extensions/webservices/soap/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xmlextras LIBRARY_NAME = xmlextrassoap_s -REQUIRES = xpcom string caps dom js widget layout xpconnect necko +REQUIRES = xpcom string caps dom js widget layout content xpconnect necko CPPSRCS = \ nsSOAPCall.cpp \ diff --git a/mozilla/extensions/xmlextras/base/src/Makefile.in b/mozilla/extensions/xmlextras/base/src/Makefile.in index f158fe8c7b6..7dfe9b98e5f 100644 --- a/mozilla/extensions/xmlextras/base/src/Makefile.in +++ b/mozilla/extensions/xmlextras/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xmlextras LIBRARY_NAME = xmlextrasbase_s -REQUIRES = xpcom string dom js layout widget caps uconv necko docshell xpconnect webbrwsr +REQUIRES = xpcom string dom js layout content widget caps uconv necko docshell xpconnect webbrwsr CPPSRCS = \ nsDOMSerializer.cpp \ diff --git a/mozilla/extensions/xmlextras/build/src/Makefile.in b/mozilla/extensions/xmlextras/build/src/Makefile.in index 5b4aa1edc8d..495c35cc401 100644 --- a/mozilla/extensions/xmlextras/build/src/Makefile.in +++ b/mozilla/extensions/xmlextras/build/src/Makefile.in @@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1 SHORT_LIBNAME = xmlextra IS_COMPONENT = 1 MODULE_NAME = nsXMLExtrasModule -REQUIRES = xpcom string dom js layout widget caps necko webbrwsr embedcomponents +REQUIRES = xpcom string dom js layout content widget caps necko webbrwsr embedcomponents CPPSRCS = nsXMLExtrasModule.cpp diff --git a/mozilla/extensions/xmlextras/soap/src/Makefile.in b/mozilla/extensions/xmlextras/soap/src/Makefile.in index 9c92f703175..767ed39df56 100644 --- a/mozilla/extensions/xmlextras/soap/src/Makefile.in +++ b/mozilla/extensions/xmlextras/soap/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xmlextras LIBRARY_NAME = xmlextrassoap_s -REQUIRES = xpcom string caps dom js widget layout xpconnect necko +REQUIRES = xpcom string caps dom js widget layout content xpconnect necko CPPSRCS = \ nsSOAPCall.cpp \ diff --git a/mozilla/extensions/xmlextras/tests/Makefile.in b/mozilla/extensions/xmlextras/tests/Makefile.in index 9b39968cb25..be7c14e441d 100644 --- a/mozilla/extensions/xmlextras/tests/Makefile.in +++ b/mozilla/extensions/xmlextras/tests/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom string xmlextras necko dom layout widget +REQUIRES = xpcom string xmlextras necko dom layout content widget CPPSRCS = \ TestXMLExtras.cpp \ diff --git a/mozilla/extensions/xmlterm/base/Makefile.in b/mozilla/extensions/xmlterm/base/Makefile.in index 8f3593d6f44..5fb4ff1af6d 100644 --- a/mozilla/extensions/xmlterm/base/Makefile.in +++ b/mozilla/extensions/xmlterm/base/Makefile.in @@ -67,7 +67,7 @@ CPPSRCS = \ MODULE = xmlterm LIBRARY_NAME = xmlterm_s -REQUIRES = xpcom string layout docshell caps pref dom view widget necko webshell uriloader appshell locale +REQUIRES = xpcom string layout content docshell caps pref dom view widget necko webshell uriloader appshell locale XPIDLSRCS = \ mozILineTerm.idl \ diff --git a/mozilla/extensions/xmlterm/build/Makefile.in b/mozilla/extensions/xmlterm/build/Makefile.in index aa61765e511..a164eb0dd49 100644 --- a/mozilla/extensions/xmlterm/build/Makefile.in +++ b/mozilla/extensions/xmlterm/build/Makefile.in @@ -52,7 +52,7 @@ EXPORT_LIBRARY = 1 SHORT_LIBNAME = xmlterm IS_COMPONENT = 1 -REQUIRES = xpcom string dom layout widget uriloader webshell necko +REQUIRES = xpcom string dom layout content widget uriloader webshell necko MODULE_NAME = XMLTermModule diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in index 9cd5f4c4e19..632305d6723 100644 --- a/mozilla/gfx/src/Makefile.in +++ b/mozilla/gfx/src/Makefile.in @@ -30,7 +30,7 @@ MODULE = layout EXPORTS = nsFontList.h LIBRARY_NAME = gkgfx EXPORT_LIBRARY = 1 -REQUIRES = xpcom string widget locale view necko pref gfx2 imglib2 intl +REQUIRES = xpcom string content widget locale view necko pref gfx2 imglib2 intl ifeq ($(MOZ_WIDGET_TOOLKIT),os2) DIRS = diff --git a/mozilla/gfx/src/xlib/Makefile.in b/mozilla/gfx/src/xlib/Makefile.in index e6107563c51..ec28c79f95b 100644 --- a/mozilla/gfx/src/xlib/Makefile.in +++ b/mozilla/gfx/src/xlib/Makefile.in @@ -33,7 +33,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxXlibModule -REQUIRES = xpcom string xlibrgb widget dom layout appshell js necko pref util view uconv locale unicharutil gfx2 mozcomps windowwatcher intl +REQUIRES = xpcom string xlibrgb widget dom layout content appshell js necko pref util view uconv locale unicharutil gfx2 mozcomps windowwatcher intl CPPSRCS = \ nsDeviceContextSpecFactoryX.cpp \ diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in index 679cf12dc26..f1ca7770445 100644 --- a/mozilla/htmlparser/src/Makefile.in +++ b/mozilla/htmlparser/src/Makefile.in @@ -32,8 +32,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsParserModule SHORT_LIBNAME = gkparser -REQUIRES = xpcom string necko util uconv expat layout dom pref nkcache \ - intl widget +REQUIRES = xpcom string necko util uconv expat layout content dom pref nkcache intl widget SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \ diff --git a/mozilla/htmlparser/tests/outsinks/Makefile.in b/mozilla/htmlparser/tests/outsinks/Makefile.in index 4c2d9803687..094dff5cabc 100644 --- a/mozilla/htmlparser/tests/outsinks/Makefile.in +++ b/mozilla/htmlparser/tests/outsinks/Makefile.in @@ -27,7 +27,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk PROGRAM = TestOutput$(BIN_SUFFIX) -REQUIRES = xpcom string htmlparser necko layout dom +REQUIRES = xpcom string htmlparser necko layout content dom CPPSRCS = \ Convert.cpp \ diff --git a/mozilla/intl/chardet/src/Makefile.in b/mozilla/intl/chardet/src/Makefile.in index 91c79ef074c..edeaec4e4f1 100644 --- a/mozilla/intl/chardet/src/Makefile.in +++ b/mozilla/intl/chardet/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = chardet EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsCharDetModule -REQUIRES = xpcom string uconv webshell uriloader docshell htmlparser dom necko widget layout embedcomponents +REQUIRES = xpcom string uconv webshell uriloader docshell htmlparser dom necko widget layout content embedcomponents CPPSRCS = \ nsCharDetModule.cpp \ diff --git a/mozilla/layout/base/src/Makefile.in b/mozilla/layout/base/src/Makefile.in index 75e2a73add5..5be924c25e5 100644 --- a/mozilla/layout/base/src/Makefile.in +++ b/mozilla/layout/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkbase_s -REQUIRES = xpcom string dom widget view locale timer htmlparser webshell necko uconv pref uriloader unicharutil docshell imglib2 gfx2 +REQUIRES = xpcom string dom content widget view locale timer htmlparser webshell necko uconv pref uriloader unicharutil docshell imglib2 gfx2 CPPSRCS = \ nsAutoCopy.cpp \ diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index c7f6c232e4c..5c26c1740af 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -33,7 +33,7 @@ SHORT_LIBNAME = gkhtml IS_COMPONENT = 1 MODULE_NAME = nsLayoutModule EXTRA_DSO_LIBS = gkgfx -REQUIRES = xpcom string widget locale timer +REQUIRES = xpcom string content widget locale timer CPPSRCS = \ nsLayoutModule.cpp \ diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in index 9989306979e..82bc8788ec5 100644 --- a/mozilla/layout/html/base/src/Makefile.in +++ b/mozilla/layout/html/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkhtmlbase_s -REQUIRES = xpcom string dom widget locale view necko js caps pref htmlparser webshell plugin timer docshell mimetype webbrwsr oji util unicharutil lwbrk gfx2 imglib2 accessibility xpconnect java exthandler +REQUIRES = xpcom string dom content widget locale view necko js caps pref htmlparser webshell plugin timer docshell mimetype webbrwsr oji util unicharutil lwbrk gfx2 imglib2 accessibility xpconnect java exthandler CPPSRCS = \ nsSelectsAreaFrame.cpp \ diff --git a/mozilla/layout/html/document/src/Makefile.in b/mozilla/layout/html/document/src/Makefile.in index e1476000041..94cb1200966 100644 --- a/mozilla/layout/html/document/src/Makefile.in +++ b/mozilla/layout/html/document/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkhtmldoc_s -REQUIRES = xpcom string widget dom necko locale view js webshell docshell caps pref uriloader shistory xpconnect accessibility +REQUIRES = xpcom string content widget dom necko locale view js webshell docshell caps pref uriloader shistory xpconnect accessibility CPPSRCS = \ nsFrameFrame.cpp \ diff --git a/mozilla/layout/html/forms/src/Makefile.in b/mozilla/layout/html/forms/src/Makefile.in index 78c958bef40..fadc2967fa7 100644 --- a/mozilla/layout/html/forms/src/Makefile.in +++ b/mozilla/layout/html/forms/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkhtmlforms_s -REQUIRES = xpcom string locale widget view dom js htmlparser necko webshell caps editor intl uconv exthandler mimetype txmgr xuldoc gfx2 imglib2 accessibility xpconnect unicharutil timer pref +REQUIRES = xpcom string locale content widget view dom js htmlparser necko webshell caps editor intl uconv exthandler mimetype txmgr xuldoc gfx2 imglib2 accessibility xpconnect unicharutil timer pref CPPSRCS = \ nsButtonFrameRenderer.cpp \ diff --git a/mozilla/layout/html/style/src/Makefile.in b/mozilla/layout/html/style/src/Makefile.in index 59479537926..82926fdadf4 100644 --- a/mozilla/layout/html/style/src/Makefile.in +++ b/mozilla/layout/html/style/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkhtmlstyle_s -REQUIRES = xpcom string dom widget timer locale view necko webshell pref docshell plugin xuldoc imglib2 gfx2 +REQUIRES = xpcom string dom content widget timer locale view necko webshell pref docshell plugin xuldoc imglib2 gfx2 CPPSRCS = \ nsCSSFrameConstructor.cpp \ diff --git a/mozilla/layout/html/table/src/Makefile.in b/mozilla/layout/html/table/src/Makefile.in index a53d34ff806..d1eff014942 100644 --- a/mozilla/layout/html/table/src/Makefile.in +++ b/mozilla/layout/html/table/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkhtmltable_s -REQUIRES = xpcom string dom widget locale webshell view accessibility +REQUIRES = xpcom string dom content widget locale webshell view accessibility CPPSRCS = \ BasicTableLayoutStrategy.cpp \ diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in index 6b9710491fd..611a79b6768 100644 --- a/mozilla/layout/html/tests/Makefile.in +++ b/mozilla/layout/html/tests/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom string layout +REQUIRES = xpcom string layout content SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) diff --git a/mozilla/layout/mathml/base/src/Makefile.in b/mozilla/layout/mathml/base/src/Makefile.in index 6fa07dd0e17..c4c6b43f174 100644 --- a/mozilla/layout/mathml/base/src/Makefile.in +++ b/mozilla/layout/mathml/base/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkmathmlbase_s -REQUIRES = xpcom string dom widget webshell locale view necko docshell webbrwsr +REQUIRES = xpcom string dom content widget webshell locale view necko docshell webbrwsr LOCAL_INCLUDES = \ -I$(srcdir)/../../../html/style/src \ diff --git a/mozilla/layout/mathml/content/src/Makefile.in b/mozilla/layout/mathml/content/src/Makefile.in index dd7ef1df9be..1be908cd349 100644 --- a/mozilla/layout/mathml/content/src/Makefile.in +++ b/mozilla/layout/mathml/content/src/Makefile.in @@ -30,7 +30,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkmathmlcon_s -REQUIRES = xpcom string necko +REQUIRES = xpcom string necko content include $(topsrcdir)/config/config.mk diff --git a/mozilla/layout/svg/base/src/Makefile.in b/mozilla/layout/svg/base/src/Makefile.in index cbe3a3292ce..b0e44255297 100644 --- a/mozilla/layout/svg/base/src/Makefile.in +++ b/mozilla/layout/svg/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gksvgbase_s -REQUIRES = xpcom string widget dom locale view pref +REQUIRES = xpcom string content widget dom locale view pref CPPSRCS = \ nsSVGContainerFrame.cpp \ diff --git a/mozilla/layout/svg/content/src/Makefile.in b/mozilla/layout/svg/content/src/Makefile.in index c998af3d09b..49bab85c6ae 100644 --- a/mozilla/layout/svg/content/src/Makefile.in +++ b/mozilla/layout/svg/content/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gksvgcon_s -REQUIRES = xpcom string +REQUIRES = xpcom string content CPPSRCS = nsSVGAtoms.cpp diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in index 8b6a7653387..8e9dbe90118 100644 --- a/mozilla/layout/xul/base/src/Makefile.in +++ b/mozilla/layout/xul/base/src/Makefile.in @@ -30,7 +30,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkxulbase_s -REQUIRES = xpcom string dom locale widget view timer docshell necko editor htmlparser webshell pref intl gfx2 imglib2 unicharutil +REQUIRES = xpcom string dom locale content widget view timer docshell necko editor htmlparser webshell pref intl gfx2 imglib2 unicharutil CPPSRCS = \ nsScrollBoxObject.cpp \ diff --git a/mozilla/layout/xul/base/src/outliner/src/Makefile.in b/mozilla/layout/xul/base/src/outliner/src/Makefile.in index 2ba42e6216f..9580ee7ccb1 100644 --- a/mozilla/layout/xul/base/src/outliner/src/Makefile.in +++ b/mozilla/layout/xul/base/src/outliner/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkxuloutliner_s -REQUIRES = xpcom string dom widget timer locale view xultmpl rdf necko gfx2 imglib2 +REQUIRES = xpcom string dom content widget timer locale view xultmpl rdf necko gfx2 imglib2 CPPSRCS = \ nsOutlinerBodyFrame.cpp \ diff --git a/mozilla/mailnews/addrbook/src/Makefile.in b/mozilla/mailnews/addrbook/src/Makefile.in index fdd1a24ef40..69f4ef2d40e 100644 --- a/mozilla/mailnews/addrbook/src/Makefile.in +++ b/mozilla/mailnews/addrbook/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = addrbook LIBRARY_NAME = addrbook_s META_COMPONENT = mail -REQUIRES = xpcom string rdf rdfutil appshell dom layout widget mork docshell pref necko locale webshell uconv msgbase msgbaseutil mime msgcompose appcomps +REQUIRES = xpcom string rdf rdfutil appshell dom layout content widget mork docshell pref necko locale webshell uconv msgbase msgbaseutil mime msgcompose appcomps CPPSRCS = \ nsAddressBook.cpp \ diff --git a/mozilla/mailnews/base/src/Makefile.in b/mozilla/mailnews/base/src/Makefile.in index c221cfc0e7c..f86f3ae22b1 100644 --- a/mozilla/mailnews/base/src/Makefile.in +++ b/mozilla/mailnews/base/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = msgbase LIBRARY_NAME = msgbase_s META_COMPONENT = mail -REQUIRES = xpcom string necko dom appshell appcomps uconv intl htmlparser widget docshell rdf editor layout mailnews locale msgbaseutil webshell txmgr msgcompose msgdb uriloader pref msglocal msgimap timer mork msgnews addrbook prefmigr chrome mime mimetype windowwatcher +REQUIRES = xpcom string necko dom appshell appcomps uconv intl htmlparser widget docshell rdf editor layout content mailnews locale msgbaseutil webshell txmgr msgcompose msgdb uriloader pref msglocal msgimap timer mork msgnews addrbook prefmigr chrome mime mimetype windowwatcher CPPSRCS = \ nsMessenger.cpp \ diff --git a/mozilla/mailnews/compose/src/Makefile.in b/mozilla/mailnews/compose/src/Makefile.in index cd8a34be73c..7ecd0ce2730 100644 --- a/mozilla/mailnews/compose/src/Makefile.in +++ b/mozilla/mailnews/compose/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = msgcompose LIBRARY_NAME = msgcompose_s META_COMPONENT = mail -REQUIRES = xpcom string dom editor uriloader msgbase mailnews necko mime pref intl locale layout msgbaseutil msgdb rdf appshell msgimap msgnews uconv docshell webshell addrbook widget htmlparser txmgr exthandler mork wallet nkcache mimetype windowwatcher +REQUIRES = xpcom string dom editor uriloader msgbase mailnews necko mime pref intl locale layout content msgbaseutil msgdb rdf appshell msgimap msgnews uconv docshell webshell addrbook widget htmlparser txmgr exthandler mork wallet nkcache mimetype windowwatcher CPPSRCS = \ nsMsgCompFields.cpp \ diff --git a/mozilla/modules/libimg/gifcom/Makefile.in b/mozilla/modules/libimg/gifcom/Makefile.in index efafa2f8f48..50d2e4e220c 100644 --- a/mozilla/modules/libimg/gifcom/Makefile.in +++ b/mozilla/modules/libimg/gifcom/Makefile.in @@ -30,7 +30,7 @@ LIBRARY_NAME = nsgif EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGIFModule -REQUIRES = xpcom string img layout util +REQUIRES = xpcom string img layout content util CPPSRCS = \ gif.cpp \ diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index 712e35eb842..47680c16ae6 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -32,7 +32,7 @@ LIBRARY_NAME = gkplugin EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsPluginModule -REQUIRES = xpcom string java pref necko gtkxtbin webshell caps intl dom layout widget cookie mimetype oji exthandler docshell webbrwsr timer windowwatcher +REQUIRES = xpcom string java pref necko gtkxtbin webshell caps intl dom layout content widget cookie mimetype oji exthandler docshell webbrwsr timer windowwatcher # for xlib port REQUIRES += xlibrgb diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in index 679cf12dc26..f1ca7770445 100644 --- a/mozilla/parser/htmlparser/src/Makefile.in +++ b/mozilla/parser/htmlparser/src/Makefile.in @@ -32,8 +32,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsParserModule SHORT_LIBNAME = gkparser -REQUIRES = xpcom string necko util uconv expat layout dom pref nkcache \ - intl widget +REQUIRES = xpcom string necko util uconv expat layout content dom pref nkcache intl widget SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \ diff --git a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in index 4c2d9803687..094dff5cabc 100644 --- a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in +++ b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in @@ -27,7 +27,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk PROGRAM = TestOutput$(BIN_SUFFIX) -REQUIRES = xpcom string htmlparser necko layout dom +REQUIRES = xpcom string htmlparser necko layout content dom CPPSRCS = \ Convert.cpp \ diff --git a/mozilla/rdf/base/src/Makefile.in b/mozilla/rdf/base/src/Makefile.in index e2195cf772a..36b96402141 100644 --- a/mozilla/rdf/base/src/Makefile.in +++ b/mozilla/rdf/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdfbase LIBRARY_NAME = rdfbase_s -REQUIRES = xpcom string rdf rdfutil necko layout htmlparser js +REQUIRES = xpcom string rdf rdfutil necko layout content htmlparser js CPPSRCS = \ nsCompositeDataSource.cpp \ diff --git a/mozilla/rdf/build/Makefile.in b/mozilla/rdf/build/Makefile.in index 7ff8f244da2..ad5a5f10f50 100644 --- a/mozilla/rdf/build/Makefile.in +++ b/mozilla/rdf/build/Makefile.in @@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsRDFModule EXTRA_DSO_LIBS = -REQUIRES = xpcom string layout htmlparser necko +REQUIRES = xpcom string content htmlparser necko CPPSRCS = \ nsRDFModule.cpp \ diff --git a/mozilla/rdf/chrome/build/Makefile.in b/mozilla/rdf/chrome/build/Makefile.in index 75795e2cb50..a825e494a00 100644 --- a/mozilla/rdf/chrome/build/Makefile.in +++ b/mozilla/rdf/chrome/build/Makefile.in @@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsChromeModule -REQUIRES = xpcom string rdf necko layout +REQUIRES = xpcom string rdf necko layout content CPPSRCS = nsChromeFactory.cpp diff --git a/mozilla/rdf/chrome/src/Makefile.in b/mozilla/rdf/chrome/src/Makefile.in index 7c5c62e0397..6c9a6ea8ef3 100644 --- a/mozilla/rdf/chrome/src/Makefile.in +++ b/mozilla/rdf/chrome/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdfbase LIBRARY_NAME = chrome_s -REQUIRES = xpcom string rdf xuldoc layout necko dom intl widget js appshell chrome caps pref docshell imglib2 xpconnect +REQUIRES = xpcom string rdf xuldoc layout content necko dom intl widget js appshell chrome caps pref docshell imglib2 xpconnect CPPSRCS = \ nsChromeRegistry.cpp \ diff --git a/mozilla/rdf/tests/domds/Makefile.in b/mozilla/rdf/tests/domds/Makefile.in index dd375d93608..aff911c3ed7 100644 --- a/mozilla/rdf/tests/domds/Makefile.in +++ b/mozilla/rdf/tests/domds/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = rdfdomds IS_COMPONENT = 1 MODULE_NAME = nsRDFDOMViewerModule -REQUIRES = xpcom string rdf dom layout widget js locale docshell necko webshell htmlparser uriloader view rdfutil +REQUIRES = xpcom string rdf dom layout content widget js locale docshell necko webshell htmlparser uriloader view rdfutil DIRS = resources diff --git a/mozilla/uriloader/base/Makefile.in b/mozilla/uriloader/base/Makefile.in index 40bdcecce7d..b5c7f70263c 100644 --- a/mozilla/uriloader/base/Makefile.in +++ b/mozilla/uriloader/base/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = uriloader LIBRARY_NAME = uriloaderbase_s -REQUIRES = xpcom string necko dom exthandler js docshell layout widget caps intl webshell xpconnect +REQUIRES = xpcom string necko dom exthandler js docshell layout content widget caps intl webshell xpconnect CPPSRCS = \ nsURILoader.cpp \ diff --git a/mozilla/view/src/Makefile.in b/mozilla/view/src/Makefile.in index b6310e8e1a2..233cf63246e 100644 --- a/mozilla/view/src/Makefile.in +++ b/mozilla/view/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = gkview EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsViewModule -REQUIRES = xpcom string layout widget dom locale timer pref +REQUIRES = xpcom string layout content widget dom locale timer pref EXTRA_DSO_LIBS = gkgfx diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index 2eb4c02a09d..f98b34b9824 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/webshell/tests/viewer/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk DIRS := public MODULE = webshell_tests -REQUIRES = xpcom string webshell widget layout dom webbrwsr docshell util uriloader locale necko htmlparser view timer pref intl editor cookie xpconnect +REQUIRES = xpcom string webshell widget layout content dom webbrwsr docshell util uriloader locale necko htmlparser view timer pref intl editor cookie xpconnect PROGRAM := viewer$(BIN_SUFFIX) diff --git a/mozilla/webshell/tests/viewer/unix/qt/Makefile.in b/mozilla/webshell/tests/viewer/unix/qt/Makefile.in index 0737ee43342..0b3c5cad57d 100644 --- a/mozilla/webshell/tests/viewer/unix/qt/Makefile.in +++ b/mozilla/webshell/tests/viewer/unix/qt/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = webshell_tests LIBRARY_NAME = viewer_qt_s -REQUIRES = xpcom string docshell necko dom widget timer layout uriloader gfx2 webbrwsr webshell locale util +REQUIRES = xpcom string docshell necko dom widget timer layout content uriloader gfx2 webbrwsr webshell locale util CPPSRCS = \ nsQtMain.cpp \ diff --git a/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in b/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in index bdeb494aec5..332e8117dc4 100644 --- a/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in +++ b/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = webshell_tests LIBRARY_NAME = viewer_xlib_s -REQUIRES = xpcom string webshell htmlparser webbrwsr necko widget layout dom js uriloader view docshell util locale timer gfx2 +REQUIRES = xpcom string webshell htmlparser webbrwsr necko widget layout content dom js uriloader view docshell util locale timer gfx2 CPPSRCS = nsXlibMain.cpp diff --git a/mozilla/widget/src/beos/Makefile.in b/mozilla/widget/src/beos/Makefile.in index e714066d663..6a2a8c7228a 100644 --- a/mozilla/widget/src/beos/Makefile.in +++ b/mozilla/widget/src/beos/Makefile.in @@ -30,7 +30,7 @@ MODULE = widget LIBRARY_NAME = widget_beos EXPORT_LIBRARY = 1 -REQUIRES = xpcom string webshell appshell layout timer gfx dom intl uconv necko pref +REQUIRES = xpcom string webshell appshell layout content timer gfx dom intl uconv necko pref CPPSRCS = \ nsAppShell.cpp \ diff --git a/mozilla/widget/src/photon/Makefile.in b/mozilla/widget/src/photon/Makefile.in index 7b9f3ad25d4..39ce9772da3 100644 --- a/mozilla/widget/src/photon/Makefile.in +++ b/mozilla/widget/src/photon/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = widget_photon EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWidgetPhModule -REQUIRES = xpcom string layout pref dom appshell timer uconv necko img view util rdf uriloader docshell msgcompose msgbase editor windowwatcher mailnews intl +REQUIRES = xpcom string layout content pref dom appshell timer uconv necko img view util rdf uriloader docshell msgcompose msgbase editor windowwatcher mailnews intl CPPSRCS = \ nsDragService.cpp \ diff --git a/mozilla/widget/src/qt/Makefile.in b/mozilla/widget/src/qt/Makefile.in index c5b86face04..ed7c2980716 100644 --- a/mozilla/widget/src/qt/Makefile.in +++ b/mozilla/widget/src/qt/Makefile.in @@ -30,7 +30,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widget_qt EXPORT_LIBRARY = 1 -REQUIRES = xpcom string layout dom gfx2 appshell pref uconv +REQUIRES = xpcom string layout content dom gfx2 appshell pref uconv IS_COMPONENT = 1 MODULE_NAME = nsWidgetQTModule diff --git a/mozilla/widget/src/xlib/Makefile.in b/mozilla/widget/src/xlib/Makefile.in index c30a08c46cb..0d2904349c7 100644 --- a/mozilla/widget/src/xlib/Makefile.in +++ b/mozilla/widget/src/xlib/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = widget_xlib EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWidgetXLIBModule -REQUIRES = xpcom string appshell layout dom js xlibrgb timer uconv pref webshell htmlparser view necko gfx2 +REQUIRES = xpcom string appshell layout content dom js xlibrgb timer uconv pref webshell htmlparser view necko gfx2 DIRS = window_service diff --git a/mozilla/widget/src/xpwidgets/Makefile.in b/mozilla/widget/src/xpwidgets/Makefile.in index e1bcf03ac2b..5bcee43b5a3 100644 --- a/mozilla/widget/src/xpwidgets/Makefile.in +++ b/mozilla/widget/src/xpwidgets/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = xpwidgets_s -REQUIRES = xpcom string layout dom pref docshell view intl locale necko htmlparser uconv unicharutil +REQUIRES = xpcom string layout content dom pref docshell view intl locale necko htmlparser uconv unicharutil DEFINES += -DUSE_TLS_FOR_TOOLKIT diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in index 02256f85acb..7d72648579c 100644 --- a/mozilla/xpfe/appshell/src/Makefile.in +++ b/mozilla/xpfe/appshell/src/Makefile.in @@ -32,7 +32,7 @@ MODULE = appshell LIBRARY_NAME = nsappshell EXPORT_LIBRARY = 1 SHORT_LIBNAME = appshell -REQUIRES = xpcom string widget docshell webshell layout dom necko uriloader js locale webbrwsr rdf pref xpconnect timer intl xul windowwatcher browser mozcomps caps profile +REQUIRES = xpcom string widget docshell webshell layout content dom necko uriloader js locale webbrwsr rdf pref xpconnect timer intl xul windowwatcher browser mozcomps caps profile CPPSRCS = \ nsChromeTreeOwner.cpp \ diff --git a/mozilla/xpfe/browser/src/Makefile.in b/mozilla/xpfe/browser/src/Makefile.in index 0ff1c732d7c..b4feb8ba982 100644 --- a/mozilla/xpfe/browser/src/Makefile.in +++ b/mozilla/xpfe/browser/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = mozbrwsr EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsBrowserModule -REQUIRES = xpcom string webshell necko shistory widget layout docshell appshell dom timer uriloader pref editor appcomps rdf webbrwsr uconv chardet windowwatcher +REQUIRES = xpcom string webshell necko shistory widget layout content docshell appshell dom timer uriloader pref editor appcomps rdf webbrwsr uconv chardet windowwatcher CPPSRCS = nsBrowserInstance.cpp diff --git a/mozilla/xpfe/components/autocomplete/test/Makefile.in b/mozilla/xpfe/components/autocomplete/test/Makefile.in index 8ec7bdf3a59..8aabf213c48 100644 --- a/mozilla/xpfe/components/autocomplete/test/Makefile.in +++ b/mozilla/xpfe/components/autocomplete/test/Makefile.in @@ -27,7 +27,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = appcomps -REQUIRES = xpcom layout dom js +REQUIRES = xpcom layout content dom js include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/build/Makefile.in b/mozilla/xpfe/components/build/Makefile.in index d2d310236ee..d22f58e4426 100644 --- a/mozilla/xpfe/components/build/Makefile.in +++ b/mozilla/xpfe/components/build/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = appcomps EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = application -REQUIRES = xpcom string layout rdf necko timer intl mork widget dom pref docshell webshell +REQUIRES = xpcom string layout content rdf necko timer intl mork widget dom pref docshell webshell CPPSRCS = nsModule.cpp diff --git a/mozilla/xpfe/components/directory/Makefile.in b/mozilla/xpfe/components/directory/Makefile.in index 7dd2de1ecd3..818fc0683df 100644 --- a/mozilla/xpfe/components/directory/Makefile.in +++ b/mozilla/xpfe/components/directory/Makefile.in @@ -30,7 +30,7 @@ MODULE = appcomps LIBRARY_NAME = directory_s XPIDL_MODULE=directory XPIDLSRCS = nsIHTTPIndex.idl -REQUIRES = xpcom string necko rdf layout timer js xpconnect docshell widget dom webshell uconv uriloader windowwatcher +REQUIRES = xpcom string necko rdf layout content timer js xpconnect docshell widget dom webshell uconv uriloader windowwatcher CPPSRCS = nsDirectoryViewer.cpp diff --git a/mozilla/xpfe/components/find/src/Makefile.in b/mozilla/xpfe/components/find/src/Makefile.in index 745624bf74e..d3a105bc7c6 100644 --- a/mozilla/xpfe/components/find/src/Makefile.in +++ b/mozilla/xpfe/components/find/src/Makefile.in @@ -32,7 +32,7 @@ LIBRARY_NAME = mozfind EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsFindComponent -REQUIRES = xpcom string dom layout widget editor necko txtsvc docshell +REQUIRES = xpcom string dom layout content widget editor necko txtsvc docshell CPPSRCS = \ nsFindComponent.cpp \ diff --git a/mozilla/xpfe/components/ucth/src/Makefile.in b/mozilla/xpfe/components/ucth/src/Makefile.in index 5de9583e0ae..ea67acfdb81 100644 --- a/mozilla/xpfe/components/ucth/src/Makefile.in +++ b/mozilla/xpfe/components/ucth/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = mozucth EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsUnknownContentTypeHandler -REQUIRES = xpcom string appshell dom js necko widget layout intl locale exthandler pref mozcomps +REQUIRES = xpcom string appshell dom js necko widget layout content intl locale exthandler pref mozcomps CPPSRCS = nsUnknownContentTypeHandler.cpp diff --git a/mozilla/xpfe/components/xremote/src/Makefile.in b/mozilla/xpfe/components/xremote/src/Makefile.in index e04d80c82cd..7d04f09b49d 100644 --- a/mozilla/xpfe/components/xremote/src/Makefile.in +++ b/mozilla/xpfe/components/xremote/src/Makefile.in @@ -29,8 +29,7 @@ MODULE = xremoteservice LIBRARY_NAME = xremoteservice EXPORT_LIBRARY = 1 IS_COMPONENT = 1 -REQUIRES = xpcom string dom widget layout uriloader docshell \ - pref windowwatcher necko appshell rdf +REQUIRES = xpcom string dom widget layout uriloader docshell pref windowwatcher necko appshell rdf CPPSRCS = \ XRemoteService.cpp \ diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in index e67e1e4b9a5..5caaa66c63a 100644 --- a/mozilla/xpinstall/src/Makefile.in +++ b/mozilla/xpinstall/src/Makefile.in @@ -35,7 +35,7 @@ EXPORT_LIBRARY = 1 SHORT_LIBNAME = xpinstal IS_COMPONENT = 1 MODULE_NAME = nsSoftwareUpdate -REQUIRES = xpcom string jar chrome necko intl locale libreg js pref appshell widget layout uriloader xpconnect docshell dom mozcomps windowwatcher $(ZLIB_REQUIRES) +REQUIRES = xpcom string jar chrome necko intl locale libreg js pref appshell widget layout content uriloader xpconnect docshell dom mozcomps windowwatcher $(ZLIB_REQUIRES) # XXX shouldn't need to export this EXPORTS = nsXPITriggerInfo.h