diff --git a/accessible/src/Makefile.in b/accessible/src/Makefile.in index 830a5f0f803..781147b9b99 100644 --- a/accessible/src/Makefile.in +++ b/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 gfx2 js intl docshell webshell necko uriloader htmlparser xuldoc +REQUIRES = xpcom string layout widget dom view locale intl docshell webshell necko htmlparser xuldoc CPPSRCS = \ nsAccessible.cpp \ diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in index d3776ab60c0..a8d95280296 100644 --- a/caps/src/Makefile.in +++ b/caps/src/Makefile.in @@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsSecurityManagerModule -REQUIRES = xpcom string pref js dom xpconnect necko jar widget plugin intl locale layout docshell uriloader gfx2 windowwatcher unicharutil +REQUIRES = xpcom string pref js dom xpconnect necko jar widget plugin intl docshell windowwatcher CPPSRCS = \ nsBasePrincipal.cpp \ diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index 3ad00354b53..3d250879dea 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkconbase_s -REQUIRES = xpcom string dom widget view locale timer htmlparser js webshell necko caps lwbrk uconv chrome docshell pref uriloader xpconnect util unicharutil gfx2 xsl_doc +REQUIRES = xpcom string dom 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/content/build/Makefile.in b/content/build/Makefile.in index 95cc43b5e96..6338953928a 100644 --- a/content/build/Makefile.in +++ b/content/build/Makefile.in @@ -35,7 +35,7 @@ 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 caps xul xuldoc xultmpl gfx2 timer +REQUIRES = xpcom string widget necko rdf docshell dom htmlparser uriloader webshell locale unicharutil lwbrk js pref xul xuldoc xultmpl timer CPPSRCS = \ nsContentDLF.cpp \ diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index ba034638cf2..120d95e5f8f 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkconevents_s -REQUIRES = xpcom string dom js locale widget timer caps xpconnect docshell webshell pref necko uriloader htmlparser view gfx2 +REQUIRES = xpcom string dom js locale widget timer caps xpconnect docshell webshell pref htmlparser view CPPSRCS = \ nsEventListenerManager.cpp \ diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index b8d26a909d2..b15b88bf18b 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkconhtmlcon_s -REQUIRES = xpcom string widget dom js locale webshell htmlparser necko view pref oji java plugin docshell uriloader xpconnect xuldoc caps editor uconv gfx2 imglib2 txmgr +REQUIRES = xpcom string widget dom js locale webshell htmlparser necko view pref docshell xpconnect xuldoc caps editor uconv gfx2 imglib2 CPPSRCS = \ nsAttributeContent.cpp \ diff --git a/content/html/style/src/Makefile.in b/content/html/style/src/Makefile.in index 8942212373b..7447d7e5461 100644 --- a/content/html/style/src/Makefile.in +++ b/content/html/style/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkconhtmlstyle_s -REQUIRES = xpcom string dom widget caps locale js necko webshell xul htmlparser docshell uconv xuldoc xpconnect gfx2 +REQUIRES = xpcom string dom widget caps locale js necko webshell xul htmlparser docshell uconv xuldoc xpconnect CPPSRCS = \ nsCSSDeclaration.cpp \ diff --git a/content/shared/src/Makefile.in b/content/shared/src/Makefile.in index 40da6760b6d..785d157234a 100644 --- a/content/shared/src/Makefile.in +++ b/content/shared/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkconshared_s -REQUIRES = xpcom string widget locale dom webshell pref necko gfx2 htmlparser unicharutil +REQUIRES = xpcom string widget locale dom webshell pref necko htmlparser unicharutil CPPSRCS = \ nsCSSAtoms.cpp \ diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 4d9e9f4ab6b..eba7233648c 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkconxbl_s -REQUIRES = xpcom string js dom widget caps locale htmlparser necko xpconnect pref docshell uriloader chrome lwbrk xul xuldoc gfx2 imglib2 +REQUIRES = xpcom string js dom widget caps htmlparser necko xpconnect pref docshell chrome lwbrk xul xuldoc gfx2 imglib2 CPPSRCS = \ nsXBLBinding.cpp \ diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in index 1eebe05c4dd..848bf6d2184 100644 --- a/content/xml/content/src/Makefile.in +++ b/content/xml/content/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkconxmlcon_s -REQUIRES = xpcom string js dom widget locale necko caps webshell docshell htmlparser uriloader gfx2 xpconnect +REQUIRES = xpcom string js dom widget necko caps webshell docshell htmlparser xpconnect CPPSRCS = \ nsXMLElement.cpp \ diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in index f8c088ee74c..de5938eb01e 100644 --- a/content/xml/document/src/Makefile.in +++ b/content/xml/document/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkconxmldoc_s -REQUIRES = xpcom string js dom locale widget caps htmlparser necko view docshell webshell uriloader pref xpconnect uconv chardet expat lwbrk exthandler mimetype gfx2 +REQUIRES = xpcom string js dom widget caps htmlparser necko view docshell webshell uriloader pref xpconnect uconv chardet lwbrk exthandler mimetype CPPSRCS = \ nsXMLContentSink.cpp \ diff --git a/content/xsl/document/src/Makefile.in b/content/xsl/document/src/Makefile.in index 6fde81dcf6a..59ee277fe6e 100755 --- a/content/xsl/document/src/Makefile.in +++ b/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 gfx2 layout +REQUIRES = xpcom string htmlparser view widget dom necko layout include $(topsrcdir)/config/config.mk diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in index ac7693087c9..403419f6448 100644 --- a/content/xul/content/src/Makefile.in +++ b/content/xul/content/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkconxulcon_s -REQUIRES = xpcom string widget htmlparser necko dom js caps rdf xpconnect locale timer lwbrk pref xul xuldoc xultmpl gfx2 webshell +REQUIRES = xpcom string widget htmlparser necko dom js caps rdf xpconnect locale timer lwbrk pref xul xuldoc xultmpl webshell CPPSRCS = \ nsRDFDOMNodeList.cpp \ diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in index fad20c25ea8..eff728ca875 100644 --- a/content/xul/document/src/Makefile.in +++ b/content/xul/document/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout 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 gfx2 +REQUIRES = xpcom string exthandler mimetype widget dom rdf js xpconnect caps locale view necko uriloader htmlparser lwbrk timer chrome docshell pref xul xuldoc xultmpl CPPSRCS = \ nsControllerCommandManager.cpp \ diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index 47890aa606f..60fdda567a5 100644 --- a/docshell/base/Makefile.in +++ b/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 gfx2 find unicharutil +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 include $(DEPTH)/config/autoconf.mk diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in index 40e78cbb612..49ce203f399 100644 --- a/docshell/build/Makefile.in +++ b/docshell/build/Makefile.in @@ -31,7 +31,7 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = docshell EXPORT_LIBRARY = 1 -REQUIRES = xpcom string dom shistory necko layout uriloader timer webshell widget pref locale view intl htmlparser chardet appcomps gfx2 find js +REQUIRES = xpcom string dom shistory necko layout uriloader timer webshell widget pref view intl htmlparser chardet appcomps find CPPSRCS = \ nsDocShellModule.cpp \ diff --git a/dom/src/base/Makefile.in b/dom/src/base/Makefile.in index d0a14321f68..0e90d9b91a6 100644 --- a/dom/src/base/Makefile.in +++ b/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 gfx2 htmlparser chardet transformiix xmlextras xsl_doc +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 CPPSRCS = \ nsBarProps.cpp \ diff --git a/dom/src/build/Makefile.in b/dom/src/build/Makefile.in index d5bf89e6ecd..3f79531c5fc 100644 --- a/dom/src/build/Makefile.in +++ b/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 pref caps timer locale webbrwsr gfx2 xuldoc docshell sidebar plugin necko +REQUIRES = xpcom string js xpconnect widget layout caps timer webbrwsr xuldoc docshell sidebar plugin necko IS_COMPONENT = 1 MODULE_NAME = DOM_components diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in index 5bb25046fe1..eae44409031 100644 --- a/dom/src/events/Makefile.in +++ b/dom/src/events/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdomevents_s -REQUIRES = xpcom string js caps xpconnect widget layout +REQUIRES = xpcom string js caps xpconnect CPPSRCS = \ nsJSEventListener.cpp \ diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in index cc9f1a85ba8..d385062d430 100644 --- a/dom/src/jsurl/Makefile.in +++ b/dom/src/jsurl/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = jsurl EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = javascript__protocol -REQUIRES = xpcom string js dom necko caps widget layout docshell uriloader locale appshell rdf gfx2 xpconnect jsconsole +REQUIRES = xpcom string js dom necko caps widget appshell rdf xpconnect jsconsole XPIDLSRCS = \ nsIEvaluateStringProxy.idl \ diff --git a/editor/base/Makefile.in b/editor/base/Makefile.in index 61ae990487b..449102e2fcf 100644 --- a/editor/base/Makefile.in +++ b/editor/base/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = editor EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsEditorModule -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 gfx2 mozcomps windowwatcher exthandler mimetype +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 CPPSRCS = \ nsAOLCiter.cpp \ diff --git a/editor/txtsvc/src/Makefile.in b/editor/txtsvc/src/Makefile.in index 68f30b4eb47..0a0994a57b3 100644 --- a/editor/txtsvc/src/Makefile.in +++ b/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 txmgr +REQUIRES = xpcom string editor layout dom widget CPPSRCS = \ nsFindAndReplace.cpp \ diff --git a/embedding/base/Makefile.in b/embedding/base/Makefile.in index 3772588db66..d3acbf07f4f 100644 --- a/embedding/base/Makefile.in +++ b/embedding/base/Makefile.in @@ -29,7 +29,7 @@ XPIDL_MODULE = embed_base include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom string widget view dom necko rdf appshell uriloader layout editor intl chrome locale embedcomponents txmgr +REQUIRES = xpcom string widget view dom necko rdf appshell uriloader layout editor intl chrome embedcomponents EXPORTS = \ nsEmbedAPI.h \ diff --git a/embedding/browser/build/Makefile.in b/embedding/browser/build/Makefile.in index 79b099897e9..d0b2c64cb86 100644 --- a/embedding/browser/build/Makefile.in +++ b/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 locale necko uriloader shistory timer gfx2 windowwatcher js +REQUIRES = xpcom string docshell dom widget layout necko uriloader shistory timer windowwatcher CPPSRCS = \ nsWebBrowserModule.cpp \ diff --git a/embedding/browser/gtk/src/Makefile.in b/embedding/browser/gtk/src/Makefile.in index 3ce94dbf5bf..8ab48e643b8 100644 --- a/embedding/browser/gtk/src/Makefile.in +++ b/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 locale js uriloader webbrwsr shistory embed_base pref windowwatcher gfx2 mpfilelocprovider +REQUIRES = xpcom string docshell webshell necko widget dom layout uriloader webbrwsr shistory embed_base pref windowwatcher mpfilelocprovider CPPSRCS = \ gtkmozembed2.cpp \ diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in index 7bb952a0470..254adcb5873 100644 --- a/embedding/browser/webBrowser/Makefile.in +++ b/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 locale necko uriloader shistory webshell mimetype exthandler timer windowwatcher txtsvc gfx2 wallet appcomps content +REQUIRES = xpcom string docshell widget layout dom js necko uriloader shistory webshell mimetype exthandler timer windowwatcher wallet appcomps include $(DEPTH)/config/autoconf.mk diff --git a/embedding/components/find/src/Makefile.in b/embedding/components/find/src/Makefile.in index af9c223d7d6..f6725eb481e 100644 --- a/embedding/components/find/src/Makefile.in +++ b/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 uriloader layout widget gfx necko js gfx2 locale +REQUIRES = string xpcom find txtsvc dom docshell layout widget CPPSRCS = nsWebBrowserFind.cpp \ $(NULL) diff --git a/embedding/components/jsconsole/src/Makefile.in b/embedding/components/jsconsole/src/Makefile.in index dce9fd35328..2d0f9347760 100644 --- a/embedding/components/jsconsole/src/Makefile.in +++ b/embedding/components/jsconsole/src/Makefile.in @@ -26,7 +26,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = embedcomponents LIBRARY_NAME = jsconsole_s -REQUIRES = jsconsole xpcom string dom windowwatcher widget js xpconnect caps layout uriloader necko docshell locale webbrwsr embed_base gfx2 wallet intl appshell +REQUIRES = jsconsole xpcom string dom windowwatcher js CPPSRCS = nsJSConsoleService.cpp \ $(NULL) diff --git a/embedding/components/windowwatcher/src/Makefile.in b/embedding/components/windowwatcher/src/Makefile.in index 2b37d6b7198..e8d1c5b2d68 100644 --- a/embedding/components/windowwatcher/src/Makefile.in +++ b/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 uriloader necko docshell locale webbrwsr embed_base gfx2 wallet intl appshell +REQUIRES = xpcom string dom windowwatcher widget js xpconnect caps layout necko docshell webbrwsr embed_base wallet intl CPPSRCS = nsDialogParamBlock.cpp \ nsPrompt.cpp \ diff --git a/embedding/tests/gtkEmbed/Makefile.in b/embedding/tests/gtkEmbed/Makefile.in index 2ebcee8655d..a9c169250ff 100644 --- a/embedding/tests/gtkEmbed/Makefile.in +++ b/embedding/tests/gtkEmbed/Makefile.in @@ -24,7 +24,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom string webbrwsr widget necko docshell layout webshell dom locale uriloader embed_base windowwatcher gfx2 js pref mpfilelocprovider +REQUIRES = xpcom string webbrwsr widget necko docshell layout webshell dom uriloader embed_base windowwatcher pref mpfilelocprovider CPPSRCS = \ WebBrowserChrome.cpp \ diff --git a/extensions/access-builtin/accessproxy/Makefile.in b/extensions/access-builtin/accessproxy/Makefile.in index 7251f7e2043..9f9bd498aab 100644 --- a/extensions/access-builtin/accessproxy/Makefile.in +++ b/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 js widget necko layout uriloader gfx2 locale mozcomps pref +REQUIRES = xpcom string docshell dom widget layout uriloader locale mozcomps pref EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsAccessProxy diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in index ee4a550cae2..e25467059db 100644 --- a/extensions/cookie/Makefile.in +++ b/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 js widget layout pref intl locale uriloader windowwatcher +REQUIRES = xpcom string necko dom widget layout pref intl uriloader windowwatcher ifdef ENABLE_TESTS DIRS = tests diff --git a/extensions/cookie/tests/Makefile.in b/extensions/cookie/tests/Makefile.in index cec58e05225..be826e040e8 100644 --- a/extensions/cookie/tests/Makefile.in +++ b/extensions/cookie/tests/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom string cookie necko intl locale +REQUIRES = xpcom string cookie necko intl PROGRAM = TestCookie$(BIN_SUFFIX) CPPSRCS = TestCookie.cpp diff --git a/extensions/inspector/base/src/Makefile.in b/extensions/inspector/base/src/Makefile.in index 8f5a64800bf..670f33eea09 100644 --- a/extensions/inspector/base/src/Makefile.in +++ b/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 js widget locale gfx2 necko docshell view uriloader timer imglib2 mimetype exthandler +REQUIRES=xpcom string dom rdf rdfutil layout widget locale gfx2 necko docshell view timer imglib2 mimetype exthandler CPPSRCS= \ inDOMDataSource.cpp \ diff --git a/extensions/inspector/build/src/Makefile.in b/extensions/inspector/build/src/Makefile.in index f211b6f2034..9dfe18cb94f 100644 --- a/extensions/inspector/build/src/Makefile.in +++ b/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 js rdf rdfutil locale gfx2 timer necko imglib2 +REQUIRES = xpcom string layout dom widget rdf rdfutil locale gfx2 timer necko imglib2 IS_COMPONENT = 1 MODULE_NAME = nsInspectorModule diff --git a/extensions/transformiix/build/Makefile.in b/extensions/transformiix/build/Makefile.in index 906695dc8af..b7c1ffe1d0d 100644 --- a/extensions/transformiix/build/Makefile.in +++ b/extensions/transformiix/build/Makefile.in @@ -30,7 +30,7 @@ MODULE = transformiix LIBRARY_NAME = transformiix EXPORT_LIBRARY = 1 SHORT_LIBNAME = t8iix -REQUIRES = xpcom string dom docshell necko layout widget caps webbrwsr js uriloader locale xpconnect gfx2 appshell embedcomponents xsl_doc +REQUIRES = xpcom string dom layout widget webbrwsr xsl_doc IS_COMPONENT = 1 MODULE_NAME = TransformiixModule diff --git a/extensions/transformiix/source/xml/parser/Makefile.in b/extensions/transformiix/source/xml/parser/Makefile.in index 4f083c09198..ae4addc0ab7 100644 --- a/extensions/transformiix/source/xml/parser/Makefile.in +++ b/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 webbrwsr js docshell webshell gfx2 uriloader locale appshell xpconnect +REQUIRES = string xpcom necko dom layout widget webbrwsr js docshell appshell xpconnect endif CPPSRCS = XMLParser.cpp diff --git a/extensions/transformiix/source/xpath/Makefile.in b/extensions/transformiix/source/xpath/Makefile.in index d79dff4a636..43e1cc0905e 100644 --- a/extensions/transformiix/source/xpath/Makefile.in +++ b/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 caps js +REQUIRES = string xpcom dom layout widget endif CPPSRCS = AdditiveExpr.cpp \ diff --git a/extensions/wallet/build/Makefile.in b/extensions/wallet/build/Makefile.in index 73f159f7d46..0c8f42f5580 100644 --- a/extensions/wallet/build/Makefile.in +++ b/extensions/wallet/build/Makefile.in @@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1 SHORT_LIBNAME = wlltvwrs IS_COMPONENT = 1 MODULE_NAME = nsWalletViewerModule -REQUIRES = xpcom string dom js +REQUIRES = xpcom CPPSRCS = nsWalletViewerFactory.cpp diff --git a/extensions/wallet/editor/Makefile.in b/extensions/wallet/editor/Makefile.in index 6013928be8c..2c7150e7538 100644 --- a/extensions/wallet/editor/Makefile.in +++ b/extensions/wallet/editor/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = walletviewers LIBRARY_NAME = walleteditor_s XPIDL_MODULE = walleteditor -REQUIRES = xpcom string wallet dom docshell js necko uriloader widget layout locale gfx2 +REQUIRES = xpcom string wallet dom docshell necko widget CPPSRCS = nsWalletEditor.cpp diff --git a/extensions/wallet/signonviewer/Makefile.in b/extensions/wallet/signonviewer/Makefile.in index 8ee2bc8dcbf..b6d0d8b4d8c 100644 --- a/extensions/wallet/signonviewer/Makefile.in +++ b/extensions/wallet/signonviewer/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = walletviewers LIBRARY_NAME = signonviewer_s XPIDL_MODULE = signonviewer -REQUIRES = xpcom string wallet dom js widget layout necko +REQUIRES = xpcom string wallet dom widget necko CPPSRCS = nsSignonViewer.cpp diff --git a/extensions/wallet/src/Makefile.in b/extensions/wallet/src/Makefile.in index 603aab21101..b9a2c7cdd83 100644 --- a/extensions/wallet/src/Makefile.in +++ b/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 js layout widget uriloader pref webshell docshell appshell locale intl gfx2 windowwatcher +REQUIRES = xpcom string necko dom layout widget uriloader pref webshell docshell appshell intl windowwatcher CPPSRCS = \ nsWalletFactory.cpp \ diff --git a/extensions/wallet/walletpreview/Makefile.in b/extensions/wallet/walletpreview/Makefile.in index a84f406af97..974c07ba245 100644 --- a/extensions/wallet/walletpreview/Makefile.in +++ b/extensions/wallet/walletpreview/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = walletviewers LIBRARY_NAME = walletpreview_s XPIDL_MODULE = walletpreview -REQUIRES = xpcom string wallet dom js layout widget necko docshell locale uriloader gfx2 +REQUIRES = xpcom string wallet dom widget necko docshell CPPSRCS = nsWalletPreview.cpp diff --git a/extensions/xmlextras/base/src/Makefile.in b/extensions/xmlextras/base/src/Makefile.in index 1da66e24ba4..f158fe8c7b6 100644 --- a/extensions/xmlextras/base/src/Makefile.in +++ b/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 uriloader locale webbrwsr gfx2 +REQUIRES = xpcom string dom js layout widget caps uconv necko docshell xpconnect webbrwsr CPPSRCS = \ nsDOMSerializer.cpp \ diff --git a/extensions/xmlterm/base/Makefile.in b/extensions/xmlterm/base/Makefile.in index ccbd3b7b45c..3ff205bb091 100644 --- a/extensions/xmlterm/base/Makefile.in +++ b/extensions/xmlterm/base/Makefile.in @@ -94,7 +94,7 @@ CPPSRCS = \ MODULE = xmlterm IS_COMPONENT = 1 EXPORT_LIBRARY = 1 -REQUIRES = xpcom string pref js dom docshell view locale caps layout uriloader necko widget webshell appshell gfx2 +REQUIRES = xpcom string pref dom docshell view locale caps layout uriloader necko widget webshell appshell EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in index 55acb0dd3bb..26f33ffad97 100644 --- a/gfx/src/Makefile.in +++ b/gfx/src/Makefile.in @@ -30,7 +30,7 @@ MODULE = layout EXPORTS = nsFontList.h LIBRARY_NAME = gkgfx EXPORT_LIBRARY = 1 -REQUIRES = xpcom string img widget util dom locale view necko pref timer uriloader gfx2 imglib2 intl mimetype +REQUIRES = xpcom string img widget util locale view necko pref timer uriloader gfx2 imglib2 intl mimetype ifeq ($(MOZ_WIDGET_TOOLKIT),os2) DIRS = diff --git a/gfx/src/gtk/Makefile.in b/gfx/src/gtk/Makefile.in index 7d9dcc518d4..9c12988adb0 100644 --- a/gfx/src/gtk/Makefile.in +++ b/gfx/src/gtk/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = gfx_gtk EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxGTKModule -REQUIRES = xpcom string img widget view util dom pref js uconv necko unicharutil gfx2 mozcomps windowwatcher locale intl +REQUIRES = xpcom string img widget view util dom pref uconv unicharutil windowwatcher locale intl CSRCS = nsPrintdGTK.c diff --git a/gfx/src/ps/Makefile.in b/gfx/src/ps/Makefile.in index 599875362dd..ca2771cd18b 100644 --- a/gfx/src/ps/Makefile.in +++ b/gfx/src/ps/Makefile.in @@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsGfxPSModule EXTRA_DSO_LIBS = img_s mozutil_s -REQUIRES = xpcom string img widget util pref uconv dom view gfx2 necko imglib2 intl +REQUIRES = xpcom string img widget util pref uconv view gfx2 necko imglib2 intl EXTRA_DSO_LIBS += gkgfx CSRCS = font_metrics.c diff --git a/gfx/src/xprint/Makefile.in b/gfx/src/xprint/Makefile.in index ad7f7d5a356..edf0a6f76f8 100644 --- a/gfx/src/xprint/Makefile.in +++ b/gfx/src/xprint/Makefile.in @@ -34,7 +34,7 @@ IS_COMPONENT = 1 MODULE_NAME = nsGfxXprintModule EXTRA_DSO_LIBS = gkgfx -REQUIRES = xpcom string widget view img util dom pref locale uconv unicharutil gfx2 necko imglib2 intl +REQUIRES = xpcom string widget view img util pref locale uconv unicharutil gfx2 imglib2 intl CSRCS = \ ../xlibrgb/xlibrgb.c \ diff --git a/htmlparser/robot/Makefile.in b/htmlparser/robot/Makefile.in index e6557046b44..665344299ab 100644 --- a/htmlparser/robot/Makefile.in +++ b/htmlparser/robot/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = DebugRobot SHORT_LIBNAME = dbgrobot -REQUIRES = xpcom string htmlparser necko docshell dom widget layout locale webshell uriloader gfx2 +REQUIRES = xpcom string htmlparser necko docshell dom uriloader CPPSRCS = nsDebugRobot.cpp nsRobotSink.cpp diff --git a/htmlparser/src/Makefile.in b/htmlparser/src/Makefile.in index 3199f43698c..696e3027a46 100644 --- a/htmlparser/src/Makefile.in +++ b/htmlparser/src/Makefile.in @@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsParserModule SHORT_LIBNAME = gkparser -REQUIRES = xpcom string necko util uconv expat layout dom unicharutil pref nkcache +REQUIRES = xpcom string necko util uconv expat layout dom pref nkcache SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \ diff --git a/intl/chardet/src/Makefile.in b/intl/chardet/src/Makefile.in index d4c805f8b9e..91c79ef074c 100644 --- a/intl/chardet/src/Makefile.in +++ b/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 locale gfx2 embedcomponents unicharutil +REQUIRES = xpcom string uconv webshell uriloader docshell htmlparser dom necko widget layout embedcomponents CPPSRCS = \ nsCharDetModule.cpp \ diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in index bc3fef51abb..05a3cbf9564 100644 --- a/intl/locale/src/Makefile.in +++ b/intl/locale/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = locale LIBRARY_NAME = nslocale_s -REQUIRES = xpcom string uconv unicharutil necko dom windowwatcher uriloader js intl +REQUIRES = xpcom string uconv unicharutil necko dom windowwatcher uriloader intl ifeq ($(MOZ_WIDGET_TOOLKIT),os2) DIRS = os2 diff --git a/intl/strres/tests/Makefile.in b/intl/strres/tests/Makefile.in index a0b26ce6769..fc92effd49e 100644 --- a/intl/strres/tests/Makefile.in +++ b/intl/strres/tests/Makefile.in @@ -27,7 +27,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk CPPSRCS = StringBundleTest.cpp -REQUIRES = xpcom string locale necko intl appshell +REQUIRES = xpcom string locale necko intl SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in index c0e3890bd99..cfd404dfd98 100644 --- a/js/src/xpconnect/src/Makefile.in +++ b/js/src/xpconnect/src/Makefile.in @@ -45,7 +45,7 @@ EXPORT_LIBRARY = 1 SHORT_LIBNAME = xpconect IS_COMPONENT = 1 MODULE_NAME = xpconnect -REQUIRES = xpcom string js dom widget layout caps +REQUIRES = xpcom string js dom caps CPPSRCS = \ nsScriptError.cpp \ diff --git a/layout/base/src/Makefile.in b/layout/base/src/Makefile.in index 37891ed5896..476dce33d61 100644 --- a/layout/base/src/Makefile.in +++ b/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 gfx2 unicharutil js +REQUIRES = xpcom string dom widget view locale timer htmlparser webshell necko uconv pref uriloader unicharutil CPPSRCS = \ nsAutoCopy.cpp \ diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index b8f6e050c08..87ddc9be3ac 100644 --- a/layout/build/Makefile.in +++ b/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 necko rdf docshell dom htmlparser uriloader webshell locale timer xuldoc gfx2 +REQUIRES = xpcom string widget necko rdf docshell dom htmlparser uriloader webshell locale timer xuldoc CPPSRCS = \ nsLayoutDLF.cpp \ diff --git a/layout/html/base/src/Makefile.in b/layout/html/base/src/Makefile.in index 6e9d06709da..fb81b1e94ca 100644 --- a/layout/html/base/src/Makefile.in +++ b/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 uriloader unicharutil lwbrk gfx2 imglib2 accessibility xpconnect java +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 CPPSRCS = \ nsSelectsAreaFrame.cpp \ diff --git a/layout/html/document/src/Makefile.in b/layout/html/document/src/Makefile.in index bc435ed72b1..e1476000041 100644 --- a/layout/html/document/src/Makefile.in +++ b/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 gfx2 xpconnect accessibility +REQUIRES = xpcom string widget dom necko locale view js webshell docshell caps pref uriloader shistory xpconnect accessibility CPPSRCS = \ nsFrameFrame.cpp \ diff --git a/layout/html/style/src/Makefile.in b/layout/html/style/src/Makefile.in index 538efe74261..d325683140a 100644 --- a/layout/html/style/src/Makefile.in +++ b/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 editor locale js view necko webshell pref txmgr docshell uriloader gfx2 plugin +REQUIRES = xpcom string dom widget timer locale view necko webshell pref docshell plugin CPPSRCS = \ nsCSSFrameConstructor.cpp \ diff --git a/layout/html/table/src/Makefile.in b/layout/html/table/src/Makefile.in index 3fab9e440c9..a53d34ff806 100644 --- a/layout/html/table/src/Makefile.in +++ b/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 gfx2 accessibility +REQUIRES = xpcom string dom widget locale webshell view accessibility CPPSRCS = \ BasicTableLayoutStrategy.cpp \ diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index eaa11ad7e25..5c5923b7391 100644 --- a/layout/xul/base/src/Makefile.in +++ b/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 js widget view caps timer docshell uriloader necko editor htmlparser webshell pref intl txmgr gfx2 imglib2 unicharutil +REQUIRES = xpcom string dom locale widget view timer docshell necko editor htmlparser webshell pref intl gfx2 imglib2 unicharutil CPPSRCS = \ nsBulletinBoardLayout.cpp \ diff --git a/layout/xul/base/src/outliner/src/Makefile.in b/layout/xul/base/src/outliner/src/Makefile.in index f18a53b0b2a..2ba42e6216f 100644 --- a/layout/xul/base/src/outliner/src/Makefile.in +++ b/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 js locale caps view xultmpl rdf necko gfx2 imglib2 +REQUIRES = xpcom string dom widget timer locale view xultmpl rdf necko gfx2 imglib2 CPPSRCS = \ nsOutlinerBodyFrame.cpp \ diff --git a/mailnews/absync/build/Makefile.in b/mailnews/absync/build/Makefile.in index 9737a264f76..11f6b914b2c 100644 --- a/mailnews/absync/build/Makefile.in +++ b/mailnews/absync/build/Makefile.in @@ -33,7 +33,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsAbSyncModule SHORT_LIBNAME = absyncsv -REQUIRES = xpcom string necko docshell uriloader msgbase intl locale layout widget addrbook dom mork gfx2 +REQUIRES = xpcom string necko docshell uriloader msgbase intl addrbook dom mork ifeq ($(USE_SHORT_LIBNAME),1) EXTRA_DSO_LIBS = msgbsutl diff --git a/mailnews/absync/src/Makefile.in b/mailnews/absync/src/Makefile.in index d3f892ea9cf..90d95c80cc2 100644 --- a/mailnews/absync/src/Makefile.in +++ b/mailnews/absync/src/Makefile.in @@ -30,7 +30,7 @@ MODULE = absyncsvc XPIDL_MODULE = absync LIBRARY_NAME = absync_s META_COMPONENT = mail -REQUIRES = xpcom string necko mime cookie docshell locale uriloader pref layout widget msgbase msgbaseutil dom rdf addrbook intl locale mork mimetype gfx2 windowwatcher js +REQUIRES = xpcom string necko mime cookie docshell uriloader pref widget msgbase msgbaseutil dom rdf addrbook intl mork mimetype windowwatcher CPPSRCS = \ nsAbSyncPostEngine.cpp \ diff --git a/mailnews/addrbook/build/Makefile.in b/mailnews/addrbook/build/Makefile.in index 9a351e8b57b..b3796d3fe7c 100644 --- a/mailnews/addrbook/build/Makefile.in +++ b/mailnews/addrbook/build/Makefile.in @@ -32,7 +32,7 @@ META_COMPONENT = mail EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsAbModule -REQUIRES = xpcom string addrbook necko msgcompose mime msgbase rdf rdfutil docshell appshell dom widget uriloader layout locale mork xuldoc gfx2 appcomps js +REQUIRES = xpcom string addrbook necko msgcompose mime msgbase rdf rdfutil docshell appshell dom widget locale mork appcomps CPPSRCS = nsAbFactory.cpp EXPORTS = nsAbBaseCID.h diff --git a/mailnews/addrbook/src/Makefile.in b/mailnews/addrbook/src/Makefile.in index 7b48594d79a..63c1002161b 100644 --- a/mailnews/addrbook/src/Makefile.in +++ b/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 js layout widget mork docshell pref necko locale uriloader webshell uconv msgbase msgbaseutil mime msgcompose xuldoc gfx2 appcomps +REQUIRES = xpcom string rdf rdfutil appshell dom layout widget mork docshell pref necko locale webshell uconv msgbase msgbaseutil mime msgcompose appcomps CPPSRCS = \ nsAddressBook.cpp \ diff --git a/mailnews/base/build/Makefile.in b/mailnews/base/build/Makefile.in index 28d564775c0..76a30393139 100644 --- a/mailnews/base/build/Makefile.in +++ b/mailnews/base/build/Makefile.in @@ -32,7 +32,7 @@ META_COMPONENT = mail EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsMsgBaseModule -REQUIRES = xpcom string necko intl locale timer rdf dom js docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompose msgbaseutil appcomps msgdb editor appshell xuldoc caps msgnews gfx2 mozcomps msgimap +REQUIRES = xpcom string necko intl locale timer rdf dom docshell widget layout webshell mime uriloader mailnews mork txmgr pref msgcompose msgbaseutil appcomps msgdb editor appshell msgnews msgimap ifeq ($(USE_SHORT_LIBNAME),1) EXTRA_DSO_LIBS = msgbsutl diff --git a/mailnews/base/search/src/Makefile.in b/mailnews/base/search/src/Makefile.in index 589f5b8f1e9..79dc600ef70 100644 --- a/mailnews/base/search/src/Makefile.in +++ b/mailnews/base/search/src/Makefile.in @@ -30,7 +30,7 @@ MODULE = msgbase XPIDL_MODULE = msgsearch LIBRARY_NAME = msgsearch_s META_COMPONENT = mail -REQUIRES = xpcom string mailnews msgdb msgbaseutil necko mime appshell msgimap rdf msglocal intl locale pref timer msgnews txmgr +REQUIRES = xpcom string mailnews msgdb msgbaseutil necko mime msgimap rdf msglocal intl pref timer msgnews txmgr CPPSRCS = \ nsMsgFilterService.cpp \ diff --git a/mailnews/base/src/Makefile.in b/mailnews/base/src/Makefile.in index bc2a3374987..c221cfc0e7c 100644 --- a/mailnews/base/src/Makefile.in +++ b/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 js 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 xuldoc caps mime mimetype gfx2 mozcomps windowwatcher +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 CPPSRCS = \ nsMessenger.cpp \ diff --git a/mailnews/base/util/Makefile.in b/mailnews/base/util/Makefile.in index 829ac07d6fe..915f83327bb 100644 --- a/mailnews/base/util/Makefile.in +++ b/mailnews/base/util/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = msgbaseutil META_COMPONENT = mail EXPORT_LIBRARY = 1 SHORT_LIBNAME = msgbsutl -REQUIRES = xpcom string msgbase rdf necko msgdb intl mork mailnews locale pref rdfutil rdfutil mime msgcompose docshell webshell wallet dom widget layout uriloader appshell msgimap msglocal msgnews txmgr uconv unicharutil nkcache mimetype gfx2 windowwatcher js +REQUIRES = xpcom string msgbase rdf necko msgdb intl mork mailnews locale pref rdfutil rdfutil mime msgcompose docshell webshell wallet dom uriloader appshell msgimap msglocal msgnews txmgr uconv unicharutil nkcache mimetype windowwatcher CPPSRCS = \ nsMsgGroupRecord.cpp \ diff --git a/mailnews/compose/build/Makefile.in b/mailnews/compose/build/Makefile.in index d578b4e1807..64e4dcacb37 100644 --- a/mailnews/compose/build/Makefile.in +++ b/mailnews/compose/build/Makefile.in @@ -33,7 +33,7 @@ EXPORT_LIBRARY = 1 SHORT_LIBNAME = msgcompo IS_COMPONENT = 1 MODULE_NAME = nsMsgComposeModule -REQUIRES = xpcom string msgbase msgbaseutil editor necko dom js uriloader mime addrbook rdf intl locale mailnews widget layout msgdb appshell nkcache txmgr gfx2 +REQUIRES = xpcom string msgbase msgbaseutil editor necko dom uriloader mime addrbook rdf intl mailnews widget msgdb appshell nkcache ifeq ($(USE_SHORT_LIBNAME),1) EXTRA_DSO_LIBS = msgbsutl diff --git a/mailnews/compose/src/Makefile.in b/mailnews/compose/src/Makefile.in index ba348437b3c..233cf32c1e3 100644 --- a/mailnews/compose/src/Makefile.in +++ b/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 js msgbaseutil msgdb rdf appshell msgimap msgnews uconv docshell webshell addrbook widget htmlparser txmgr exthandler mork wallet nkcache xuldoc mimetype gfx2 windowwatcher +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 CPPSRCS = \ nsMsgCompFields.cpp \ diff --git a/mailnews/imap/build/Makefile.in b/mailnews/imap/build/Makefile.in index 4315bafd27b..aca5d5502c2 100644 --- a/mailnews/imap/build/Makefile.in +++ b/mailnews/imap/build/Makefile.in @@ -32,7 +32,7 @@ META_COMPONENT = mail EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = IMAP_factory -REQUIRES = xpcom string mailnews msgimap msgbase msgbaseutil rdf rdfutil necko msgdb txmgr mime pref intl locale msglocal nkcache +REQUIRES = xpcom string mailnews msgimap msgbase msgbaseutil rdf rdfutil necko msgdb txmgr mime pref intl msglocal nkcache ifeq ($(USE_SHORT_LIBNAME),1) EXTRA_DSO_LIBS = msgbsutl diff --git a/mailnews/imap/src/Makefile.in b/mailnews/imap/src/Makefile.in index 142642b31e5..b1d5f3d11ec 100644 --- a/mailnews/imap/src/Makefile.in +++ b/mailnews/imap/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = msgimap LIBRARY_NAME = msgimap_s META_COMPONENT = mail -REQUIRES = xpcom string mailnews rdf msgbase msgbaseutil rdfutil necko msgdb uconv mime pref js intl nkcache timer locale txmgr dom docshell msglocal widget layout uriloader xuldoc msgnews mimetype gfx2 windowwatcher +REQUIRES = xpcom string mailnews rdf msgbase msgbaseutil rdfutil necko msgdb uconv mime pref intl nkcache timer txmgr dom docshell msglocal msgnews mimetype windowwatcher EXPORTS = \ nsIMAPBodyShell.h \ diff --git a/mailnews/import/src/Makefile.in b/mailnews/import/src/Makefile.in index 0805e470ab5..a1dd3fb5f09 100644 --- a/mailnews/import/src/Makefile.in +++ b/mailnews/import/src/Makefile.in @@ -32,7 +32,7 @@ META_COMPONENT = mail EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsImportServiceModule -REQUIRES = xpcom string mailnews addrbook uconv mork msgbase msgbaseutil intl locale necko rdf msgdb +REQUIRES = xpcom string mailnews addrbook uconv mork msgbase msgbaseutil intl necko rdf msgdb ifeq ($(USE_SHORT_LIBNAME),1) EXTRA_DSO_LIBS = msgbsutl diff --git a/mailnews/import/text/src/Makefile.in b/mailnews/import/text/src/Makefile.in index 12f3bcbb03f..d6dd62e7e88 100644 --- a/mailnews/import/text/src/Makefile.in +++ b/mailnews/import/text/src/Makefile.in @@ -32,7 +32,7 @@ META_COMPONENT = mail EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsTextImportModule -REQUIRES = xpcom string import intl locale necko addrbook pref mork +REQUIRES = xpcom string import intl necko addrbook pref mork CPPSRCS = nsTextFactory.cpp \ nsTextStringBundle.cpp \ diff --git a/mailnews/local/build/Makefile.in b/mailnews/local/build/Makefile.in index 3393d9e804c..f0fedcd01ee 100644 --- a/mailnews/local/build/Makefile.in +++ b/mailnews/local/build/Makefile.in @@ -33,7 +33,7 @@ EXPORT_LIBRARY = 1 SHORT_LIBNAME = msglocal IS_COMPONENT = 1 MODULE_NAME = local_mail_services -REQUIRES = xpcom string mailnews msgbase msgbaseutil msgdb necko txmgr rdf rdfutil mime intl locale pref nkcache +REQUIRES = xpcom string mailnews msgbase msgbaseutil msgdb necko txmgr rdf rdfutil mime intl pref nkcache ifeq ($(USE_SHORT_LIBNAME),1) EXTRA_DSO_LIBS = msgbsutl diff --git a/mailnews/local/src/Makefile.in b/mailnews/local/src/Makefile.in index 3712652a302..406986e8f4e 100644 --- a/mailnews/local/src/Makefile.in +++ b/mailnews/local/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = msglocal LIBRARY_NAME = msglocal_s META_COMPONENT = mail -REQUIRES = xpcom string msgbase msgbaseutil mailnews pref js necko msgdb rdf intl locale mime dom rdfutil txmgr widget layout docshell uriloader msgimap chrome appshell nkcache xuldoc gfx2 +REQUIRES = xpcom string msgbase msgbaseutil mailnews pref necko msgdb rdf intl mime dom rdfutil txmgr docshell msgimap chrome nkcache CPPSRCS = \ nsPop3Protocol.cpp \ diff --git a/mailnews/mime/cthandlers/vcard/Makefile.in b/mailnews/mime/cthandlers/vcard/Makefile.in index 893845106f7..0b90c656917 100644 --- a/mailnews/mime/cthandlers/vcard/Makefile.in +++ b/mailnews/mime/cthandlers/vcard/Makefile.in @@ -33,7 +33,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsVCardModule HAS_EXTRAEXPORTS = 1 -REQUIRES = xpcom string mime msgbase msgbaseutil uconv necko intl locale pref mailnews msgdb +REQUIRES = xpcom string mime msgbase msgbaseutil uconv necko intl pref mailnews msgdb ifeq ($(USE_SHORT_LIBNAME),1) EXTRA_DSO_LIBS = msgbsutl diff --git a/mailnews/mime/src/Makefile.in b/mailnews/mime/src/Makefile.in index e35c452ab8b..e1bda8b0a91 100644 --- a/mailnews/mime/src/Makefile.in +++ b/mailnews/mime/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = mime LIBRARY_NAME = mime_s META_COMPONENT = mail -REQUIRES = xpcom string msgbase msgbaseutil pref js necko uconv msgcompose editor dom layout intl msgimap exthandler mailnews locale msgdb chardet caps txmgr mimetype uriloader xpconnect +REQUIRES = xpcom string msgbase msgbaseutil pref js necko uconv msgcompose editor dom intl msgimap exthandler mailnews msgdb chardet caps mimetype uriloader xpconnect CPPSRCS = \ nsMimeObjectClassAccess.cpp \ diff --git a/mailnews/news/src/Makefile.in b/mailnews/news/src/Makefile.in index e896497df1d..db8f8595bcc 100644 --- a/mailnews/news/src/Makefile.in +++ b/mailnews/news/src/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = msgnews LIBRARY_NAME = msgnews_s META_COMPONENT = mail -REQUIRES = xpcom string mailnews msgbase msgbaseutil necko msgdb locale mork dom js rdf docshell layout widget pref uriloader appshell mime intl timer webshell wallet rdfutil nkcache gfx2 windowwatcher +REQUIRES = xpcom string mailnews msgbase msgbaseutil necko msgdb locale mork dom rdf docshell layout pref uriloader appshell mime intl timer webshell wallet rdfutil nkcache windowwatcher CPPSRCS = \ nsNNTPArticleList.cpp \ diff --git a/modules/libimg/gifcom/Makefile.in b/modules/libimg/gifcom/Makefile.in index f7b809f70ce..efafa2f8f48 100644 --- a/modules/libimg/gifcom/Makefile.in +++ b/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 locale util unicharutil +REQUIRES = xpcom string img layout util CPPSRCS = \ gif.cpp \ diff --git a/modules/libimg/jpgcom/Makefile.in b/modules/libimg/jpgcom/Makefile.in index a4ca185fc9e..e69de29bb2d 100644 --- a/modules/libimg/jpgcom/Makefile.in +++ b/modules/libimg/jpgcom/Makefile.in @@ -1,62 +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 - -LIBRARY_NAME = nsjpg -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 -MODULE_NAME = nsJPGModule -REQUIRES = xpcom string img util layout locale jpeg unicharutil - -CPPSRCS = \ - jpeg.cpp \ - nsJPGDecoder.cpp \ - nsJPGModule.cpp \ - $(NULL) - -LOCAL_INCLUDES = -I$(srcdir) - -EXTRA_DSO_LDOPTS = $(JPEG_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) - -EXTRA_LIBS = $(NSPR_LIBS) - -ifndef MOZ_JAVA -LOCAL_JMC_SUBDIR = . -endif - -include $(topsrcdir)/config/rules.mk - -ifeq ($(OS_ARCH)$(OS_RELEASE),SunOS5) -ifeq ($(shell uname -r),5.3) -# In this special case (jpeg.cpp), the compiler has to know -# the OS version to a finer granularity than normal. -DEFINES += -DOSMINOR=3 -endif -endif - diff --git a/modules/libimg/mng/Makefile.in b/modules/libimg/mng/Makefile.in index 60ded2de7a5..b5fc761d37b 100644 --- a/modules/libimg/mng/Makefile.in +++ b/modules/libimg/mng/Makefile.in @@ -30,7 +30,7 @@ MODULE = mng LIBRARY_NAME = mozmng EXPORT_LIBRARY = 1 -REQUIRES = jpeg +REQUIRES = CSRCS = \ libmng_callback_xs.c \ diff --git a/modules/libimg/mngcom/Makefile.in b/modules/libimg/mngcom/Makefile.in index eaeaaef3f4c..e69de29bb2d 100644 --- a/modules/libimg/mngcom/Makefile.in +++ b/modules/libimg/mngcom/Makefile.in @@ -1,53 +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 - -LIBRARY_NAME = nsmng -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 -MODULE_NAME = nsMNGModule -REQUIRES = xpcom string img layout util locale mng jpeg unicharutil - -CPPSRCS = \ - nsMNGDecoder.cpp \ - nsMNGModule.cpp \ - $(NULL) - -LOCAL_INCLUDES = -I$(srcdir) - -EXTRA_DSO_LDOPTS = $(MNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) - -EXTRA_LIBS = $(NSPR_LIBS) - -ifndef MOZ_JAVA -LOCAL_JMC_SUBDIR = . -endif - -include $(topsrcdir)/config/rules.mk - diff --git a/modules/libimg/pngcom/Makefile.in b/modules/libimg/pngcom/Makefile.in index f7f1c364367..e69de29bb2d 100644 --- a/modules/libimg/pngcom/Makefile.in +++ b/modules/libimg/pngcom/Makefile.in @@ -1,54 +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 - -LIBRARY_NAME = nspng -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 -MODULE_NAME = nsPNGModule -REQUIRES = xpcom string img util layout locale png unicharutil - -CPPSRCS = \ - ipng.cpp \ - nsPNGDecoder.cpp \ - nsPNGModule.cpp \ - $(NULL) - -LOCAL_INCLUDES = -I$(srcdir) - -EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) - -EXTRA_LIBS = $(NSPR_LIBS) - -ifndef MOZ_JAVA -LOCAL_JMC_SUBDIR = . -endif - -include $(topsrcdir)/config/rules.mk - diff --git a/modules/libimg/src/Makefile.in b/modules/libimg/src/Makefile.in index 3c243a72bd0..e69de29bb2d 100644 --- a/modules/libimg/src/Makefile.in +++ b/modules/libimg/src/Makefile.in @@ -1,64 +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 = img -LIBRARY_NAME = img_s -REQUIRES = xpcom string layout util locale cookie necko timer jpeg unicharutil - -CPPSRCS = \ - ilNetReader.cpp \ - color.cpp \ - colormap.cpp \ - dither.cpp \ - if.cpp \ - ilclient.cpp \ - il_util.cpp \ - scale.cpp \ - xpcompat.cpp \ - $(NULL) - -LOCAL_INCLUDES = -I$(srcdir) - -ifndef MOZ_JAVA -LOCAL_JMC_SUBDIR = . -endif - -FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk - -ifeq ($(OS_ARCH),Linux) -DEFINES += -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -endif -ifeq ($(OS_ARCH)$(OS_RELEASE),SunOS5) -ifeq ($(shell uname -r),5.3) -# In this special case (dither.cpp), the compiler has to know -# the OS version to a finer granularity than normal. -DEFINES += -DOSMINOR=3 -endif -endif diff --git a/modules/libpr0n/decoders/jpeg/Makefile.in b/modules/libpr0n/decoders/jpeg/Makefile.in index 6cabce98c89..8af39681527 100644 --- a/modules/libpr0n/decoders/jpeg/Makefile.in +++ b/modules/libpr0n/decoders/jpeg/Makefile.in @@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsJPEGDecoderModule -REQUIRES = xpcom string necko layout jpeg gfx2 imglib2 +REQUIRES = xpcom string necko layout gfx2 imglib2 CPPSRCS = nsJPEGDecoder.cpp nsJPEGFactory.cpp diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index 1b8211e92e2..1d75b0786df 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = pref EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsPrefModule -REQUIRES = xpcom string js xpconnect caps dom intl locale timer necko embedcomponents profile +REQUIRES = xpcom string js xpconnect caps intl timer necko embedcomponents profile include $(topsrcdir)/config/config.mk diff --git a/modules/oji/src/Makefile.in b/modules/oji/src/Makefile.in index 4ab07fd7a22..abe5ab51eca 100644 --- a/modules/oji/src/Makefile.in +++ b/modules/oji/src/Makefile.in @@ -30,7 +30,7 @@ MODULE = oji XPIDL_MODULE = ojiimpl IS_COMPONENT = 1 MODULE_NAME = nsCJVMManagerModule -REQUIRES = xpcom string java js plugin caps pref js jar layout necko dom widget xpconnect +REQUIRES = xpcom string java js plugin caps pref js jar necko dom widget xpconnect ifdef MOZ_OJI LIBRARY_NAME = oji diff --git a/modules/plugin/base/src/Makefile.in b/modules/plugin/base/src/Makefile.in index ea1dab8bd4e..a82fd4d795b 100644 --- a/modules/plugin/base/src/Makefile.in +++ b/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 locale layout widget cookie mimetype oji exthandler docshell webbrwsr nkcache gfx2 timer windowwatcher js +REQUIRES = xpcom string java pref necko gtkxtbin webshell caps intl dom layout widget cookie mimetype oji exthandler docshell webbrwsr timer windowwatcher # for xlib port REQUIRES += xlibrgb diff --git a/modules/plugin/nglsrc/Makefile.in b/modules/plugin/nglsrc/Makefile.in index ea1dab8bd4e..e69de29bb2d 100644 --- a/modules/plugin/nglsrc/Makefile.in +++ b/modules/plugin/nglsrc/Makefile.in @@ -1,106 +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 = plugin -XPIDL_MODULE = layout -LIBRARY_NAME = gkplugin -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 -MODULE_NAME = nsPluginModule -REQUIRES = xpcom string java pref necko gtkxtbin webshell caps intl dom locale layout widget cookie mimetype oji exthandler docshell webbrwsr nkcache gfx2 timer windowwatcher js -# for xlib port -REQUIRES += xlibrgb - -CPPSRCS = \ - ns4xPlugin.cpp \ - ns4xPluginInstance.cpp \ - nsPluginDocLoaderFactory.cpp \ - nsPluginHostImpl.cpp \ - nsPluginModule.cpp \ - nsPluginInstancePeer.cpp \ - nsPluginViewer.cpp \ - $(NULL) - -ifeq ($(OS_ARCH), BeOS) - CPPSRCS += nsPluginsDirBeOS.cpp -else -ifeq ($(MOZ_WIDGET_TOOLKIT),os2) - CPPSRCS += nsPluginsDirOS2.cpp -else - CPPSRCS += nsPluginsDirUnix.cpp -endif -endif - -EXPORTS = \ - nsPluginsCID.h \ - nsIPluginHost.h \ - nsIPluginInstanceOwner.h \ - $(NULL) - -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) - -EXTRA_DSO_LIBS += gkgfx - -EXTRA_DSO_LDOPTS = \ - $(MOZ_NECKO_UTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) - - -ifndef MOZ_MONOLITHIC_TOOLKIT -EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) -else -EXTRA_DSO_LDOPTS += $(TK_LIBS) -endif - -include $(topsrcdir)/config/rules.mk - -DEFINES += -D_IMPL_NS_PLUGIN - -ifdef MOZ_ENABLE_GTK -ifndef MOZ_MONOLITHIC_TOOLKIT -CXXFLAGS += $(MOZ_GTK_CFLAGS) -CFLAGS += $(MOZ_GTK_CFLAGS) -EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt -else -CXXFLAGS += $(TK_CFLAGS) -CFLAGS += $(TK_CFLAGS) -EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt -endif #MOZ_MONOLITHIC_TOOLKIT -endif #MOZ_ENABLE_GTK - -ifdef MOZ_ENABLE_QT -EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS) -ifndef MOZ_MONOLITHIC_TOOLKIT -CXXFLAGS += $(MOZ_QT_CFLAGS) -CFLAGS += $(MOZ_QT_CFLAGS) -else -CXXFLAGS += $(TK_CFLAGS) -CFLAGS += $(TK_CFLAGS) -endif #MOZ_MONOLITHIC_TOOLKIT -endif #MOZ_ENABLE_QT diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index 9afadf339de..314ae8dd92b 100644 --- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = neckobase_s -REQUIRES = xpcom string exthandler mimetype intl locale nkcache pref +REQUIRES = xpcom string exthandler mimetype intl pref CPPSRCS = \ nsURLHelper.cpp \ diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index 5b941f7f455..0e7b8c69dd2 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = necko EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = necko_core_and_primary_protocols -REQUIRES = xpcom string nkcache pref mimetype dbm util jar locale intl +REQUIRES = xpcom string nkcache pref mimetype util jar locale intl CPPSRCS = nsNetModule.cpp EXPORTS = nsNetCID.h diff --git a/netwerk/mime/src/Makefile.in b/netwerk/mime/src/Makefile.in index af61689bb42..726f67f76fb 100644 --- a/netwerk/mime/src/Makefile.in +++ b/netwerk/mime/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = mimetype LIBRARY_NAME = nkmime_s -REQUIRES = xpcom string necko appshell pref +REQUIRES = xpcom string necko pref CPPSRCS = \ nsMIMEInfoImpl.cpp \ diff --git a/netwerk/protocol/ftp/src/Makefile.in b/netwerk/protocol/ftp/src/Makefile.in index a89f4d349a9..06e49dc8a6c 100644 --- a/netwerk/protocol/ftp/src/Makefile.in +++ b/netwerk/protocol/ftp/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkftp_s -REQUIRES = xpcom string exthandler mimetype wallet dom layout widget pref intl +REQUIRES = xpcom string exthandler mimetype wallet pref intl CPPSRCS = \ nsFtpProtocolHandler.cpp \ diff --git a/netwerk/protocol/http/src/Makefile.in b/netwerk/protocol/http/src/Makefile.in index e0dec3bc9da..a18fde3d476 100644 --- a/netwerk/protocol/http/src/Makefile.in +++ b/netwerk/protocol/http/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkhttp_s -REQUIRES = xpcom string pref js nkcache exthandler mimetype wallet dom layout widget caps xpconnect intl +REQUIRES = xpcom string pref nkcache mimetype intl CPPSRCS = \ nsHttp.cpp \ diff --git a/netwerk/protocol/jar/src/Makefile.in b/netwerk/protocol/jar/src/Makefile.in index d5953b9da6b..8f3ae79767f 100644 --- a/netwerk/protocol/jar/src/Makefile.in +++ b/netwerk/protocol/jar/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkjar_s -REQUIRES = xpcom string jar exthandler mimetype caps dom js pref xpconnect +REQUIRES = xpcom string jar exthandler mimetype caps js pref xpconnect CPPSRCS = \ nsJARProtocolHandler.cpp \ diff --git a/parser/htmlparser/robot/Makefile.in b/parser/htmlparser/robot/Makefile.in index e6557046b44..665344299ab 100644 --- a/parser/htmlparser/robot/Makefile.in +++ b/parser/htmlparser/robot/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = DebugRobot SHORT_LIBNAME = dbgrobot -REQUIRES = xpcom string htmlparser necko docshell dom widget layout locale webshell uriloader gfx2 +REQUIRES = xpcom string htmlparser necko docshell dom uriloader CPPSRCS = nsDebugRobot.cpp nsRobotSink.cpp diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in index 3199f43698c..696e3027a46 100644 --- a/parser/htmlparser/src/Makefile.in +++ b/parser/htmlparser/src/Makefile.in @@ -32,7 +32,7 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsParserModule SHORT_LIBNAME = gkparser -REQUIRES = xpcom string necko util uconv expat layout dom unicharutil pref nkcache +REQUIRES = xpcom string necko util uconv expat layout dom pref nkcache SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \ diff --git a/profile/pref-migrator/src/Makefile.in b/profile/pref-migrator/src/Makefile.in index dbb5c89ddb3..ebde85a3592 100644 --- a/profile/pref-migrator/src/Makefile.in +++ b/profile/pref-migrator/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = nsprefm EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsPrefMigrationModule -REQUIRES = xpcom string pref appshell intl docshell dom necko rdf js layout locale uriloader widget webbrwsr uconv gfx2 mozcomps windowwatcher +REQUIRES = xpcom string pref appshell intl docshell dom necko rdf widget webbrwsr uconv windowwatcher CPPSRCS = \ nsPrefMigration.cpp \ diff --git a/profile/src/Makefile.in b/profile/src/Makefile.in index e05f4d975e6..c43e3674f20 100644 --- a/profile/src/Makefile.in +++ b/profile/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = profile EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsProfileModule -REQUIRES = xpcom string chrome docshell webbrwsr dom js layout widget necko uriloader locale cookie intl pref prefmigr appshell rdf uconv appcomps gfx2 windowwatcher +REQUIRES = xpcom string chrome docshell webbrwsr dom widget necko uriloader cookie intl pref prefmigr appshell rdf uconv appcomps windowwatcher CPPSRCS = nsProfile.cpp \ nsProfileFactory.cpp \ diff --git a/rdf/chrome/src/Makefile.in b/rdf/chrome/src/Makefile.in index 7806ee6e74b..7c5c62e0397 100644 --- a/rdf/chrome/src/Makefile.in +++ b/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 locale widget js appshell chrome caps pref docshell uriloader gfx2 imglib2 xpconnect +REQUIRES = xpcom string rdf xuldoc layout necko dom intl widget js appshell chrome caps pref docshell imglib2 xpconnect CPPSRCS = \ nsChromeRegistry.cpp \ diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in index 562c6891afd..40bdcecce7d 100644 --- a/uriloader/base/Makefile.in +++ b/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 pref js docshell layout widget caps htmlparser locale intl webshell mozcomps unicharutil xpconnect gfx2 +REQUIRES = xpcom string necko dom exthandler js docshell layout widget caps intl webshell xpconnect CPPSRCS = \ nsURILoader.cpp \ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index 3e1847b6a0c..2a3561bfc3d 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -33,7 +33,7 @@ endif MODULE = exthandler LIBRARY_NAME = exthandler_s -REQUIRES = xpcom string mimetype uriloader dom necko rdf webshell helperAppDlg pref +REQUIRES = xpcom string mimetype uriloader dom necko rdf webshell helperAppDlg ifeq ($(MOZ_WIDGET_TOOLKIT),os2) OSDIR = os2 diff --git a/view/src/Makefile.in b/view/src/Makefile.in index f6cd13899ef..b6310e8e1a2 100644 --- a/view/src/Makefile.in +++ b/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 gfx2 +REQUIRES = xpcom string layout widget dom locale timer pref EXTRA_DSO_LIBS = gkgfx diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in index 0b53ffeac5b..4bc5276465f 100644 --- a/webshell/tests/viewer/Makefile.in +++ b/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 unicharutil pref intl editor chardet cookie gfx2 txmgr js +REQUIRES = xpcom string webshell widget layout dom webbrwsr docshell util uriloader locale necko htmlparser view timer pref intl editor cookie PROGRAM := viewer$(BIN_SUFFIX) diff --git a/webshell/tests/viewer/unix/gtk/Makefile.in b/webshell/tests/viewer/unix/gtk/Makefile.in index 01d5a8bdc4b..4eb4266d4e2 100644 --- a/webshell/tests/viewer/unix/gtk/Makefile.in +++ b/webshell/tests/viewer/unix/gtk/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = webshell_tests LIBRARY_NAME = viewer_gtk_s -REQUIRES = xpcom string webbrwsr widget timer dom layout docshell uriloader locale webshell necko util gfx2 +REQUIRES = xpcom string webbrwsr widget timer dom layout docshell uriloader webshell necko util CPPSRCS = \ nsGtkMain.cpp \ diff --git a/widget/src/gtk/Makefile.in b/widget/src/gtk/Makefile.in index 147a0bb83bc..2b10d2ff523 100644 --- a/widget/src/gtk/Makefile.in +++ b/widget/src/gtk/Makefile.in @@ -27,7 +27,7 @@ LIBRARY_NAME = widget_gtk EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsWidgetGTKModule -REQUIRES = xpcom string layout pref js dom appshell timer uconv necko img view util rdf uriloader docshell msgcompose msgbase editor locale txmgr gfx2 windowwatcher mailnews intl +REQUIRES = xpcom string layout pref dom appshell timer uconv necko img view util rdf uriloader docshell msgcompose msgbase editor windowwatcher mailnews intl CSRCS = \ keysym2ucs.c diff --git a/widget/src/support/Makefile.in b/widget/src/support/Makefile.in index 94bd6632f4f..6ce5cce1200 100644 --- a/widget/src/support/Makefile.in +++ b/widget/src/support/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widgetsupport_s -REQUIRES = xpcom string widget layout dom gfx2 +REQUIRES = xpcom string widget layout CPPSRCS = nsWidgetSupport.cpp diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in index b16b7fec551..cb660450895 100644 --- a/widget/src/xpwidgets/Makefile.in +++ b/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 js docshell view intl locale necko uriloader htmlparser webshell uconv unicharutil gfx2 +REQUIRES = xpcom string layout dom pref docshell view intl locale necko htmlparser webshell uconv unicharutil DEFINES += -DUSE_TLS_FOR_TOOLKIT diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 6a7d356757b..e20648568c1 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom LIBRARY_NAME = xpcom EXPORT_LIBRARY = 1 -REQUIRES = libreg unicharutil string caps +REQUIRES = libreg unicharutil string CPPSRCS = nsXPComInit.cpp diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in index ef867d02c2e..8d83f7f8f9c 100644 --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom XPIDL_MODULE = xpcom_components LIBRARY_NAME = xpcomcomponents_s -REQUIRES = libreg string caps xpconnect js +REQUIRES = libreg string CPPSRCS = \ nsComponentManager.cpp \ diff --git a/xpfe/appshell/src/Makefile.in b/xpfe/appshell/src/Makefile.in index 01b7009b059..8dd57940434 100644 --- a/xpfe/appshell/src/Makefile.in +++ b/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 chardet intl chrome profile prefmigr xul gfx2 windowwatcher browser mozcomps caps +REQUIRES = xpcom string widget docshell webshell layout dom necko uriloader js locale webbrwsr rdf pref xpconnect timer intl xul windowwatcher browser mozcomps caps CPPSRCS = \ nsChromeTreeOwner.cpp \ diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in index 8a1e13b899f..1906283238c 100644 --- a/xpfe/bootstrap/Makefile.in +++ b/xpfe/bootstrap/Makefile.in @@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk MODULE = apprunner -REQUIRES = xpcom string webbrwsr widget dom js necko pref appshell wallet layout chrome rdf profile xpinstall uriloader editor view windowwatcher embed_base embedcomponents mpfilelocprovider browser mozcomps txmgr docshell gfx2 locale +REQUIRES = xpcom string webbrwsr widget dom necko pref appshell wallet layout chrome rdf profile xpinstall uriloader editor view windowwatcher embed_base embedcomponents mpfilelocprovider browser mozcomps docshell ifeq ($(USE_SHORT_LIBNAME),1) PROGRAM = mozilla$(BIN_SUFFIX) diff --git a/xpfe/browser/src/Makefile.in b/xpfe/browser/src/Makefile.in index 3eb88040e7c..0ff1c732d7c 100644 --- a/xpfe/browser/src/Makefile.in +++ b/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 js timer uriloader locale pref editor appcomps rdf webbrwsr uconv chardet txmgr gfx2 mozcomps windowwatcher +REQUIRES = xpcom string webshell necko shistory widget layout docshell appshell dom timer uriloader pref editor appcomps rdf webbrwsr uconv chardet windowwatcher CPPSRCS = nsBrowserInstance.cpp diff --git a/xpfe/components/bookmarks/src/Makefile.in b/xpfe/components/bookmarks/src/Makefile.in index 0251a7c7159..34acf2427fb 100644 --- a/xpfe/components/bookmarks/src/Makefile.in +++ b/xpfe/components/bookmarks/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = appcomps LIBRARY_NAME = bookmarks_s -REQUIRES = xpcom string rdf appshell widget necko uconv docshell pref timer dom js layout uriloader locale intl webshell gfx2 windowwatcher +REQUIRES = xpcom string rdf appshell widget necko uconv docshell pref timer dom intl webshell windowwatcher CPPSRCS = nsBookmarksService.cpp diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in index d437d2f2f50..d2d310236ee 100644 --- a/xpfe/components/build/Makefile.in +++ b/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 locale dom pref docshell webshell gfx2 +REQUIRES = xpcom string layout rdf necko timer intl mork widget dom pref docshell webshell CPPSRCS = nsModule.cpp diff --git a/xpfe/components/directory/Makefile.in b/xpfe/components/directory/Makefile.in index 7aa7be32330..7dd2de1ecd3 100644 --- a/xpfe/components/directory/Makefile.in +++ b/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 gfx2 windowwatcher +REQUIRES = xpcom string necko rdf layout timer js xpconnect docshell widget dom webshell uconv uriloader windowwatcher CPPSRCS = nsDirectoryViewer.cpp diff --git a/xpfe/components/find/src/Makefile.in b/xpfe/components/find/src/Makefile.in index d3fe6b7a26c..745624bf74e 100644 --- a/xpfe/components/find/src/Makefile.in +++ b/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 js layout widget appshell editor necko txtsvc docshell locale uriloader txmgr gfx2 mozcomps +REQUIRES = xpcom string dom layout widget editor necko txtsvc docshell CPPSRCS = \ nsFindComponent.cpp \ diff --git a/xpfe/components/history/src/Makefile.in b/xpfe/components/history/src/Makefile.in index eca1533f077..c6c679ebb3a 100644 --- a/xpfe/components/history/src/Makefile.in +++ b/xpfe/components/history/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = appcomps LIBRARY_NAME = history_s -REQUIRES = xpcom string rdf mork pref necko intl locale timer +REQUIRES = xpcom string rdf mork pref necko intl timer CPPSRCS = nsGlobalHistory.cpp \ $(NULL) diff --git a/xpfe/components/search/src/Makefile.in b/xpfe/components/search/src/Makefile.in index 52b7b87cdae..d251e66c1ec 100755 --- a/xpfe/components/search/src/Makefile.in +++ b/xpfe/components/search/src/Makefile.in @@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = appcomps LIBRARY_NAME = search_s -REQUIRES = xpcom string rdf necko timer pref uconv intl locale +REQUIRES = xpcom string rdf necko timer pref uconv intl CPPSRCS = \ nsInternetSearchService.cpp \ diff --git a/xpfe/components/shistory/src/Makefile.in b/xpfe/components/shistory/src/Makefile.in index 3be83c2a760..8169014d883 100644 --- a/xpfe/components/shistory/src/Makefile.in +++ b/xpfe/components/shistory/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = shistory EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = Session_History_Module -REQUIRES = xpcom string necko dom layout docshell locale widget uriloader pref gfx2 +REQUIRES = xpcom string necko dom layout docshell pref CPPSRCS = nsSHEntry.cpp \ nsSHTransaction.cpp \ diff --git a/xpfe/components/timebomb/Makefile.in b/xpfe/components/timebomb/Makefile.in index 92b4623a39d..a96b2dd0f6f 100644 --- a/xpfe/components/timebomb/Makefile.in +++ b/xpfe/components/timebomb/Makefile.in @@ -10,7 +10,7 @@ DIRS = tools MODULE = appcomps LIBRARY_NAME = timebomb_s XPIDL_MODULE = timebomb -REQUIRES = xpcom string pref appshell necko dom webbrwsr +REQUIRES = xpcom string pref appshell necko webbrwsr XPIDLSRCS = nsITimeBomb.idl diff --git a/xpfe/components/xfer/src/Makefile.in b/xpfe/components/xfer/src/Makefile.in index d402f0a00c0..daeaec03f48 100644 --- a/xpfe/components/xfer/src/Makefile.in +++ b/xpfe/components/xfer/src/Makefile.in @@ -31,7 +31,7 @@ LIBRARY_NAME = mozxfer EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsStreamTransferModule -REQUIRES = xpcom string necko appshell dom js widget pref intl locale layout mozcomps +REQUIRES = xpcom string necko dom js widget pref intl CPPSRCS = \ nsStreamTransfer.cpp \ diff --git a/xpinstall/src/Makefile.in b/xpinstall/src/Makefile.in index 578c4c4c3ff..9c6ada1ea56 100644 --- a/xpinstall/src/Makefile.in +++ b/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 gfx2 mozcomps windowwatcher +REQUIRES = xpcom string jar chrome necko intl locale libreg js pref appshell widget layout uriloader xpconnect docshell dom mozcomps windowwatcher # XXX shouldn't need to export this EXPORTS = nsXPITriggerInfo.h diff --git a/xpinstall/stub/Makefile.in b/xpinstall/stub/Makefile.in index fccdd674398..d240147e587 100644 --- a/xpinstall/stub/Makefile.in +++ b/xpinstall/stub/Makefile.in @@ -30,7 +30,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpistub LIBRARY_NAME = xpistub -REQUIRES = xpcom string xpinstall dom js +REQUIRES = xpcom string xpinstall dom CPPSRCS = \ nsStubNotifier.cpp \