diff --git a/mozilla/content/events/src/Makefile.in b/mozilla/content/events/src/Makefile.in index e2e13f55b4f..bdc0bc79cf1 100644 --- a/mozilla/content/events/src/Makefile.in +++ b/mozilla/content/events/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorevents_s -REQUIRES = xpcom raptor dom js netlib CPPSRCS = \ nsEventListenerManager.cpp \ diff --git a/mozilla/content/events/src/makefile.win b/mozilla/content/events/src/makefile.win index ce8b26f7a92..4eb4e21fc4a 100644 --- a/mozilla/content/events/src/makefile.win +++ b/mozilla/content/events/src/makefile.win @@ -26,7 +26,6 @@ include <$(DEPTH)\config\config.mak> LIBRARY_NAME=raptorevents_s MODULE=raptor -REQUIRES=xpcom raptor dom js DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/content/html/content/src/Makefile.in b/mozilla/content/html/content/src/Makefile.in index c915d4cb4d3..91ba1c6231f 100644 --- a/mozilla/content/html/content/src/Makefile.in +++ b/mozilla/content/html/content/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = nglhtmlcon_s -REQUIRES = xpcom raptor dom js netlib CPPSRCS = \ nsAttributeContent.cpp \ diff --git a/mozilla/content/html/content/src/makefile.win b/mozilla/content/html/content/src/makefile.win index 0a9014b3eba..89db4227344 100644 --- a/mozilla/content/html/content/src/makefile.win +++ b/mozilla/content/html/content/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME = nglhtmlcon_s MODULE=raptor -REQUIRES=xpcom raptor js DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) DEFINES = $(DEFINES) -DXP_NEW_SELECTION diff --git a/mozilla/content/xbl/src/makefile.win b/mozilla/content/xbl/src/makefile.win index ca18d987b37..a322dc29930 100644 --- a/mozilla/content/xbl/src/makefile.win +++ b/mozilla/content/xbl/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\.. LIBRARY_NAME=raptorxbl_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/content/xml/content/src/Makefile.in b/mozilla/content/xml/content/src/Makefile.in index 2cc28b5964b..029997678b9 100644 --- a/mozilla/content/xml/content/src/Makefile.in +++ b/mozilla/content/xml/content/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorxmlcontent_s -REQUIRES = xpcom raptor dom netlib js pref CPPSRCS = \ nsXMLElement.cpp \ diff --git a/mozilla/content/xml/content/src/makefile.win b/mozilla/content/xml/content/src/makefile.win index 640543023a6..65f5f15a2f9 100644 --- a/mozilla/content/xml/content/src/makefile.win +++ b/mozilla/content/xml/content/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorxmlcontent_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in index d8f5ab7ee74..f9405a891f2 100644 --- a/mozilla/content/xml/document/src/Makefile.in +++ b/mozilla/content/xml/document/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorxmldoc_s -REQUIRES = xpcom raptor dom netlib js pref CPPSRCS = \ nsXMLContentSink.cpp \ diff --git a/mozilla/content/xml/document/src/makefile.win b/mozilla/content/xml/document/src/makefile.win index 4a663844d8a..e77b6342bb9 100644 --- a/mozilla/content/xml/document/src/makefile.win +++ b/mozilla/content/xml/document/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorxmldoc_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN !if defined(MOZ_XSL) diff --git a/mozilla/content/xsl/document/src/Makefile.in b/mozilla/content/xsl/document/src/Makefile.in index ae984648413..4735aea49fd 100755 --- a/mozilla/content/xsl/document/src/Makefile.in +++ b/mozilla/content/xsl/document/src/Makefile.in @@ -49,7 +49,6 @@ LOCAL_INCLUDES = \ MODULE=layout -REQUIRES = xpcom raptor dom js pref MKSHLIB := diff --git a/mozilla/content/xsl/document/src/makefile.win b/mozilla/content/xsl/document/src/makefile.win index 1114e1378e2..686f308444b 100644 --- a/mozilla/content/xsl/document/src/makefile.win +++ b/mozilla/content/xsl/document/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorxsldoc_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN !if defined(MOZ_XSL) diff --git a/mozilla/directory/xpcom/base/src/Makefile.in b/mozilla/directory/xpcom/base/src/Makefile.in index 07a74af524a..1df7b05bbdb 100644 --- a/mozilla/directory/xpcom/base/src/Makefile.in +++ b/mozilla/directory/xpcom/base/src/Makefile.in @@ -43,7 +43,6 @@ LIBRARY_NAME = mozldap SHORT_LIBNAME = mozldap IS_COMPONENT = 1 -REQUIRES = xpcom necko CPPSRCS = \ nsLDAPService.cpp \ diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index 03cbdd74b5c..aae31a00ad4 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/dom/src/base/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdombase_s -REQUIRES = xpcom raptor dom js netlib caps oji ojiimpl CPPSRCS = \ nsBarProps.cpp \ diff --git a/mozilla/dom/src/base/makefile.win b/mozilla/dom/src/base/makefile.win index 3d41cdae77a..74f77231f47 100644 --- a/mozilla/dom/src/base/makefile.win +++ b/mozilla/dom/src/base/makefile.win @@ -59,7 +59,6 @@ EXPORTS=nsJSUtils.h MODULE=raptor -REQUIRES=xpcom raptor js netlib caps oji CPP_OBJS= \ .\$(OBJDIR)\nsBarProps.obj \ diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in index f8737ec06a4..ee262ad1f64 100644 --- a/mozilla/dom/src/build/Makefile.in +++ b/mozilla/dom/src/build/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdom -REQUIRES = xpcom raptor caps oji CPPSRCS = \ nsDOMFactory.cpp \ diff --git a/mozilla/dom/src/coreDOM/Makefile.in b/mozilla/dom/src/coreDOM/Makefile.in index 29b32e7979c..bddd64d6422 100644 --- a/mozilla/dom/src/coreDOM/Makefile.in +++ b/mozilla/dom/src/coreDOM/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdomcore_s -REQUIRES = xpcom raptor dom js netlib CPPSRCS = \ nsJSAttr.cpp \ diff --git a/mozilla/dom/src/coreDOM/makefile.win b/mozilla/dom/src/coreDOM/makefile.win index bdc2b301788..a39e3890a4c 100644 --- a/mozilla/dom/src/coreDOM/makefile.win +++ b/mozilla/dom/src/coreDOM/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\.. LIBRARY_NAME=jsdomcore_s MODULE=raptor -REQUIRES=xpcom raptor js netlib DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN CPPSRCS = \ diff --git a/mozilla/dom/src/css/Makefile.in b/mozilla/dom/src/css/Makefile.in index 0ed9b727f98..b73361c0d3f 100644 --- a/mozilla/dom/src/css/Makefile.in +++ b/mozilla/dom/src/css/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdomcss_s -REQUIRES = xpcom raptor dom js netlib CPPSRCS = \ nsJSCSS2Properties.cpp \ diff --git a/mozilla/dom/src/css/makefile.win b/mozilla/dom/src/css/makefile.win index 0c3953ba678..934359bcbce 100644 --- a/mozilla/dom/src/css/makefile.win +++ b/mozilla/dom/src/css/makefile.win @@ -6,7 +6,6 @@ DEPTH=..\..\.. LIBRARY_NAME=jsdomcss_s MODULE=raptor -REQUIRES=xpcom raptor js netlib DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN CPPSRCS = \ diff --git a/mozilla/dom/src/events/Makefile.in b/mozilla/dom/src/events/Makefile.in index 4773d190292..6961fa948ac 100644 --- a/mozilla/dom/src/events/Makefile.in +++ b/mozilla/dom/src/events/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdomevents_s -REQUIRES = xpcom raptor dom js CPPSRCS = \ nsJSEventListener.cpp \ diff --git a/mozilla/dom/src/events/makefile.win b/mozilla/dom/src/events/makefile.win index 38bb3bdd62b..ade2e79284c 100644 --- a/mozilla/dom/src/events/makefile.win +++ b/mozilla/dom/src/events/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\.. LIBRARY_NAME=jsdomevents_s MODULE=raptor -REQUIRES=xpcom raptor js DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/dom/src/html/Makefile.in b/mozilla/dom/src/html/Makefile.in index 42e3b7537fc..7c7cb0b909b 100644 --- a/mozilla/dom/src/html/Makefile.in +++ b/mozilla/dom/src/html/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdomhtml_s -REQUIRES = xpcom raptor dom js netlib CPPSRCS = \ nsJSHTMLIFrameElement.cpp \ diff --git a/mozilla/dom/src/html/makefile.win b/mozilla/dom/src/html/makefile.win index 0448da708b2..6214f94911f 100644 --- a/mozilla/dom/src/html/makefile.win +++ b/mozilla/dom/src/html/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\.. LIBRARY_NAME=jsdomhtml_s MODULE=raptor -REQUIRES=xpcom raptor js netlib DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN CPPSRCS = \ diff --git a/mozilla/dom/src/jsurl/Makefile.in b/mozilla/dom/src/jsurl/Makefile.in index 2e221ab5f96..cd1bd3f8591 100644 --- a/mozilla/dom/src/jsurl/Makefile.in +++ b/mozilla/dom/src/jsurl/Makefile.in @@ -34,7 +34,6 @@ XPIDLSRCS = \ nsIEvaluateStringProxy.idl \ $(NULL) -REQUIRES = netwerk xpcom CPPSRCS = nsJSProtocolHandler.cpp diff --git a/mozilla/dom/src/jsurl/makefile.win b/mozilla/dom/src/jsurl/makefile.win index 1fae09f070e..3c4efcea482 100644 --- a/mozilla/dom/src/jsurl/makefile.win +++ b/mozilla/dom/src/jsurl/makefile.win @@ -63,7 +63,6 @@ XPIDLSRCS = \ $(NULL) -REQUIRES=netwerk include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/dom/src/range/Makefile.in b/mozilla/dom/src/range/Makefile.in index 32a450a4036..db61d36912f 100644 --- a/mozilla/dom/src/range/Makefile.in +++ b/mozilla/dom/src/range/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom LIBRARY_NAME = jsdomrange_s -REQUIRES = xpcom raptor dom js CPPSRCS = \ nsJSRange.cpp \ diff --git a/mozilla/dom/src/range/makefile.win b/mozilla/dom/src/range/makefile.win index d1d31bce41d..2b0a9e9fe6a 100644 --- a/mozilla/dom/src/range/makefile.win +++ b/mozilla/dom/src/range/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\.. LIBRARY_NAME=jsdomrange_s MODULE=raptor -REQUIRES=xpcom raptor js DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/editor/txmgr/src/Makefile.in b/mozilla/editor/txmgr/src/Makefile.in index 6af3d70916c..edd80e96012 100644 --- a/mozilla/editor/txmgr/src/Makefile.in +++ b/mozilla/editor/txmgr/src/Makefile.in @@ -30,8 +30,6 @@ MODULE = txmgr LIBRARY_NAME = txmgr IS_COMPONENT = 1 -REQUIRES = xpcom - CPPSRCS = \ nsTransactionItem.cpp \ nsTransactionManager.cpp \ diff --git a/mozilla/editor/txmgr/src/makefile.win b/mozilla/editor/txmgr/src/makefile.win index 67d569871ff..4d51be9b759 100644 --- a/mozilla/editor/txmgr/src/makefile.win +++ b/mozilla/editor/txmgr/src/makefile.win @@ -40,8 +40,6 @@ CPP_OBJS = \ MODULE=txmgr -REQUIRES=xpcom base raptor - LINCS=-I$(PUBLIC)\xpcom \ -I$(PUBLIC)\txmgr \ -I$(PUBLIC)\base \ diff --git a/mozilla/editor/txmgr/tests/makefile.win b/mozilla/editor/txmgr/tests/makefile.win index 602f6274e8a..d39a1c31608 100644 --- a/mozilla/editor/txmgr/tests/makefile.win +++ b/mozilla/editor/txmgr/tests/makefile.win @@ -29,8 +29,6 @@ PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -REQUIRES=xpcom raptor dom base - LINCS=-I$(PUBLIC)\txmgr \ -I$(PUBLIC)\xpcom \ -I$(PUBLIC)\raptor \ diff --git a/mozilla/editor/txtsvc/src/Makefile.in b/mozilla/editor/txtsvc/src/Makefile.in index 618045cb3da..67fe10f8cbf 100644 --- a/mozilla/editor/txtsvc/src/Makefile.in +++ b/mozilla/editor/txtsvc/src/Makefile.in @@ -30,8 +30,6 @@ MODULE = txtsvc LIBRARY_NAME = txtsvc IS_COMPONENT = 1 -REQUIRES = xpcom - CPPSRCS = \ nsTextServicesDocument.cpp \ nsTextServicesFactory.cpp \ diff --git a/mozilla/editor/txtsvc/src/makefile.win b/mozilla/editor/txtsvc/src/makefile.win index b92b1067b9c..54210d9e4f7 100644 --- a/mozilla/editor/txtsvc/src/makefile.win +++ b/mozilla/editor/txtsvc/src/makefile.win @@ -38,8 +38,6 @@ CPP_OBJS = \ MODULE=txtsvc -REQUIRES=xpcom base dom raptor - LINCS=-I$(PUBLIC)\xpcom \ -I$(PUBLIC)\txtsvc \ -I$(PUBLIC)\editor \ diff --git a/mozilla/embedding/browser/gtk/src/Makefile.in b/mozilla/embedding/browser/gtk/src/Makefile.in index d4fca26c95b..9733b81a819 100644 --- a/mozilla/embedding/browser/gtk/src/Makefile.in +++ b/mozilla/embedding/browser/gtk/src/Makefile.in @@ -27,7 +27,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gtkembedmoz -REQUIRES = xpcom CPPSRCS = \ GtkMozEmbedChrome.cpp \ diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in index 2abe0d77cef..8881351b4b7 100644 --- a/mozilla/extensions/cookie/Makefile.in +++ b/mozilla/extensions/cookie/Makefile.in @@ -34,8 +34,6 @@ ifdef ENABLE_TESTS DIRS = tests endif -REQUIRES = js netlib xpcom xppref32 nspr - CPPSRCS = \ nsCookieService.cpp \ nsCookie.cpp \ diff --git a/mozilla/extensions/cookie/tests/Makefile.in b/mozilla/extensions/cookie/tests/Makefile.in index 09dc3f4c212..b9cd38e8e55 100644 --- a/mozilla/extensions/cookie/tests/Makefile.in +++ b/mozilla/extensions/cookie/tests/Makefile.in @@ -29,8 +29,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = TestCookie$(BIN_SUFFIX) CPPSRCS = TestCookie.cpp -REQUIRES = js cookie pref xpcom include - LIBS = $(XPCOM_LIBS) $(NSPR_LIBS) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/irc/libbs/Makefile.in b/mozilla/extensions/irc/libbs/Makefile.in index 426aabade65..e5b2b7c5ab5 100644 --- a/mozilla/extensions/irc/libbs/Makefile.in +++ b/mozilla/extensions/irc/libbs/Makefile.in @@ -30,8 +30,6 @@ MODULE = bs LIBRARY_NAME = bs IS_COMPONENT = 1 -REQUIRES = bs xpcom - CSRCS = \ bsutil.c \ bserror.c \ diff --git a/mozilla/extensions/irc/libbs/makefile.win b/mozilla/extensions/irc/libbs/makefile.win index 2ec9f75ce22..5cb68e6957c 100644 --- a/mozilla/extensions/irc/libbs/makefile.win +++ b/mozilla/extensions/irc/libbs/makefile.win @@ -48,7 +48,6 @@ OBJS = \ .\$(OBJDIR)\bsXPCConnectionFactory.obj \ $(NULL) -REQUIRES = bs xpcom LIBRARY_NAME = bs IS_COMPONENT = 1 diff --git a/mozilla/extensions/pics/src/Makefile.in b/mozilla/extensions/pics/src/Makefile.in index f03f2208c4c..d38a5d9353b 100644 --- a/mozilla/extensions/pics/src/Makefile.in +++ b/mozilla/extensions/pics/src/Makefile.in @@ -29,8 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = pics LIBRARY_NAME = pics -REQUIRES = js netlib xpcom xppref32 nspr - CSRCS = \ cslabel.c \ csparse.c \ diff --git a/mozilla/extensions/pics/tests/Makefile.in b/mozilla/extensions/pics/tests/Makefile.in index 573ae0615c4..de7b3b0ecc3 100644 --- a/mozilla/extensions/pics/tests/Makefile.in +++ b/mozilla/extensions/pics/tests/Makefile.in @@ -30,8 +30,6 @@ PROGRAM = TestPICS CPPSRCS = TestPICS.cpp -REQUIRES = js pics pref xpcom include - LIBS = \ $(XPCOM_LIBS) \ -lpics \ diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in index a3a27c17cc3..822ed0e78a4 100644 --- a/mozilla/extensions/transformiix/build/Makefile.in +++ b/mozilla/extensions/transformiix/build/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = transformiix LIBRARY_NAME = transformiix SHORT_LIBNAME = t8iix -REQUIRES = xpcom raptor IS_COMPONENT = 1 diff --git a/mozilla/extensions/transformiix/build/makefile.win b/mozilla/extensions/transformiix/build/makefile.win index e257889e187..bdab3131903 100644 --- a/mozilla/extensions/transformiix/build/makefile.win +++ b/mozilla/extensions/transformiix/build/makefile.win @@ -25,7 +25,6 @@ include <$(DEPTH)/config/config.mak> DEFINES=-DMOZILLA MODULE=transformix -REQUIRES=xpcom raptor IS_COMPONENT = 1 CPPSRCS= \ diff --git a/mozilla/extensions/transformiix/source/base/makefile.win b/mozilla/extensions/transformiix/source/base/makefile.win index 5652977ed45..256bd84b479 100644 --- a/mozilla/extensions/transformiix/source/base/makefile.win +++ b/mozilla/extensions/transformiix/source/base/makefile.win @@ -23,8 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=transformix_base MODULE=transformix -REQUIRES=xpcom raptor - DEFINES=-DMOZILLA CPPSRCS= \ diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win index e2a9687f04d..a73caf1f509 100644 --- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win +++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win @@ -23,8 +23,6 @@ DEPTH=..\..\..\..\..\.. LIBRARY_NAME=transformix_xml_dom_mozImpl MODULE=transformix -REQUIRES=xpcom raptor - CPPSRCS= \ MozillaAttr.cpp \ MozillaCDATASection.cpp \ diff --git a/mozilla/extensions/transformiix/source/xml/makefile.win b/mozilla/extensions/transformiix/source/xml/makefile.win index 5bbad6f8f78..810d99ebb68 100644 --- a/mozilla/extensions/transformiix/source/xml/makefile.win +++ b/mozilla/extensions/transformiix/source/xml/makefile.win @@ -25,8 +25,6 @@ DIRS=dom LIBRARY_NAME=transformix_xml MODULE=transformix -REQUIRES=xpcom raptor - CPPSRCS= \ XMLDOMUtils.cpp \ XMLUtils.cpp \ diff --git a/mozilla/extensions/transformiix/source/xpath/makefile.win b/mozilla/extensions/transformiix/source/xpath/makefile.win index e29aa68d5f6..a5c1fd58fee 100644 --- a/mozilla/extensions/transformiix/source/xpath/makefile.win +++ b/mozilla/extensions/transformiix/source/xpath/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=transformix_xpath MODULE=transformix -REQUIRES=xpcom raptor CPPSRCS= \ AdditiveExpr.cpp \ diff --git a/mozilla/extensions/transformiix/source/xslt/functions/makefile.win b/mozilla/extensions/transformiix/source/xslt/functions/makefile.win index c5c08a237e7..32ab1a15be8 100644 --- a/mozilla/extensions/transformiix/source/xslt/functions/makefile.win +++ b/mozilla/extensions/transformiix/source/xslt/functions/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\..\.. LIBRARY_NAME=transformix_xslt_functions MODULE=transformix -REQUIRES=xpcom raptor CPPSRCS= \ GenerateIDFunctionCall.cpp \ diff --git a/mozilla/extensions/transformiix/source/xslt/makefile.win b/mozilla/extensions/transformiix/source/xslt/makefile.win index 07e81741f65..5f0b5b941ed 100644 --- a/mozilla/extensions/transformiix/source/xslt/makefile.win +++ b/mozilla/extensions/transformiix/source/xslt/makefile.win @@ -25,7 +25,6 @@ DIRS=util functions LIBRARY_NAME=transformix_xslt MODULE=transformix -REQUIRES=xpcom raptor DEFINES=-DMOZILLA diff --git a/mozilla/extensions/transformiix/source/xslt/util/makefile.win b/mozilla/extensions/transformiix/source/xslt/util/makefile.win index 2762db1f79c..f00f8f69118 100644 --- a/mozilla/extensions/transformiix/source/xslt/util/makefile.win +++ b/mozilla/extensions/transformiix/source/xslt/util/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\..\.. LIBRARY_NAME=transformix_xslt_util MODULE=transformix -REQUIRES=xpcom raptor CPPSRCS= \ NodeStack.cpp \ diff --git a/mozilla/extensions/wallet/cookieviewer/Makefile.in b/mozilla/extensions/wallet/cookieviewer/Makefile.in index ad1cb1a74da..b4153bcec7b 100644 --- a/mozilla/extensions/wallet/cookieviewer/Makefile.in +++ b/mozilla/extensions/wallet/cookieviewer/Makefile.in @@ -30,7 +30,6 @@ MODULE = walletviewers LIBRARY_NAME = cookieviewer_s XPIDL_MODULE = cookieviewer -REQUIRES = walleteditor raptor xpcom CPPSRCS = nsCookieViewer.cpp diff --git a/mozilla/extensions/wallet/editor/Makefile.in b/mozilla/extensions/wallet/editor/Makefile.in index fe88da2a18b..f6801e40df8 100644 --- a/mozilla/extensions/wallet/editor/Makefile.in +++ b/mozilla/extensions/wallet/editor/Makefile.in @@ -30,7 +30,6 @@ MODULE = walletviewers LIBRARY_NAME = walleteditor_s XPIDL_MODULE = walleteditor -REQUIRES = walleteditor raptor xpcom CPPSRCS = nsWalletEditor.cpp diff --git a/mozilla/extensions/wallet/signonviewer/Makefile.in b/mozilla/extensions/wallet/signonviewer/Makefile.in index 7a6ea55d60a..5ebb60b45f7 100644 --- a/mozilla/extensions/wallet/signonviewer/Makefile.in +++ b/mozilla/extensions/wallet/signonviewer/Makefile.in @@ -30,7 +30,6 @@ MODULE = walletviewers LIBRARY_NAME = signonviewer_s XPIDL_MODULE = signonviewer -REQUIRES = walleteditor raptor xpcom CPPSRCS = nsSignonViewer.cpp diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in index 8b3cee76233..525f1cf1052 100644 --- a/mozilla/extensions/wallet/src/Makefile.in +++ b/mozilla/extensions/wallet/src/Makefile.in @@ -30,7 +30,6 @@ MODULE = wallet LIBRARY_NAME = wallet IS_COMPONENT = 1 -REQUIRES = wallet CPPSRCS = \ nsWalletFactory.cpp \ diff --git a/mozilla/extensions/wallet/src/makefile.win b/mozilla/extensions/wallet/src/makefile.win index d2ae16bca6b..735ec926c30 100644 --- a/mozilla/extensions/wallet/src/makefile.win +++ b/mozilla/extensions/wallet/src/makefile.win @@ -40,7 +40,6 @@ CPPSRCS = \ $(NULL) MODULE=wallet -REQUIRES=wallet EXPORTS= $(NULL) LLIBS=$(LLIBS) $(LIBNSPR) \ diff --git a/mozilla/extensions/wallet/walletpreview/Makefile.in b/mozilla/extensions/wallet/walletpreview/Makefile.in index 038124393dc..1fa48cd68a1 100644 --- a/mozilla/extensions/wallet/walletpreview/Makefile.in +++ b/mozilla/extensions/wallet/walletpreview/Makefile.in @@ -30,7 +30,6 @@ MODULE = walletviewers LIBRARY_NAME = walletpreview_s XPIDL_MODULE = walletpreview -REQUIRES = walleteditor raptor xpcom CPPSRCS = nsWalletPreview.cpp diff --git a/mozilla/extensions/xmlextras/base/src/makefile.win b/mozilla/extensions/xmlextras/base/src/makefile.win index e8401ae6ade..d0f953ffa4c 100644 --- a/mozilla/extensions/xmlextras/base/src/makefile.win +++ b/mozilla/extensions/xmlextras/base/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=xmlextrasbase_s MODULE=xmlextras -REQUIRES=xpcom raptor dom DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/extensions/xmlterm/base/Makefile.in b/mozilla/extensions/xmlterm/base/Makefile.in index 39745c3b521..25af44996ae 100644 --- a/mozilla/extensions/xmlterm/base/Makefile.in +++ b/mozilla/extensions/xmlterm/base/Makefile.in @@ -107,7 +107,6 @@ endif # Also create static library libxmlterm.a override NO_STATIC_LIB= -REQUIRES = include $(topsrcdir)/config/config.mk diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in index c799f764ee1..08a47d80a00 100644 --- a/mozilla/gfx/src/Makefile.in +++ b/mozilla/gfx/src/Makefile.in @@ -30,7 +30,6 @@ MODULE = raptor LIBRARY_NAME = raptorgfx SHORT_LIBNAME = nggfx -REQUIRES = util img xpcom raptor netlib dom js ifeq ($(MOZ_WIDGET_TOOLKIT),os2) DIRS = diff --git a/mozilla/gfx/src/beos/Makefile.in b/mozilla/gfx/src/beos/Makefile.in index acb60926ff0..f3e92c8c9f6 100644 --- a/mozilla/gfx/src/beos/Makefile.in +++ b/mozilla/gfx/src/beos/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = raptor LIBRARY_NAME = gfx_beos -REQUIRES = util img xpcom raptor netlib ps CPPSRCS = \ nsDeviceContextBeOS.cpp \ diff --git a/mozilla/gfx/src/gtk/Makefile.in b/mozilla/gfx/src/gtk/Makefile.in index 3dbfde04b76..3d2b45166fa 100644 --- a/mozilla/gfx/src/gtk/Makefile.in +++ b/mozilla/gfx/src/gtk/Makefile.in @@ -30,7 +30,6 @@ MODULE = raptor LIBRARY_NAME = gfx_gtk IS_COMPONENT = 1 -REQUIRES = util img xpcom raptor netlib ps CSRCS = nsPrintdGTK.c diff --git a/mozilla/gfx/src/mac/Makefile.in b/mozilla/gfx/src/mac/Makefile.in index 442f9e1f554..25b1ee76aa4 100644 --- a/mozilla/gfx/src/mac/Makefile.in +++ b/mozilla/gfx/src/mac/Makefile.in @@ -27,7 +27,6 @@ LIBRARY_NAME = gfx_mac MODULE = raptor IS_COMPONENT = 1 -REQUIRES = util img xpcom raptor netlib CPPSRCS = \ nsATSUIUtils.cpp \ diff --git a/mozilla/gfx/src/makefile.win b/mozilla/gfx/src/makefile.win index 5985870a1f4..08eaa0e1ba5 100644 --- a/mozilla/gfx/src/makefile.win +++ b/mozilla/gfx/src/makefile.win @@ -30,9 +30,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll #RESFILE = $(DLLNAME).res !ifdef NECKO -REQUIRES=util img xpcom raptor necko timer !else -REQUIRES=util img xpcom raptor netlib timer !endif DEFINES=-D_IMPL_NS_GFX -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/gfx/src/motif/Makefile.in b/mozilla/gfx/src/motif/Makefile.in index da478f3f84e..ade0338f63b 100644 --- a/mozilla/gfx/src/motif/Makefile.in +++ b/mozilla/gfx/src/motif/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = raptor LIBRARY_NAME = gfx_motif -REQUIRES = util img xpcom raptor netlib CPPSRCS = \ nsDeviceContextMotif.cpp \ diff --git a/mozilla/gfx/src/os2/Makefile.in b/mozilla/gfx/src/os2/Makefile.in index 00ad7b7360f..3f37393451c 100644 --- a/mozilla/gfx/src/os2/Makefile.in +++ b/mozilla/gfx/src/os2/Makefile.in @@ -30,7 +30,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = raptor LIBRARY_NAME = gfx_os2 -REQUIRES = util img xpcom raptor dom netlib java js CSRCS = libprint.c diff --git a/mozilla/gfx/src/photon/Makefile.in b/mozilla/gfx/src/photon/Makefile.in index 90692c893de..1c38e58cc04 100644 --- a/mozilla/gfx/src/photon/Makefile.in +++ b/mozilla/gfx/src/photon/Makefile.in @@ -30,7 +30,6 @@ MODULE = raptor LIBRARY_NAME = gfx_photon IS_COMPONENT = 1 -REQUIRES = util img xpcom raptor netlib ps CPPSRCS = \ nsDeviceContextPh.cpp \ diff --git a/mozilla/gfx/src/qt/Makefile.in b/mozilla/gfx/src/qt/Makefile.in index f9487a9268d..105892e7211 100644 --- a/mozilla/gfx/src/qt/Makefile.in +++ b/mozilla/gfx/src/qt/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = raptor LIBRARY_NAME = gfx_qt -REQUIRES = util img xpcom raptor netlib ps CPPSRCS = \ nsDeviceContextQT.cpp \ diff --git a/mozilla/gfx/src/rhapsody/Makefile.in b/mozilla/gfx/src/rhapsody/Makefile.in index 91c7ddafa07..6e42086a1ce 100644 --- a/mozilla/gfx/src/rhapsody/Makefile.in +++ b/mozilla/gfx/src/rhapsody/Makefile.in @@ -29,8 +29,6 @@ include $(DEPTH)/config/autoconf.mk #LIBRARY_NAME = gfxunix MODULE = raptor -#REQUIRES = util img xpcom raptor netlib - #CPPSRCS = \ # nsDeviceContextUnix.cpp \ # nsFontMetricsUnix.cpp \ diff --git a/mozilla/gfx/src/xlib/Makefile.in b/mozilla/gfx/src/xlib/Makefile.in index b6ed1ae1188..55eded192d8 100644 --- a/mozilla/gfx/src/xlib/Makefile.in +++ b/mozilla/gfx/src/xlib/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = raptor LIBRARY_NAME = gfx_xlib -REQUIRES = util img xpcom raptor netlib ps CPPSRCS = \ nsDeviceContextSpecFactoryX.cpp \ diff --git a/mozilla/htmlparser/robot/test/Makefile.in b/mozilla/htmlparser/robot/test/Makefile.in index 5a182f66428..96b7f3ef8f6 100644 --- a/mozilla/htmlparser/robot/test/Makefile.in +++ b/mozilla/htmlparser/robot/test/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = htmlrobot$(BIN_SUFFIX) -REQUIRES = xpcom CPPSRCS = RobotMain.cpp diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in index 289b0a84149..c3f7768361c 100644 --- a/mozilla/htmlparser/src/Makefile.in +++ b/mozilla/htmlparser/src/Makefile.in @@ -32,7 +32,6 @@ IS_COMPONENT = 1 SHORT_LIBNAME = htmlpars EXTRA_DSO_LIBS = expat_s xmltok_s mozutil_s -REQUIRES = xpcom netlib raptor CPPSRCS = \ nsDTDUtils.cpp \ diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win index 000c6ed9710..de46273e956 100644 --- a/mozilla/htmlparser/src/makefile.win +++ b/mozilla/htmlparser/src/makefile.win @@ -27,7 +27,6 @@ LIBRARY_NAME=raptorhtmlpars DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN -DXML_DTD MODULE=raptor -REQUIRES=xpcom raptor netlib IS_COMPONENT = 1 CPPSRCS= \ diff --git a/mozilla/intl/chardet/src/Makefile.in b/mozilla/intl/chardet/src/Makefile.in index 383a8d3e6b6..96790eada19 100644 --- a/mozilla/intl/chardet/src/Makefile.in +++ b/mozilla/intl/chardet/src/Makefile.in @@ -30,7 +30,6 @@ MODULE = chardet LIBRARY_NAME = chardet IS_COMPONENT = 1 -REQUIRES = libxpcom CPPSRCS = \ nsCharDetModule.cpp \ diff --git a/mozilla/intl/chardet/src/classic/Makefile.in b/mozilla/intl/chardet/src/classic/Makefile.in index 4b4dbbdbd93..a26ba3f53a7 100644 --- a/mozilla/intl/chardet/src/classic/Makefile.in +++ b/mozilla/intl/chardet/src/classic/Makefile.in @@ -30,7 +30,6 @@ MODULE = chardetc LIBRARY_NAME = chardetc IS_COMPONENT = 1 -REQUIRES = libxpcom CPPSRCS = \ nsClassicCharDetDll.cpp \ diff --git a/mozilla/intl/chardet/src/classic/makefile.win b/mozilla/intl/chardet/src/classic/makefile.win index f91e53831a1..fb9038dfaf6 100644 --- a/mozilla/intl/chardet/src/classic/makefile.win +++ b/mozilla/intl/chardet/src/classic/makefile.win @@ -44,7 +44,6 @@ CPP_OBJS= \ MODULE=chardetc -REQUIRES=xpcom MAKE_OBJ_TYPE=DLL DLLNAME=chardetc diff --git a/mozilla/intl/chardet/src/makefile.win b/mozilla/intl/chardet/src/makefile.win index c6504793e60..4da7a17c8d4 100644 --- a/mozilla/intl/chardet/src/makefile.win +++ b/mozilla/intl/chardet/src/makefile.win @@ -61,7 +61,6 @@ CPP_OBJS= \ MODULE=chardet -REQUIRES=xpcom INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\chardet -I$(PUBLIC)\raptor \ -I$(PUBLIC)\netlib -I$(PUBLIC)\uconv -I$(PUBLIC)\webshell diff --git a/mozilla/intl/chardet/src/windows/makefile.win b/mozilla/intl/chardet/src/windows/makefile.win index 05dcdb4eec9..33424941c51 100644 --- a/mozilla/intl/chardet/src/windows/makefile.win +++ b/mozilla/intl/chardet/src/windows/makefile.win @@ -44,7 +44,6 @@ CPP_OBJS= \ MODULE=chardetnativeTest -REQUIRES=xpcom MAKE_OBJ_TYPE=DLL DLLNAME=chardetnativeTest diff --git a/mozilla/intl/chardet/tests/makefile.win b/mozilla/intl/chardet/tests/makefile.win index 95a2b088b4b..010b8865604 100644 --- a/mozilla/intl/chardet/tests/makefile.win +++ b/mozilla/intl/chardet/tests/makefile.win @@ -29,7 +29,6 @@ PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -REQUIRES=libreg LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor diff --git a/mozilla/intl/chardet/tools/makefile.win b/mozilla/intl/chardet/tools/makefile.win index 282ec66645e..0f86611d069 100644 --- a/mozilla/intl/chardet/tools/makefile.win +++ b/mozilla/intl/chardet/tools/makefile.win @@ -29,7 +29,6 @@ PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -REQUIRES=libreg LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor diff --git a/mozilla/intl/compatibility/src/Makefile.in b/mozilla/intl/compatibility/src/Makefile.in index 432e418aa3f..4ae3f7f37f5 100644 --- a/mozilla/intl/compatibility/src/Makefile.in +++ b/mozilla/intl/compatibility/src/Makefile.in @@ -30,7 +30,6 @@ MODULE = intlcmpt LIBRARY_NAME = intlcmpt IS_COMPONENT = 1 -REQUIRES = xpcom CPPSRCS = \ nsI18nCompatibility.cpp \ diff --git a/mozilla/intl/compatibility/src/makefile.win b/mozilla/intl/compatibility/src/makefile.win index 6d2f1cc5c21..cb877739b9b 100644 --- a/mozilla/intl/compatibility/src/makefile.win +++ b/mozilla/intl/compatibility/src/makefile.win @@ -39,7 +39,6 @@ CPP_OBJS= \ MODULE=intlcmpt -REQUIRES=xpcom INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor diff --git a/mozilla/intl/compatibility/tests/makefile.win b/mozilla/intl/compatibility/tests/makefile.win index da940436eb2..c5415c3d2e2 100644 --- a/mozilla/intl/compatibility/tests/makefile.win +++ b/mozilla/intl/compatibility/tests/makefile.win @@ -29,7 +29,6 @@ PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -REQUIRES=libreg LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\lwbrk -I$(PUBLIC)\raptor diff --git a/mozilla/intl/locale/src/Makefile.in b/mozilla/intl/locale/src/Makefile.in index 0e113426040..1e5fa1481b7 100644 --- a/mozilla/intl/locale/src/Makefile.in +++ b/mozilla/intl/locale/src/Makefile.in @@ -35,7 +35,6 @@ else DIRS = unix endif -REQUIRES = xpcom unicharutil CPPSRCS = \ nsCollation.cpp \ diff --git a/mozilla/intl/locale/src/makefile.win b/mozilla/intl/locale/src/makefile.win index 9e957e1770a..ba9f3505884 100644 --- a/mozilla/intl/locale/src/makefile.win +++ b/mozilla/intl/locale/src/makefile.win @@ -28,7 +28,6 @@ DEPTH = ..\..\.. DEFINES = -D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE = locale -REQUIRES = xpcom unicharutil uconv DIRS = windows MAKE_OBJ_TYPE = DLL diff --git a/mozilla/intl/locale/src/os2/Makefile.in b/mozilla/intl/locale/src/os2/Makefile.in index 49d2ff47752..8a551340316 100644 --- a/mozilla/intl/locale/src/os2/Makefile.in +++ b/mozilla/intl/locale/src/os2/Makefile.in @@ -28,7 +28,6 @@ LIBRARY_NAME = nslocale IS_COMPONENT = 1 EXTRA_DSO_LIBS = nslocale_s -REQUIRES = xpcom unicharutil CPPSRCS = \ nsLocaleOS2.cpp \ diff --git a/mozilla/intl/locale/src/unix/Makefile.in b/mozilla/intl/locale/src/unix/Makefile.in index 2dec1607bc5..b42b975c4f0 100644 --- a/mozilla/intl/locale/src/unix/Makefile.in +++ b/mozilla/intl/locale/src/unix/Makefile.in @@ -30,7 +30,6 @@ MODULE = locale LIBRARY_NAME = nslocale IS_COMPONENT = 1 -REQUIRES = xpcom unicharutil CPPSRCS = \ nsCollationUnix.cpp \ diff --git a/mozilla/intl/locale/tests/makefile.win b/mozilla/intl/locale/tests/makefile.win index b0d6783c61c..ed5f7828b10 100644 --- a/mozilla/intl/locale/tests/makefile.win +++ b/mozilla/intl/locale/tests/makefile.win @@ -33,7 +33,6 @@ SRPTS = $(SRPT1) LCFLAGS=-DUSE_NSREG $(LCFLAGS) -REQUIRES=libreg LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\locale -I$(PUBLIC)\raptor \ -I$(PUBLIC)\uconv -I$(PUBLIC)\unicharutil diff --git a/mozilla/intl/lwbrk/src/Makefile.in b/mozilla/intl/lwbrk/src/Makefile.in index be35e345e6f..b5ce2003972 100644 --- a/mozilla/intl/lwbrk/src/Makefile.in +++ b/mozilla/intl/lwbrk/src/Makefile.in @@ -30,7 +30,6 @@ MODULE = lwbrk LIBRARY_NAME = lwbrk IS_COMPONENT = 1 -REQUIRES = libxpcom CSRCS = rulebrk.c diff --git a/mozilla/intl/lwbrk/src/makefile.win b/mozilla/intl/lwbrk/src/makefile.win index 347414d8dbd..2cc49953b85 100644 --- a/mozilla/intl/lwbrk/src/makefile.win +++ b/mozilla/intl/lwbrk/src/makefile.win @@ -50,7 +50,6 @@ CPP_OBJS= \ MODULE=lwbrk -REQUIRES=xpcom INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\lwbrk -I$(PUBLIC)\raptor diff --git a/mozilla/intl/lwbrk/tests/makefile.win b/mozilla/intl/lwbrk/tests/makefile.win index 38c4289255a..50a177794bd 100644 --- a/mozilla/intl/lwbrk/tests/makefile.win +++ b/mozilla/intl/lwbrk/tests/makefile.win @@ -29,7 +29,6 @@ PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -REQUIRES=libreg LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\lwbrk -I$(PUBLIC)\raptor diff --git a/mozilla/intl/strres/src/makefile.win b/mozilla/intl/strres/src/makefile.win index 18a78fcc6ea..54160f12cd9 100644 --- a/mozilla/intl/strres/src/makefile.win +++ b/mozilla/intl/strres/src/makefile.win @@ -37,8 +37,6 @@ CPP_OBJS = \ MODULE=intl -#REQUIRES=xpcom netlib raptor - LINCS=\ -I$(PUBLIC)\xpcom \ -I$(PUBLIC)\netlib \ diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in index e5e8efbd8cf..1484f74bd63 100644 --- a/mozilla/intl/uconv/src/Makefile.in +++ b/mozilla/intl/uconv/src/Makefile.in @@ -32,7 +32,6 @@ IS_COMPONENT = 1 # To avoid conflict with OS/2 system uconv.dll SHORT_LIBNAME = mozuconv -REQUIRES = libxpcom CSRCS = \ ugen.c \ diff --git a/mozilla/intl/uconv/src/makefile.win b/mozilla/intl/uconv/src/makefile.win index f71b04e7bf2..896742b5ee1 100644 --- a/mozilla/intl/uconv/src/makefile.win +++ b/mozilla/intl/uconv/src/makefile.win @@ -25,7 +25,6 @@ include <$(DEPTH)/config/config.mak> DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv -REQUIRES=xpcom MAKE_OBJ_TYPE = DLL DLLNAME = uconv diff --git a/mozilla/intl/uconv/tests/makefile.win b/mozilla/intl/uconv/tests/makefile.win index fc8d7c50424..fdbb537b8d5 100644 --- a/mozilla/intl/uconv/tests/makefile.win +++ b/mozilla/intl/uconv/tests/makefile.win @@ -32,7 +32,6 @@ PROGRAMS = $(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5) LCFLAGS = -DUSE_NSREG -REQUIRES = libreg LINCS = -I$(PUBLIC)\xpcom diff --git a/mozilla/intl/uconv/ucvcn/Makefile.in b/mozilla/intl/uconv/ucvcn/Makefile.in index 908c4ffdba6..dfd069d59b5 100644 --- a/mozilla/intl/uconv/ucvcn/Makefile.in +++ b/mozilla/intl/uconv/ucvcn/Makefile.in @@ -30,7 +30,6 @@ MODULE = ucvcn LIBRARY_NAME = ucvcn IS_COMPONENT = 1 -REQUIRES = libxpcom CPPSRCS = \ nsGB2312ToUnicodeV2.cpp \ diff --git a/mozilla/intl/uconv/ucvcn/makefile.win b/mozilla/intl/uconv/ucvcn/makefile.win index f84326469ab..734fc2436f9 100644 --- a/mozilla/intl/uconv/ucvcn/makefile.win +++ b/mozilla/intl/uconv/ucvcn/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv -REQUIRES=xpcom uconv MAKE_OBJ_TYPE = DLL DLLNAME = ucvcn diff --git a/mozilla/intl/uconv/ucvibm/Makefile.in b/mozilla/intl/uconv/ucvibm/Makefile.in index aac89dca816..bc41df93b41 100644 --- a/mozilla/intl/uconv/ucvibm/Makefile.in +++ b/mozilla/intl/uconv/ucvibm/Makefile.in @@ -41,7 +41,6 @@ MODULE = ucvibm LIBRARY_NAME = ucvibm IS_COMPONENT = 1 -REQUIRES = libxpcom CPPSRCS = \ nsCP850ToUnicode.cpp \ diff --git a/mozilla/intl/uconv/ucvibm/makefile.win b/mozilla/intl/uconv/ucvibm/makefile.win index c802f2d4cb1..cfedd44f8c4 100644 --- a/mozilla/intl/uconv/ucvibm/makefile.win +++ b/mozilla/intl/uconv/ucvibm/makefile.win @@ -36,7 +36,6 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv -REQUIRES=xpcom uconv MAKE_OBJ_TYPE = DLL DLLNAME = ucvibm diff --git a/mozilla/intl/uconv/ucvja/Makefile.in b/mozilla/intl/uconv/ucvja/Makefile.in index f1d4f6ee582..fe8377df905 100644 --- a/mozilla/intl/uconv/ucvja/Makefile.in +++ b/mozilla/intl/uconv/ucvja/Makefile.in @@ -30,7 +30,6 @@ MODULE = ucvja LIBRARY_NAME = ucvja IS_COMPONENT = 1 -REQUIRES = libxpcom CPPSRCS = \ nsJapaneseToUnicode.cpp \ diff --git a/mozilla/intl/uconv/ucvja/makefile.win b/mozilla/intl/uconv/ucvja/makefile.win index 1cae7cd7ba9..0ec4357bd7c 100644 --- a/mozilla/intl/uconv/ucvja/makefile.win +++ b/mozilla/intl/uconv/ucvja/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv -REQUIRES=xpcom uconv MAKE_OBJ_TYPE = DLL DLLNAME = ucvja diff --git a/mozilla/intl/uconv/ucvko/Makefile.in b/mozilla/intl/uconv/ucvko/Makefile.in index 3602a3948d1..ed951a94dfe 100644 --- a/mozilla/intl/uconv/ucvko/Makefile.in +++ b/mozilla/intl/uconv/ucvko/Makefile.in @@ -30,7 +30,6 @@ MODULE = ucvko LIBRARY_NAME = ucvko IS_COMPONENT = 1 -REQUIRES = libxpcom CPPSRCS = \ nsEUCKRToUnicode.cpp \ diff --git a/mozilla/intl/uconv/ucvko/makefile.win b/mozilla/intl/uconv/ucvko/makefile.win index 07c0c2a8994..ef1f51cbf6b 100644 --- a/mozilla/intl/uconv/ucvko/makefile.win +++ b/mozilla/intl/uconv/ucvko/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv -REQUIRES=xpcom uconv MAKE_OBJ_TYPE = DLL DLLNAME = ucvko diff --git a/mozilla/intl/uconv/ucvlatin/Makefile.in b/mozilla/intl/uconv/ucvlatin/Makefile.in index 1f825ec0b28..db6f8f5d3c7 100644 --- a/mozilla/intl/uconv/ucvlatin/Makefile.in +++ b/mozilla/intl/uconv/ucvlatin/Makefile.in @@ -30,7 +30,6 @@ MODULE = ucvlatin LIBRARY_NAME = ucvlatin IS_COMPONENT = 1 -REQUIRES = libxpcom CPPSRCS = \ nsUEscapeToUnicode.cpp \ diff --git a/mozilla/intl/uconv/ucvlatin/makefile.win b/mozilla/intl/uconv/ucvlatin/makefile.win index f5dd4256cf6..c04560a7f4e 100644 --- a/mozilla/intl/uconv/ucvlatin/makefile.win +++ b/mozilla/intl/uconv/ucvlatin/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv -REQUIRES=xpcom uconv MAKE_OBJ_TYPE = DLL DLLNAME = ucvlatin diff --git a/mozilla/intl/uconv/ucvmath/Makefile.in b/mozilla/intl/uconv/ucvmath/Makefile.in index 3c0ade4b1f8..451518e0947 100644 --- a/mozilla/intl/uconv/ucvmath/Makefile.in +++ b/mozilla/intl/uconv/ucvmath/Makefile.in @@ -30,7 +30,6 @@ MODULE = ucvmath LIBRARY_NAME = ucvmath IS_COMPONENT = 1 -REQUIRES = $(MODULE) libxpcom CPPSRCS = \ nsUnicodeToTeXCMSYt1.cpp \ diff --git a/mozilla/intl/uconv/ucvmath/makefile.win b/mozilla/intl/uconv/ucvmath/makefile.win index 0055656c2a2..249172373ac 100644 --- a/mozilla/intl/uconv/ucvmath/makefile.win +++ b/mozilla/intl/uconv/ucvmath/makefile.win @@ -25,7 +25,6 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv -REQUIRES=xpcom uconv MAKE_OBJ_TYPE = DLL DLLNAME = ucvmath diff --git a/mozilla/intl/uconv/ucvtw/Makefile.in b/mozilla/intl/uconv/ucvtw/Makefile.in index c0d04f3d4b1..54fb1a723ee 100644 --- a/mozilla/intl/uconv/ucvtw/Makefile.in +++ b/mozilla/intl/uconv/ucvtw/Makefile.in @@ -30,7 +30,6 @@ MODULE = ucvtw LIBRARY_NAME = ucvtw IS_COMPONENT = 1 -REQUIRES = libxpcom CPPSRCS = \ nsBIG5ToUnicode.cpp \ diff --git a/mozilla/intl/uconv/ucvtw/makefile.win b/mozilla/intl/uconv/ucvtw/makefile.win index 89e580e60b6..ad47ece48cf 100644 --- a/mozilla/intl/uconv/ucvtw/makefile.win +++ b/mozilla/intl/uconv/ucvtw/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv -REQUIRES=xpcom uconv MAKE_OBJ_TYPE = DLL DLLNAME = ucvtw diff --git a/mozilla/intl/uconv/ucvtw2/Makefile.in b/mozilla/intl/uconv/ucvtw2/Makefile.in index cb697ea415c..7054e4121df 100644 --- a/mozilla/intl/uconv/ucvtw2/Makefile.in +++ b/mozilla/intl/uconv/ucvtw2/Makefile.in @@ -30,7 +30,6 @@ MODULE = ucvtw2 LIBRARY_NAME = ucvtw2 IS_COMPONENT = 1 -REQUIRES = $(MODULE) libxpcom CPPSRCS = \ nsEUCTWToUnicode.cpp \ diff --git a/mozilla/intl/uconv/ucvtw2/makefile.win b/mozilla/intl/uconv/ucvtw2/makefile.win index b43f98b2b2f..c968798e094 100644 --- a/mozilla/intl/uconv/ucvtw2/makefile.win +++ b/mozilla/intl/uconv/ucvtw2/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\.. DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN MODULE=uconv -REQUIRES=xpcom uconv MAKE_OBJ_TYPE = DLL DLLNAME = ucvtw2 diff --git a/mozilla/intl/unicharutil/src/Makefile.in b/mozilla/intl/unicharutil/src/Makefile.in index 38b37210242..8dd11b232d9 100644 --- a/mozilla/intl/unicharutil/src/Makefile.in +++ b/mozilla/intl/unicharutil/src/Makefile.in @@ -31,7 +31,6 @@ LIBRARY_NAME = unicharutil SHORT_LIBNAME = unicutil IS_COMPONENT = 1 -REQUIRES = libxpcom CPPSRCS = \ nsCaseConversionImp2.cpp \ diff --git a/mozilla/intl/unicharutil/src/makefile.win b/mozilla/intl/unicharutil/src/makefile.win index c7d043bfbd9..45809a41265 100644 --- a/mozilla/intl/unicharutil/src/makefile.win +++ b/mozilla/intl/unicharutil/src/makefile.win @@ -52,7 +52,6 @@ CPP_OBJS= \ MODULE=unicharutil -REQUIRES=xpcom netwerk INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor diff --git a/mozilla/intl/unicharutil/tests/makefile.win b/mozilla/intl/unicharutil/tests/makefile.win index feca6e6ffcd..fffbf7ca38e 100644 --- a/mozilla/intl/unicharutil/tests/makefile.win +++ b/mozilla/intl/unicharutil/tests/makefile.win @@ -29,7 +29,6 @@ PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -REQUIRES=libreg LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor diff --git a/mozilla/jpeg/Makefile.in b/mozilla/jpeg/Makefile.in index 5786c051717..2f884546812 100644 --- a/mozilla/jpeg/Makefile.in +++ b/mozilla/jpeg/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = jpeg LIBRARY_NAME = jpeg -REQUIRES = java CSRCS = \ jdapimin.c \ diff --git a/mozilla/js/src/liveconnect/Makefile.in b/mozilla/js/src/liveconnect/Makefile.in index 3c1dd5be003..26ab87bdd36 100644 --- a/mozilla/js/src/liveconnect/Makefile.in +++ b/mozilla/js/src/liveconnect/Makefile.in @@ -41,7 +41,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = java LIBRARY_NAME = jsj -REQUIRES = java js applet img util layer CSRCS = \ jsj.c \ @@ -76,7 +75,6 @@ JNI_GEN = netscape.javascript.JSObject netscape.javascript.JSException endif ifdef MOZ_OJI -REQUIRES += xpcom CPPSRCS = \ nsCLiveconnect.cpp \ diff --git a/mozilla/js/src/xpconnect/shell/makefile.win b/mozilla/js/src/xpconnect/shell/makefile.win index a3aacf7052e..cd19dabd3ce 100644 --- a/mozilla/js/src/xpconnect/shell/makefile.win +++ b/mozilla/js/src/xpconnect/shell/makefile.win @@ -41,7 +41,6 @@ PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN -REQUIRES=xpcom js xpconnect LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\js -I$(PUBLIC)\xpconnect \ -I$(PUBLIC)\raptor diff --git a/mozilla/js/src/xpconnect/tests/makefile.win b/mozilla/js/src/xpconnect/tests/makefile.win index 65fda5d658f..cfe92d31979 100644 --- a/mozilla/js/src/xpconnect/tests/makefile.win +++ b/mozilla/js/src/xpconnect/tests/makefile.win @@ -43,7 +43,6 @@ PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN -DJS_THREADSAFE -DJSFILE -REQUIRES=xpcom js xpconnect LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\js -I$(PUBLIC)\xpconnect \ -I$(PUBLIC)\raptor diff --git a/mozilla/layout/base/src/makefile.win b/mozilla/layout/base/src/makefile.win index 8ae1af1080a..250c7493897 100644 --- a/mozilla/layout/base/src/makefile.win +++ b/mozilla/layout/base/src/makefile.win @@ -76,7 +76,6 @@ CPPSRCS = \ $(NULL) MODULE=raptor -REQUIRES=xpcom raptor dom # EXPORTS= CPP_OBJS= \ diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index e8ca46778c2..c97caa1bbaa 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -40,7 +40,6 @@ else EXTRA_DSO_LIBS += raptorgfx endif -REQUIRES = xpcom raptor dom js CPPSRCS = \ nsLayoutDLF.cpp \ diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win index a7dc85ae395..da95f70b917 100644 --- a/mozilla/layout/build/makefile.win +++ b/mozilla/layout/build/makefile.win @@ -25,7 +25,6 @@ include <$(DEPTH)/config/config.mak> DEFINES=-D_IMPL_NS_HTML MODULE=raptor -REQUIRES=xpcom raptor dom js IS_COMPONENT = 1 BUILD_DATE=gbdate.h diff --git a/mozilla/layout/events/src/Makefile.in b/mozilla/layout/events/src/Makefile.in index e2e13f55b4f..bdc0bc79cf1 100644 --- a/mozilla/layout/events/src/Makefile.in +++ b/mozilla/layout/events/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorevents_s -REQUIRES = xpcom raptor dom js netlib CPPSRCS = \ nsEventListenerManager.cpp \ diff --git a/mozilla/layout/events/src/makefile.win b/mozilla/layout/events/src/makefile.win index ce8b26f7a92..4eb4e21fc4a 100644 --- a/mozilla/layout/events/src/makefile.win +++ b/mozilla/layout/events/src/makefile.win @@ -26,7 +26,6 @@ include <$(DEPTH)\config\config.mak> LIBRARY_NAME=raptorevents_s MODULE=raptor -REQUIRES=xpcom raptor dom js DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in index 5afbb97c68c..03dcb74fd83 100644 --- a/mozilla/layout/html/base/src/Makefile.in +++ b/mozilla/layout/html/base/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorhtmlbase_s -REQUIRES = xpcom raptor dom netlib plugin java js oji pref CPPSRCS = \ nsSelectsAreaFrame.cpp \ diff --git a/mozilla/layout/html/base/src/makefile.win b/mozilla/layout/html/base/src/makefile.win index b74c30db4e0..659455a0099 100644 --- a/mozilla/layout/html/base/src/makefile.win +++ b/mozilla/layout/html/base/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorhtmlbase_s MODULE=raptor -REQUIRES=xpcom raptor js DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) DEFINES = $(DEFINES) -DXP_NEW_SELECTION diff --git a/mozilla/layout/html/content/src/Makefile.in b/mozilla/layout/html/content/src/Makefile.in index c915d4cb4d3..91ba1c6231f 100644 --- a/mozilla/layout/html/content/src/Makefile.in +++ b/mozilla/layout/html/content/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = nglhtmlcon_s -REQUIRES = xpcom raptor dom js netlib CPPSRCS = \ nsAttributeContent.cpp \ diff --git a/mozilla/layout/html/content/src/makefile.win b/mozilla/layout/html/content/src/makefile.win index 0a9014b3eba..89db4227344 100644 --- a/mozilla/layout/html/content/src/makefile.win +++ b/mozilla/layout/html/content/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME = nglhtmlcon_s MODULE=raptor -REQUIRES=xpcom raptor js DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) DEFINES = $(DEFINES) -DXP_NEW_SELECTION diff --git a/mozilla/layout/html/document/src/Makefile.in b/mozilla/layout/html/document/src/Makefile.in index 3d84350aee8..04cc4f6299c 100644 --- a/mozilla/layout/html/document/src/Makefile.in +++ b/mozilla/layout/html/document/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorhtmldoc_s -REQUIRES = xpcom raptor dom netlib js pref CPPSRCS = \ nsHTMLContentSink.cpp \ diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win index 6656f0c515b..1b9f81b08ec 100644 --- a/mozilla/layout/html/document/src/makefile.win +++ b/mozilla/layout/html/document/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorhtmldoc_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN !if defined(XP_NEW_SELECTION) diff --git a/mozilla/layout/html/forms/src/Makefile.in b/mozilla/layout/html/forms/src/Makefile.in index 14783574e10..d7f914b4adf 100644 --- a/mozilla/layout/html/forms/src/Makefile.in +++ b/mozilla/layout/html/forms/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorhtmlforms_s -REQUIRES = xpcom raptor dom netlib js CPPSRCS = \ nsButtonFrameRenderer.cpp \ diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win index 144a010c4fe..d4e1e495c2d 100644 --- a/mozilla/layout/html/forms/src/makefile.win +++ b/mozilla/layout/html/forms/src/makefile.win @@ -25,7 +25,6 @@ LIBRARY_NAME=raptorhtmlforms_s DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN MODULE=raptor -REQUIRES=xpcom raptor js CPPSRCS= \ nsGfxListControlFrame.cpp \ diff --git a/mozilla/layout/html/style/src/Makefile.in b/mozilla/layout/html/style/src/Makefile.in index 9dd327962e0..40ca58153aa 100644 --- a/mozilla/layout/html/style/src/Makefile.in +++ b/mozilla/layout/html/style/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorhtmlstyle_s -REQUIRES = xpcom raptor dom netlib js CPPSRCS = \ nsCSSAtoms.cpp \ diff --git a/mozilla/layout/html/style/src/makefile.win b/mozilla/layout/html/style/src/makefile.win index b439a389b3f..e3d0e6776d7 100644 --- a/mozilla/layout/html/style/src/makefile.win +++ b/mozilla/layout/html/style/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorhtmlstyle_s MODULE=raptor -REQUIRES=xpcom raptor dom js DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/html/table/src/Makefile.in b/mozilla/layout/html/table/src/Makefile.in index 83176ec6d82..35fe5791712 100644 --- a/mozilla/layout/html/table/src/Makefile.in +++ b/mozilla/layout/html/table/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorhtmltable_s -REQUIRES = xpcom raptor dom js netlib CPPSRCS = \ BasicTableLayoutStrategy.cpp \ diff --git a/mozilla/layout/html/table/src/makefile.win b/mozilla/layout/html/table/src/makefile.win index afe74bba13b..7006d88b308 100644 --- a/mozilla/layout/html/table/src/makefile.win +++ b/mozilla/layout/html/table/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorhtmltable_s MODULE=raptor -REQUIRES=xpcom raptor js DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/mathml/base/src/makefile.win b/mozilla/layout/mathml/base/src/makefile.win index 4be05103228..35f232f6b12 100644 --- a/mozilla/layout/mathml/base/src/makefile.win +++ b/mozilla/layout/mathml/base/src/makefile.win @@ -24,7 +24,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptormathmlbase_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES= -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/mathml/content/src/Makefile.in b/mozilla/layout/mathml/content/src/Makefile.in index 4b5ab19fd48..f71e5387f43 100644 --- a/mozilla/layout/mathml/content/src/Makefile.in +++ b/mozilla/layout/mathml/content/src/Makefile.in @@ -54,7 +54,6 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) MODULE=layout -REQUIRES = xpcom raptor dom MKSHLIB := diff --git a/mozilla/layout/mathml/content/src/makefile.win b/mozilla/layout/mathml/content/src/makefile.win index 8219e5c065c..d22c1172a01 100644 --- a/mozilla/layout/mathml/content/src/makefile.win +++ b/mozilla/layout/mathml/content/src/makefile.win @@ -25,7 +25,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptormathmlcontent_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/svg/base/src/makefile.win b/mozilla/layout/svg/base/src/makefile.win index 08d5bd8b0b5..18b50037863 100644 --- a/mozilla/layout/svg/base/src/makefile.win +++ b/mozilla/layout/svg/base/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorsvgbase_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/svg/content/src/Makefile.in b/mozilla/layout/svg/content/src/Makefile.in index 93cabf41b93..06fa7873981 100644 --- a/mozilla/layout/svg/content/src/Makefile.in +++ b/mozilla/layout/svg/content/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorsvgcontent_s -REQUIRES = xpcom raptor dom CPPSRCS = nsSVGAtoms.cpp diff --git a/mozilla/layout/svg/content/src/makefile.win b/mozilla/layout/svg/content/src/makefile.win index 69116034c98..d2a5e11884f 100644 --- a/mozilla/layout/svg/content/src/makefile.win +++ b/mozilla/layout/svg/content/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorsvgcontent_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/xbl/src/makefile.win b/mozilla/layout/xbl/src/makefile.win index ca18d987b37..a322dc29930 100644 --- a/mozilla/layout/xbl/src/makefile.win +++ b/mozilla/layout/xbl/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\.. LIBRARY_NAME=raptorxbl_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/xml/content/src/Makefile.in b/mozilla/layout/xml/content/src/Makefile.in index 2cc28b5964b..029997678b9 100644 --- a/mozilla/layout/xml/content/src/Makefile.in +++ b/mozilla/layout/xml/content/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorxmlcontent_s -REQUIRES = xpcom raptor dom netlib js pref CPPSRCS = \ nsXMLElement.cpp \ diff --git a/mozilla/layout/xml/content/src/makefile.win b/mozilla/layout/xml/content/src/makefile.win index 640543023a6..65f5f15a2f9 100644 --- a/mozilla/layout/xml/content/src/makefile.win +++ b/mozilla/layout/xml/content/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorxmlcontent_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/xml/document/src/Makefile.in b/mozilla/layout/xml/document/src/Makefile.in index d8f5ab7ee74..f9405a891f2 100644 --- a/mozilla/layout/xml/document/src/Makefile.in +++ b/mozilla/layout/xml/document/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorxmldoc_s -REQUIRES = xpcom raptor dom netlib js pref CPPSRCS = \ nsXMLContentSink.cpp \ diff --git a/mozilla/layout/xml/document/src/makefile.win b/mozilla/layout/xml/document/src/makefile.win index 4a663844d8a..e77b6342bb9 100644 --- a/mozilla/layout/xml/document/src/makefile.win +++ b/mozilla/layout/xml/document/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorxmldoc_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN !if defined(MOZ_XSL) diff --git a/mozilla/layout/xsl/document/src/Makefile.in b/mozilla/layout/xsl/document/src/Makefile.in index ae984648413..4735aea49fd 100755 --- a/mozilla/layout/xsl/document/src/Makefile.in +++ b/mozilla/layout/xsl/document/src/Makefile.in @@ -49,7 +49,6 @@ LOCAL_INCLUDES = \ MODULE=layout -REQUIRES = xpcom raptor dom js pref MKSHLIB := diff --git a/mozilla/layout/xsl/document/src/makefile.win b/mozilla/layout/xsl/document/src/makefile.win index 1114e1378e2..686f308444b 100644 --- a/mozilla/layout/xsl/document/src/makefile.win +++ b/mozilla/layout/xsl/document/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorxsldoc_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN !if defined(MOZ_XSL) diff --git a/mozilla/layout/xul/base/src/makefile.win b/mozilla/layout/xul/base/src/makefile.win index 294273f0cdc..48d098b909a 100644 --- a/mozilla/layout/xul/base/src/makefile.win +++ b/mozilla/layout/xul/base/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorxulbase_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/layout/xul/content/src/Makefile.in b/mozilla/layout/xul/content/src/Makefile.in index a57095a2391..6e982d1d804 100644 --- a/mozilla/layout/xul/content/src/Makefile.in +++ b/mozilla/layout/xul/content/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = raptorxulcontent_s -REQUIRES = xpcom raptor dom CPPSRCS = nsXULAtoms.cpp diff --git a/mozilla/layout/xul/content/src/makefile.win b/mozilla/layout/xul/content/src/makefile.win index ee705792e83..d7aab30db1e 100644 --- a/mozilla/layout/xul/content/src/makefile.win +++ b/mozilla/layout/xul/content/src/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\..\.. LIBRARY_NAME=raptorxulcontent_s MODULE=raptor -REQUIRES=xpcom raptor pref DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/mailnews/mime/cthandlers/calendar/makefile.win b/mozilla/mailnews/mime/cthandlers/calendar/makefile.win index 548f4342d02..f3f6a8a1c5b 100644 --- a/mozilla/mailnews/mime/cthandlers/calendar/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/calendar/makefile.win @@ -39,7 +39,6 @@ DEPTH=..\..\..\.. #// #//------------------------------------------------------------------------ MODULE = calendar -REQUIRES= #EXPORTS = # Exported headers here!!! # $(NULL) diff --git a/mozilla/mailnews/mime/cthandlers/signstub/Makefile.win b/mozilla/mailnews/mime/cthandlers/signstub/Makefile.win index 798ac002257..622328fa8d8 100644 --- a/mozilla/mailnews/mime/cthandlers/signstub/Makefile.win +++ b/mozilla/mailnews/mime/cthandlers/signstub/Makefile.win @@ -32,7 +32,6 @@ DEPTH=..\..\..\.. #// #//------------------------------------------------------------------------ MODULE = signed -REQUIRES= #EXPORTS = # Exported headers here!!! # $(NULL) diff --git a/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.win b/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.win index 96205990dc5..b835a80d5e8 100644 --- a/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.win +++ b/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.win @@ -32,7 +32,6 @@ DEPTH=..\..\..\.. #// #//------------------------------------------------------------------------ MODULE = smime -REQUIRES= #EXPORTS = # Exported headers here!!! # $(NULL) diff --git a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win index 57ad560e38a..8a7f978a6f6 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win @@ -41,7 +41,6 @@ DEPTH=..\..\..\.. #// #//------------------------------------------------------------------------ MODULE = vcard -REQUIRES= # EXPORTS = # Put any necessary exported headers here!!! # $(NULL) diff --git a/mozilla/modules/libimg/gifcom/Makefile.in b/mozilla/modules/libimg/gifcom/Makefile.in index b4df8d01523..2c17e0cff8f 100644 --- a/mozilla/modules/libimg/gifcom/Makefile.in +++ b/mozilla/modules/libimg/gifcom/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nsgif IS_COMPONENT = 1 -REQUIRES = util img gif xpcom img CPPSRCS = \ gif.cpp \ diff --git a/mozilla/modules/libimg/gifcom/makefile.win b/mozilla/modules/libimg/gifcom/makefile.win index 91b422979cc..db61b922aa3 100644 --- a/mozilla/modules/libimg/gifcom/makefile.win +++ b/mozilla/modules/libimg/gifcom/makefile.win @@ -86,7 +86,6 @@ MODULE=img DEPTH=..\..\.. LINCS=-I$(DEPTH)/dist/public/xpcom -I. -I$(DEPTH)/dist/public/raptor -REQUIRES=nspr xpcom util raptor CPPSRCS= nsGIFModule.cpp nsGIFDecoder.cpp dllcompat.cpp gif.cpp CPP_OBJS= .\$(OBJDIR)\nsGIFModule.obj .\$(OBJDIR)\nsGIFDecoder.obj \ .\$(OBJDIR)\dllcompat.obj .\$(OBJDIR)\gif.obj diff --git a/mozilla/modules/libimg/jpgcom/Makefile.in b/mozilla/modules/libimg/jpgcom/Makefile.in index dfbbaceaa43..069bc80b5f0 100644 --- a/mozilla/modules/libimg/jpgcom/Makefile.in +++ b/mozilla/modules/libimg/jpgcom/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nsjpg IS_COMPONENT = 1 -REQUIRES += util jpeg xpcom img CPPSRCS = \ jpeg.cpp \ diff --git a/mozilla/modules/libimg/jpgcom/makefile.win b/mozilla/modules/libimg/jpgcom/makefile.win index bc9cd1781a8..d5c6dab9886 100644 --- a/mozilla/modules/libimg/jpgcom/makefile.win +++ b/mozilla/modules/libimg/jpgcom/makefile.win @@ -87,7 +87,6 @@ MODULE=img DEPTH=..\..\.. LINCS=-I$(DEPTH)/dist/public/xpcom -I. -I$(DEPTH)/dist/public/raptor -I$(DEPTH)/dist/public/jpeg -REQUIRES=nspr xpcom util raptor jpeg CPPSRCS= nsJPGDecoder.cpp nsJPGModule.cpp jpeg.cpp dllcompat.cpp CPP_OBJS= \ .\$(OBJDIR)\nsJPGDecoder.obj \ diff --git a/mozilla/modules/libimg/mng/makefile.win b/mozilla/modules/libimg/mng/makefile.win index 8c59dbd2910..165fd364da2 100644 --- a/mozilla/modules/libimg/mng/makefile.win +++ b/mozilla/modules/libimg/mng/makefile.win @@ -58,7 +58,6 @@ CSRCS=\ mng_write.c \ mng_zlib.c \ $(NULL) -REQUIRES=util nspr zlib jpeg C_OBJS=\ .\$(OBJDIR)\mng_callback_xs.obj \ .\$(OBJDIR)\mng_chunk_io.obj \ diff --git a/mozilla/modules/libimg/mngcom/Makefile.in b/mozilla/modules/libimg/mngcom/Makefile.in index a4688c2c2c5..0c23528f9fe 100644 --- a/mozilla/modules/libimg/mngcom/Makefile.in +++ b/mozilla/modules/libimg/mngcom/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nsmng IS_COMPONENT = 1 -REQUIRES = util mng zlib jpeg xpcom img CPPSRCS = \ nsMNGDecoder.cpp \ diff --git a/mozilla/modules/libimg/mngcom/makefile.win b/mozilla/modules/libimg/mngcom/makefile.win index d43b58d4331..88df0bf76ba 100644 --- a/mozilla/modules/libimg/mngcom/makefile.win +++ b/mozilla/modules/libimg/mngcom/makefile.win @@ -91,7 +91,6 @@ DEPTH=..\..\.. LINCS=-I$(DEPTH)/dist/public/xpcom -I. -I$(DEPTH)/dist/public/raptor \ -I$(DEPTH)/dist/public/jpeg -I$(DEPTH)/dist/public/zlib -I$(DEPTH)/dist/public/img -REQUIRES=nspr xpcom util raptor jpeg zlib CPPSRCS= nsMNGDecoder.cpp nsMNGCallback.cpp CPP_OBJS= \ .\$(OBJDIR)\nsMNGDecoder.obj \ diff --git a/mozilla/modules/libimg/png/Makefile.in b/mozilla/modules/libimg/png/Makefile.in index 12b7a9b3fca..52c6c25f04d 100644 --- a/mozilla/modules/libimg/png/Makefile.in +++ b/mozilla/modules/libimg/png/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = png LIBRARY_NAME = png -REQUIRES = util CSRCS = \ png.c \ @@ -56,7 +55,6 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) LOCAL_INCLUDES = -I$(srcdir) ifndef MOZ_NATIVE_ZLIB -REQUIRES += zlib EXTRA_DSO_LDOPTS = -L$(DIST)/bin -lzlib endif diff --git a/mozilla/modules/libimg/png/makefile.win b/mozilla/modules/libimg/png/makefile.win index 123be7d2ae2..555138ab0a5 100644 --- a/mozilla/modules/libimg/png/makefile.win +++ b/mozilla/modules/libimg/png/makefile.win @@ -41,7 +41,6 @@ LIBRARY_NAME=png CSRCS=png.c pngerror.c pngget.c pngmem.c pngpread.c pngread.c pngrio.c \ pngrutil.c pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c \ pngrtran.c pngwutil.c -REQUIRES=util nspr zlib C_OBJS=.\$(OBJDIR)\png.obj .\$(OBJDIR)\pngerror.obj \ .\$(OBJDIR)\pngget.obj .\$(OBJDIR)\pngmem.obj \ .\$(OBJDIR)\pngpread.obj .\$(OBJDIR)\pngread.obj \ diff --git a/mozilla/modules/libimg/pngcom/Makefile.in b/mozilla/modules/libimg/pngcom/Makefile.in index 601b94456fd..fe836eb19e8 100644 --- a/mozilla/modules/libimg/pngcom/Makefile.in +++ b/mozilla/modules/libimg/pngcom/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nspng IS_COMPONENT = 1 -REQUIRES = util png zlib xpcom img CPPSRCS = \ ipng.cpp \ diff --git a/mozilla/modules/libimg/pngcom/makefile.win b/mozilla/modules/libimg/pngcom/makefile.win index 7c10bd23663..222a3903d56 100644 --- a/mozilla/modules/libimg/pngcom/makefile.win +++ b/mozilla/modules/libimg/pngcom/makefile.win @@ -90,7 +90,6 @@ DEPTH=..\..\.. LINCS=-I$(DEPTH)/dist/public/xpcom -I. -I$(DEPTH)/dist/public/raptor \ -I$(DEPTH)/dist/public/png -I$(DEPTH)/dist/public/zlib -I$(DEPTH)/dist/public/img -REQUIRES=nspr xpcom util raptor png zlib CPPSRCS= dllcompat.cpp nsPNGDecoder.cpp nsPNGCallback.cpp ipng.cpp CPP_OBJS= \ .\$(OBJDIR)\nsPNGDecoder.obj \ diff --git a/mozilla/modules/libimg/src/Makefile.in b/mozilla/modules/libimg/src/Makefile.in index 3218411c2f6..1a9b692679d 100644 --- a/mozilla/modules/libimg/src/Makefile.in +++ b/mozilla/modules/libimg/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = img LIBRARY_NAME = img_s -REQUIRES = util img xpcom CPPSRCS = \ ilNetReader.cpp \ diff --git a/mozilla/modules/libimg/src/makefile.win b/mozilla/modules/libimg/src/makefile.win index 36a0ba76fb8..775092d26d1 100644 --- a/mozilla/modules/libimg/src/makefile.win +++ b/mozilla/modules/libimg/src/makefile.win @@ -97,7 +97,6 @@ LIBRARY_NAME=img CPPSRCS=color.cpp colormap.cpp dither.cpp if.cpp ilclient.cpp il_util.cpp \ ilNetReader.cpp scale.cpp xpcompat.cpp -REQUIRES=nspr util img xpcom CPP_OBJS=.\$(OBJDIR)\color.obj .\$(OBJDIR)\colormap.obj \ .\$(OBJDIR)\dither.obj .\$(OBJDIR)\if.obj \ diff --git a/mozilla/modules/libpref/admin/Makefile.in b/mozilla/modules/libpref/admin/Makefile.in index e344ea37548..6bed7905fed 100644 --- a/mozilla/modules/libpref/admin/Makefile.in +++ b/mozilla/modules/libpref/admin/Makefile.in @@ -31,7 +31,6 @@ LIBRARY_NAME = AutoAdmin CSRCS = prefldap.c icondata.c endif -REQUIRES = ldap js pref XFEDIR = $(DEPTH)/cmd/xfe/icons diff --git a/mozilla/modules/libpref/l10n/Makefile.in b/mozilla/modules/libpref/l10n/Makefile.in index 514e81be69b..eae2df073fd 100644 --- a/mozilla/modules/libpref/l10n/Makefile.in +++ b/mozilla/modules/libpref/l10n/Makefile.in @@ -26,7 +26,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = security LIBS = -L$(DIST)/lib -lhash diff --git a/mozilla/modules/libpref/src/Makefile.in b/mozilla/modules/libpref/src/Makefile.in index de67d23a0b7..b41ff563f0c 100644 --- a/mozilla/modules/libpref/src/Makefile.in +++ b/mozilla/modules/libpref/src/Makefile.in @@ -30,7 +30,6 @@ MODULE = pref LIBRARY_NAME = pref IS_COMPONENT = 1 -REQUIRES = js pref security ldap img layer xpcom util CSRCS = prefapi.c diff --git a/mozilla/modules/libreg/src/Makefile.in b/mozilla/modules/libreg/src/Makefile.in index 188dcdd97b1..f132876d36c 100644 --- a/mozilla/modules/libreg/src/Makefile.in +++ b/mozilla/modules/libreg/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = libreg LIBRARY_NAME = mozreg_s -REQUIRES = libreg pref js PROGRAM = vreg$(BIN_SUFFIX) diff --git a/mozilla/modules/libutil/src/Makefile.in b/mozilla/modules/libutil/src/Makefile.in index 82cf2bcab76..5532d998126 100644 --- a/mozilla/modules/libutil/src/Makefile.in +++ b/mozilla/modules/libutil/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = util LIBRARY_NAME = mozutil_s -REQUIRES = util CSRCS = obs.c CPPSRCS = stopwatch.cpp diff --git a/mozilla/modules/libutil/src/makefile.win b/mozilla/modules/libutil/src/makefile.win index 2f40de25d43..e97e7301f51 100644 --- a/mozilla/modules/libutil/src/makefile.win +++ b/mozilla/modules/libutil/src/makefile.win @@ -22,7 +22,6 @@ MODULE=util DEPTH=..\..\.. CSRCS=obs.c -REQUIRES=nspr util LIBRARY_NAME=util CPPSRCS=stopwatch.cpp \ nsTimer.cpp \ diff --git a/mozilla/modules/oji/src/Makefile.in b/mozilla/modules/oji/src/Makefile.in index 1f80ca0cffe..02f56e4f77b 100644 --- a/mozilla/modules/oji/src/Makefile.in +++ b/mozilla/modules/oji/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = ojiimpl IS_COMPONENT = 1 -REQUIRES = img java js lay layer plugin plugimpl pref style util xpcom raptor oji caps ifdef MOZ_OJI LIBRARY_NAME = oji diff --git a/mozilla/modules/plugin/SanePlugin/Makefile.in b/mozilla/modules/plugin/SanePlugin/Makefile.in index 8c9678de5ac..d491368fcf4 100644 --- a/mozilla/modules/plugin/SanePlugin/Makefile.in +++ b/mozilla/modules/plugin/SanePlugin/Makefile.in @@ -26,7 +26,6 @@ MODULE = SanePlugin LIBRARY_NAME = Sane IS_COMPONENT = 1 -REQUIRES = raptor xpcom CPPSRCS = \ nsSanePluginFactory.cpp \ diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index 2963def1f31..1b2ea32aef5 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -30,7 +30,6 @@ MODULE = raptor LIBRARY_NAME = raptorplugin SHORT_LIBNAME = ngplugin -REQUIRES = raptor plugin java xpcom netlib libplc3 oji CPPSRCS = \ nsPluginHostImpl.cpp \ diff --git a/mozilla/modules/plugin/nglsrc/Makefile.in b/mozilla/modules/plugin/nglsrc/Makefile.in index 2963def1f31..1b2ea32aef5 100644 --- a/mozilla/modules/plugin/nglsrc/Makefile.in +++ b/mozilla/modules/plugin/nglsrc/Makefile.in @@ -30,7 +30,6 @@ MODULE = raptor LIBRARY_NAME = raptorplugin SHORT_LIBNAME = ngplugin -REQUIRES = raptor plugin java xpcom netlib libplc3 oji CPPSRCS = \ nsPluginHostImpl.cpp \ diff --git a/mozilla/modules/plugin/samples/SanePlugin/Makefile.in b/mozilla/modules/plugin/samples/SanePlugin/Makefile.in index 8c9678de5ac..d491368fcf4 100644 --- a/mozilla/modules/plugin/samples/SanePlugin/Makefile.in +++ b/mozilla/modules/plugin/samples/SanePlugin/Makefile.in @@ -26,7 +26,6 @@ MODULE = SanePlugin LIBRARY_NAME = Sane IS_COMPONENT = 1 -REQUIRES = raptor xpcom CPPSRCS = \ nsSanePluginFactory.cpp \ diff --git a/mozilla/modules/plugin/samples/simple/makefile.win b/mozilla/modules/plugin/samples/simple/makefile.win index 0ae382a6cad..3e7dc8899bb 100644 --- a/mozilla/modules/plugin/samples/simple/makefile.win +++ b/mozilla/modules/plugin/samples/simple/makefile.win @@ -26,7 +26,6 @@ LIBRARY_NAME = npsimple DEPTH = ..\..\.. -REQUIRES = java plug xpcom raptor XPIDLSRCS = \ .\nsISimplePluginInstance.idl \ diff --git a/mozilla/modules/plugin/src/Makefile.in b/mozilla/modules/plugin/src/Makefile.in index e42b4c4e549..dc49dbe802a 100644 --- a/mozilla/modules/plugin/src/Makefile.in +++ b/mozilla/modules/plugin/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = plugimpl LIBRARY_NAME = plug -REQUIRES = lay layer js style applet img util java pref xpcom raptor netcnvts plugin plugimpl oji ojiimpl caps CSRCS = npassoc.c @@ -42,7 +41,6 @@ include $(topsrcdir)/config/rules.mk ifeq ($(subst /,_,$(shell uname -s)),OS2) CPPSRCS = npwplat.cpp -REQUIRES += xp libfont os2font jtools INCLUDES += -I$(DEPTH)/cmd/os2fe/nfc/include -I$(DEPTH)/cmd/os2fe -I$(DEPTH)/cmd/winfe endif diff --git a/mozilla/modules/plugin/test/makefile.win b/mozilla/modules/plugin/test/makefile.win index 0ae382a6cad..3e7dc8899bb 100644 --- a/mozilla/modules/plugin/test/makefile.win +++ b/mozilla/modules/plugin/test/makefile.win @@ -26,7 +26,6 @@ LIBRARY_NAME = npsimple DEPTH = ..\..\.. -REQUIRES = java plug xpcom raptor XPIDLSRCS = \ .\nsISimplePluginInstance.idl \ diff --git a/mozilla/modules/zlib/src/Makefile.in b/mozilla/modules/zlib/src/Makefile.in index a2305f93a2a..2fd9ae44e8b 100644 --- a/mozilla/modules/zlib/src/Makefile.in +++ b/mozilla/modules/zlib/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = zlib LIBRARY_NAME = zlib -REQUIRES = java CSRCS = \ adler32.c \ diff --git a/mozilla/netwerk/cache/filecache/Makefile.in b/mozilla/netwerk/cache/filecache/Makefile.in index 06a60ebc389..9a69f86ea8d 100644 --- a/mozilla/netwerk/cache/filecache/Makefile.in +++ b/mozilla/netwerk/cache/filecache/Makefile.in @@ -31,7 +31,6 @@ MODULE = nkcache LIBRARY_NAME = nkfilecache_s -REQUIRES = nspr dbm EXTRA_DSO_LDOPTS += -L$(DIST)/lib -lmozdbm_s diff --git a/mozilla/netwerk/cache/filecache/test/Makefile.in b/mozilla/netwerk/cache/filecache/test/Makefile.in index 67c17f91bc1..07eb12e9514 100644 --- a/mozilla/netwerk/cache/filecache/test/Makefile.in +++ b/mozilla/netwerk/cache/filecache/test/Makefile.in @@ -22,7 +22,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = libreg xpcom CPPSRCS = \ diskcache.cpp \ diff --git a/mozilla/netwerk/cache/memcache/Makefile.in b/mozilla/netwerk/cache/memcache/Makefile.in index f4a9bf51a98..7009327c1d6 100644 --- a/mozilla/netwerk/cache/memcache/Makefile.in +++ b/mozilla/netwerk/cache/memcache/Makefile.in @@ -27,7 +27,6 @@ MODULE = nkcache LIBRARY_NAME = nkmemcache_s -REQUIRES = nspr dbm EXPORTS=nsMemCacheCID.h \ nsMemCache.h \ diff --git a/mozilla/netwerk/cache/mgr/Makefile.in b/mozilla/netwerk/cache/mgr/Makefile.in index a6c178cdaab..fc8d507f7f9 100644 --- a/mozilla/netwerk/cache/mgr/Makefile.in +++ b/mozilla/netwerk/cache/mgr/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = nkcache LIBRARY_NAME = nkcachemgr_s -REQUIRES = nspr EXPORTS = \ nsCacheManager.h \ diff --git a/mozilla/netwerk/mime/src/Makefile.in b/mozilla/netwerk/mime/src/Makefile.in index 54b9429c777..48eeddb1f7f 100644 --- a/mozilla/netwerk/mime/src/Makefile.in +++ b/mozilla/netwerk/mime/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = mimetype LIBRARY_NAME = nkmime_s -REQUIRES = xpcom CPPSRCS = \ nsMIMEInfoImpl.cpp \ diff --git a/mozilla/netwerk/protocol/about/src/Makefile.in b/mozilla/netwerk/protocol/about/src/Makefile.in index bb504e258ab..945c929d4ce 100644 --- a/mozilla/netwerk/protocol/about/src/Makefile.in +++ b/mozilla/netwerk/protocol/about/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkabout_s -REQUIRES = xpcom necko CPPSRCS = \ nsAboutProtocolHandler.cpp \ diff --git a/mozilla/netwerk/protocol/file/src/Makefile.in b/mozilla/netwerk/protocol/file/src/Makefile.in index 59af781a960..e63965a8233 100644 --- a/mozilla/netwerk/protocol/file/src/Makefile.in +++ b/mozilla/netwerk/protocol/file/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkfile_s -REQUIRES = xpcom necko raptor CPPSRCS = \ nsFileChannel.cpp \ diff --git a/mozilla/netwerk/protocol/http/src/Makefile.in b/mozilla/netwerk/protocol/http/src/Makefile.in index 2aa0b0ecdd6..1d5012ed809 100644 --- a/mozilla/netwerk/protocol/http/src/Makefile.in +++ b/mozilla/netwerk/protocol/http/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkhttp_s -REQUIRES = xpcom necko raptor CPPSRCS = \ nsHTTPHandler.cpp \ diff --git a/mozilla/netwerk/protocol/jar/src/Makefile.in b/mozilla/netwerk/protocol/jar/src/Makefile.in index 262c49c4a97..5a5f4094bf7 100644 --- a/mozilla/netwerk/protocol/jar/src/Makefile.in +++ b/mozilla/netwerk/protocol/jar/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkjar_s -REQUIRES = xpcom necko CPPSRCS = \ nsJARProtocolHandler.cpp \ diff --git a/mozilla/netwerk/protocol/keyword/src/Makefile.in b/mozilla/netwerk/protocol/keyword/src/Makefile.in index 8a519eab372..c5158b8e807 100644 --- a/mozilla/netwerk/protocol/keyword/src/Makefile.in +++ b/mozilla/netwerk/protocol/keyword/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkkwd_s -REQUIRES = xpcom necko CPPSRCS = \ nsKeywordProtocolHandler.cpp \ diff --git a/mozilla/netwerk/protocol/res/src/Makefile.in b/mozilla/netwerk/protocol/res/src/Makefile.in index f31ff0cba0b..310ec3dc8e9 100644 --- a/mozilla/netwerk/protocol/res/src/Makefile.in +++ b/mozilla/netwerk/protocol/res/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkres_s -REQUIRES = xpcom necko CPPSRCS = \ nsResChannel.cpp \ diff --git a/mozilla/netwerk/streamconv/converters/Makefile.in b/mozilla/netwerk/streamconv/converters/Makefile.in index 505dc58efff..8c33d665955 100644 --- a/mozilla/netwerk/streamconv/converters/Makefile.in +++ b/mozilla/netwerk/streamconv/converters/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkcnvts_s -REQUIRES = xpcom zlib EXPORTS = \ nsHTTPChunkConv.h \ diff --git a/mozilla/netwerk/streamconv/src/Makefile.in b/mozilla/netwerk/streamconv/src/Makefile.in index 66f67e04106..056d61f9ed8 100644 --- a/mozilla/netwerk/streamconv/src/Makefile.in +++ b/mozilla/netwerk/streamconv/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = nkconv_s -REQUIRES = xpcom CPPSRCS = \ nsStreamConverterService.cpp \ diff --git a/mozilla/netwerk/streamconv/test/Makefile.in b/mozilla/netwerk/streamconv/test/Makefile.in index e18823d148f..aea2a8019e3 100644 --- a/mozilla/netwerk/streamconv/test/Makefile.in +++ b/mozilla/netwerk/streamconv/test/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = TestStreamConv PROGRAM = TestStreamConv$(BIN_SUFFIX) -REQUIRES = libreg xpcom CPPSRCS = \ Converters.cpp \ diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in index c5344a19622..f76acf25786 100644 --- a/mozilla/netwerk/test/Makefile.in +++ b/mozilla/netwerk/test/Makefile.in @@ -26,7 +26,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = libreg xpcom CPPSRCS = \ TestSocketIO.cpp \ diff --git a/mozilla/netwerk/test/makefile.win b/mozilla/netwerk/test/makefile.win index c11e770d127..e9adaf2e94e 100644 --- a/mozilla/netwerk/test/makefile.win +++ b/mozilla/netwerk/test/makefile.win @@ -42,7 +42,6 @@ $(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5) $(PROG6) $(PROG7) $(PROG8) $(PROG9) LCFLAGS=-DUSE_NSREG -GX -REQUIRES=libreg INCS = $(INCS) \ -I$(DEPTH)\dist\include \ diff --git a/mozilla/parser/htmlparser/robot/test/Makefile.in b/mozilla/parser/htmlparser/robot/test/Makefile.in index 5a182f66428..96b7f3ef8f6 100644 --- a/mozilla/parser/htmlparser/robot/test/Makefile.in +++ b/mozilla/parser/htmlparser/robot/test/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = htmlrobot$(BIN_SUFFIX) -REQUIRES = xpcom CPPSRCS = RobotMain.cpp diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in index 289b0a84149..c3f7768361c 100644 --- a/mozilla/parser/htmlparser/src/Makefile.in +++ b/mozilla/parser/htmlparser/src/Makefile.in @@ -32,7 +32,6 @@ IS_COMPONENT = 1 SHORT_LIBNAME = htmlpars EXTRA_DSO_LIBS = expat_s xmltok_s mozutil_s -REQUIRES = xpcom netlib raptor CPPSRCS = \ nsDTDUtils.cpp \ diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win index 000c6ed9710..de46273e956 100644 --- a/mozilla/parser/htmlparser/src/makefile.win +++ b/mozilla/parser/htmlparser/src/makefile.win @@ -27,7 +27,6 @@ LIBRARY_NAME=raptorhtmlpars DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN -DXML_DTD MODULE=raptor -REQUIRES=xpcom raptor netlib IS_COMPONENT = 1 CPPSRCS= \ diff --git a/mozilla/rdf/base/src/Makefile.in b/mozilla/rdf/base/src/Makefile.in index 0b7711a5859..1271e304607 100644 --- a/mozilla/rdf/base/src/Makefile.in +++ b/mozilla/rdf/base/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdfbase LIBRARY_NAME = rdfbase_s -REQUIRES = netlib rdf rdfutil raptor xpcom CPPSRCS = \ nsCompositeDataSource.cpp \ diff --git a/mozilla/rdf/brprof/build/Makefile.in b/mozilla/rdf/brprof/build/Makefile.in index 286fd359659..9ea6e5e52b5 100644 --- a/mozilla/rdf/brprof/build/Makefile.in +++ b/mozilla/rdf/brprof/build/Makefile.in @@ -32,7 +32,6 @@ IS_COMPONENT = 1 CPPSRCS = nsBrowsingProfileFactory.cpp -REQUIRES = xpcom SHARED_LIBRARY_LIBS = $(DIST)/lib/libbrprof_s.$(LIB_SUFFIX) diff --git a/mozilla/rdf/brprof/src/Makefile.in b/mozilla/rdf/brprof/src/Makefile.in index a0431cdf51d..a03526255f9 100644 --- a/mozilla/rdf/brprof/src/Makefile.in +++ b/mozilla/rdf/brprof/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdfbase LIBRARY_NAME = brprof_s -REQUIRES = brprof netlib rdf rdfutil raptor xpcom CPPSRCS = nsBrowsingProfile.cpp diff --git a/mozilla/rdf/build/Makefile.in b/mozilla/rdf/build/Makefile.in index 223cc615e61..0f8eceeb880 100644 --- a/mozilla/rdf/build/Makefile.in +++ b/mozilla/rdf/build/Makefile.in @@ -31,7 +31,6 @@ LIBRARY_NAME = rdf IS_COMPONENT = 1 EXTRA_DSO_LIBS = jsdom -REQUIRES = dom js netlib rdf raptor xpcom CPPSRCS = \ nsRDFModule.cpp \ diff --git a/mozilla/rdf/chrome/build/Makefile.in b/mozilla/rdf/chrome/build/Makefile.in index 532f26f978e..636da5ea954 100644 --- a/mozilla/rdf/chrome/build/Makefile.in +++ b/mozilla/rdf/chrome/build/Makefile.in @@ -30,7 +30,6 @@ MODULE = chrome LIBRARY_NAME = chrome IS_COMPONENT = 1 -REQUIRES = xpcom CPPSRCS = nsChromeFactory.cpp diff --git a/mozilla/rdf/chrome/src/Makefile.in b/mozilla/rdf/chrome/src/Makefile.in index ab561183d30..7c95b391485 100644 --- a/mozilla/rdf/chrome/src/Makefile.in +++ b/mozilla/rdf/chrome/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdfbase LIBRARY_NAME = chrome_s -REQUIRES = chrome netlib rdf rdfutil raptor xpcom CPPSRCS = \ nsChromeRegistry.cpp \ diff --git a/mozilla/rdf/content/src/Makefile.in b/mozilla/rdf/content/src/Makefile.in index 8074f934198..5a47287d73b 100644 --- a/mozilla/rdf/content/src/Makefile.in +++ b/mozilla/rdf/content/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdf LIBRARY_NAME = rdfcontent_s -REQUIRES = dom js netlib rdf raptor xpcom locale CPPSRCS = \ nsElementMap.cpp \ diff --git a/mozilla/rdf/datasource/src/Makefile.in b/mozilla/rdf/datasource/src/Makefile.in index e2dd1013507..55d402f870c 100644 --- a/mozilla/rdf/datasource/src/Makefile.in +++ b/mozilla/rdf/datasource/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdf LIBRARY_NAME = rdfdatasource_s -REQUIRES = dom js netlib rdf raptor xpcom CPPSRCS = \ nsLocalStore.cpp \ diff --git a/mozilla/rdf/util/src/Makefile.in b/mozilla/rdf/util/src/Makefile.in index 435ae14e045..85f0641d831 100644 --- a/mozilla/rdf/util/src/Makefile.in +++ b/mozilla/rdf/util/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdfutil LIBRARY_NAME = rdfutil_s -REQUIRES = xpcom rdf rdfutil raptor CPPSRCS = nsRDFResource.cpp diff --git a/mozilla/sun-java/stubs/src/Makefile.in b/mozilla/sun-java/stubs/src/Makefile.in index 0c3877a6288..cefe3d80e37 100644 --- a/mozilla/sun-java/stubs/src/Makefile.in +++ b/mozilla/sun-java/stubs/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = java LIBRARY_NAME = stubsj -REQUIRES = java CSRCS = stubsj.c diff --git a/mozilla/view/src/Makefile.in b/mozilla/view/src/Makefile.in index 8bd5cc977db..2478275cd1c 100644 --- a/mozilla/view/src/Makefile.in +++ b/mozilla/view/src/Makefile.in @@ -46,7 +46,6 @@ CPPSRCS = \ nsViewFactory.cpp \ $(NULL) -REQUIRES = raptor xpcom EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ diff --git a/mozilla/webshell/tests/viewer/windows/makefile.win b/mozilla/webshell/tests/viewer/windows/makefile.win index 8e99206b34b..ed8f5e9b2cb 100644 --- a/mozilla/webshell/tests/viewer/windows/makefile.win +++ b/mozilla/webshell/tests/viewer/windows/makefile.win @@ -25,7 +25,6 @@ LIBRARY_NAME=raptornativewidgets_s DEFINES=-DWIN32_LEAN_AND_MEAN MODULE=raptor -REQUIRES=xpcom widget CPPSRCS= \ nsButton.cpp \ diff --git a/mozilla/widget/src/beos/Makefile.in b/mozilla/widget/src/beos/Makefile.in index aae2877fe79..524043474b5 100644 --- a/mozilla/widget/src/beos/Makefile.in +++ b/mozilla/widget/src/beos/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widget_beos -REQUIRES = util img xpcom raptor netlib CPPSRCS = \ nsAppShell.cpp \ diff --git a/mozilla/widget/src/gtk/Makefile.in b/mozilla/widget/src/gtk/Makefile.in index 2499eabec60..896275e9d3b 100644 --- a/mozilla/widget/src/gtk/Makefile.in +++ b/mozilla/widget/src/gtk/Makefile.in @@ -25,7 +25,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_gtk IS_COMPONENT = 1 -REQUIRES = util img xpcom raptor netlib CSRCS = \ keysym2ucs.c diff --git a/mozilla/widget/src/gtksuperwin/Makefile.in b/mozilla/widget/src/gtksuperwin/Makefile.in index 9351d94f927..87a32be59d8 100644 --- a/mozilla/widget/src/gtksuperwin/Makefile.in +++ b/mozilla/widget/src/gtksuperwin/Makefile.in @@ -24,7 +24,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gtksuperwin -REQUIRES = CSRCS = \ gdksuperwin.c \ diff --git a/mozilla/widget/src/gtkxtbin/Makefile.in b/mozilla/widget/src/gtkxtbin/Makefile.in index 9d70377baff..d3161490c1d 100644 --- a/mozilla/widget/src/gtkxtbin/Makefile.in +++ b/mozilla/widget/src/gtkxtbin/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = gtkxtbin LIBRARY_NAME = gtkxtbin -REQUIRES = gtkxtbin CSRCS = \ gtkxtbin.c \ diff --git a/mozilla/widget/src/mac/Makefile.in b/mozilla/widget/src/mac/Makefile.in index b9ee936e77f..9ae5da27481 100644 --- a/mozilla/widget/src/mac/Makefile.in +++ b/mozilla/widget/src/mac/Makefile.in @@ -26,7 +26,6 @@ MODULE = widget LIBRARY_NAME = widget_mac IS_COMPONENT = 1 -REQUIRES = util img xpcom raptorgfx CPPSRCS = nsAppShell.cpp \ nsButton.cpp \ diff --git a/mozilla/widget/src/motif/Makefile.in b/mozilla/widget/src/motif/Makefile.in index 5e9892eacca..3bd7b4ba285 100644 --- a/mozilla/widget/src/motif/Makefile.in +++ b/mozilla/widget/src/motif/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_motif -REQUIRES = util img xpcom raptor netlib DIRS = app_context diff --git a/mozilla/widget/src/motif/app_context/Makefile.in b/mozilla/widget/src/motif/app_context/Makefile.in index b71beb9837d..1328393b780 100644 --- a/mozilla/widget/src/motif/app_context/Makefile.in +++ b/mozilla/widget/src/motif/app_context/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = motif_app_context IS_COMPONENT = 1 -REQUIRES = xpcom CPPSRCS = \ nsMotifAppContextService.cpp \ diff --git a/mozilla/widget/src/os2/Makefile.in b/mozilla/widget/src/os2/Makefile.in index 87c520d9a54..741dd7f4ef7 100644 --- a/mozilla/widget/src/os2/Makefile.in +++ b/mozilla/widget/src/os2/Makefile.in @@ -27,7 +27,6 @@ LIBRARY_NAME = wdgtos2 EXTRA_DSO_LIBS = nggfx -REQUIRES = util img xpcom raptor netlib DIRS = res diff --git a/mozilla/widget/src/photon/Makefile.in b/mozilla/widget/src/photon/Makefile.in index 8e160f6725a..38cd0873544 100644 --- a/mozilla/widget/src/photon/Makefile.in +++ b/mozilla/widget/src/photon/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_photon IS_COMPONENT = 1 -REQUIRES = util img xpcom raptor netlib OLD_WIDGETS = \ nsCheckButton.cpp \ diff --git a/mozilla/widget/src/qt/Makefile.in b/mozilla/widget/src/qt/Makefile.in index e356becf087..b05cdf60bbd 100644 --- a/mozilla/widget/src/qt/Makefile.in +++ b/mozilla/widget/src/qt/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_qt -REQUIRES = util img xpcom raptor netlib CPPSRCS = \ $(MOCSRCS) \ diff --git a/mozilla/widget/src/rhapsody/Makefile.in b/mozilla/widget/src/rhapsody/Makefile.in index a313cb80ab8..0b0da90cc4c 100644 --- a/mozilla/widget/src/rhapsody/Makefile.in +++ b/mozilla/widget/src/rhapsody/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widgetunix -REQUIRES = util img xpcom raptor netlib CPPSRCS = nsObject.cpp diff --git a/mozilla/widget/src/support/makefile.win b/mozilla/widget/src/support/makefile.win index fdb663db830..7f9eefa8d24 100644 --- a/mozilla/widget/src/support/makefile.win +++ b/mozilla/widget/src/support/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\.. # LIBRARY_NAME = widgetsupport_s -REQUIRES=xpcom gfxwin raptor dom js network netlib #DEFINES =-D_IMPL_NS_WIDGET CPPSRCS = \ diff --git a/mozilla/widget/src/windows/makefile.win b/mozilla/widget/src/windows/makefile.win index a813b04aba8..ec2cce21f74 100644 --- a/mozilla/widget/src/windows/makefile.win +++ b/mozilla/widget/src/windows/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\.. # LIBRARY_NAME = raptorwidget_s -REQUIRES=xpcom gfxwin raptor dom network netlib DEFINES =-D_IMPL_NS_WIDGET -DMOZ_AIMM CPPSRCS = \ diff --git a/mozilla/widget/src/xlib/Makefile.in b/mozilla/widget/src/xlib/Makefile.in index 5724497ef1b..0b314881dff 100644 --- a/mozilla/widget/src/xlib/Makefile.in +++ b/mozilla/widget/src/xlib/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_xlib -REQUIRES = util img xpcom raptor netlib DIRS = window_service diff --git a/mozilla/widget/src/xlib/window_service/Makefile.in b/mozilla/widget/src/xlib/window_service/Makefile.in index 20b9d429840..a94d0e3f468 100644 --- a/mozilla/widget/src/xlib/window_service/Makefile.in +++ b/mozilla/widget/src/xlib/window_service/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xlib_window_service IS_COMPONENT = 1 -REQUIRES = xpcom CPPSRCS = \ nsXlibWindowService.cpp \ diff --git a/mozilla/widget/src/xpwidgets/makefile.win b/mozilla/widget/src/xpwidgets/makefile.win index 32735731dfe..4a06117aee7 100644 --- a/mozilla/widget/src/xpwidgets/makefile.win +++ b/mozilla/widget/src/xpwidgets/makefile.win @@ -23,7 +23,6 @@ DEPTH=..\..\.. # LIBRARY_NAME = raptorbasewidget_s -REQUIRES=xpcom gfxwin raptor dom js network netlib DEFINES =-D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT CPPSRCS = \ diff --git a/mozilla/widget/timer/src/beos/Makefile.in b/mozilla/widget/timer/src/beos/Makefile.in index f0ae5a3828a..475e183e978 100644 --- a/mozilla/widget/timer/src/beos/Makefile.in +++ b/mozilla/widget/timer/src/beos/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = timer LIBRARY_NAME = timer_beos -REQUIRES = xpcom CPPSRCS = nsTimer.cpp diff --git a/mozilla/widget/timer/src/mac/Makefile.in b/mozilla/widget/timer/src/mac/Makefile.in index cce7e9153de..fb008413399 100644 --- a/mozilla/widget/timer/src/mac/Makefile.in +++ b/mozilla/widget/timer/src/mac/Makefile.in @@ -25,7 +25,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = timer LIBRARY_NAME = timer_mac -REQUIRES = xpcom EXPORTS = $(srcdir)/../unix/nsUnixTimerCIID.h diff --git a/mozilla/widget/timer/src/os2/Makefile.in b/mozilla/widget/timer/src/os2/Makefile.in index 07a3f1d5b06..cdf2600f583 100644 --- a/mozilla/widget/timer/src/os2/Makefile.in +++ b/mozilla/widget/timer/src/os2/Makefile.in @@ -39,7 +39,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = timer LIBRARY_NAME = timer -REQUIRES = xpcom EXPORTS=nsTimerManager.h nsWindowsTimer.h nsIWindowsTimerMap.h os2TimerGlue.h diff --git a/mozilla/widget/timer/src/rhapsody/Makefile.in b/mozilla/widget/timer/src/rhapsody/Makefile.in index 8b8c79fc2fd..abb1f273c39 100644 --- a/mozilla/widget/timer/src/rhapsody/Makefile.in +++ b/mozilla/widget/timer/src/rhapsody/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = timer LIBRARY_NAME = timer_s -REQUIRES = xpcom CPPSRCS = nsTimer.cpp diff --git a/mozilla/widget/timer/src/unix/gtk/Makefile.in b/mozilla/widget/timer/src/unix/gtk/Makefile.in index 7347237edca..8f22f951cd0 100644 --- a/mozilla/widget/timer/src/unix/gtk/Makefile.in +++ b/mozilla/widget/timer/src/unix/gtk/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = timer_$(TIMER_SUFFIX) -REQUIRES = xpcom CPPSRCS = nsTimerGtk.cpp diff --git a/mozilla/widget/timer/src/unix/motif/Makefile.in b/mozilla/widget/timer/src/unix/motif/Makefile.in index ed4da4598c8..d91a248e0a4 100644 --- a/mozilla/widget/timer/src/unix/motif/Makefile.in +++ b/mozilla/widget/timer/src/unix/motif/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = timer_$(TIMER_SUFFIX) -REQUIRES = xpcom CPPSRCS = nsTimerMotif.cpp diff --git a/mozilla/widget/timer/src/unix/photon/Makefile.in b/mozilla/widget/timer/src/unix/photon/Makefile.in index 7437ace0921..73d2c4a8c70 100644 --- a/mozilla/widget/timer/src/unix/photon/Makefile.in +++ b/mozilla/widget/timer/src/unix/photon/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = timer_$(TIMER_SUFFIX) -REQUIRES = xpcom CPPSRCS = nsTimerPh.cpp diff --git a/mozilla/widget/timer/src/unix/qt/Makefile.in b/mozilla/widget/timer/src/unix/qt/Makefile.in index 3cabf8c8202..28a34238106 100644 --- a/mozilla/widget/timer/src/unix/qt/Makefile.in +++ b/mozilla/widget/timer/src/unix/qt/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = timer_$(TIMER_SUFFIX) -REQUIRES = xpcom CPPSRCS = \ moc_nsTimerEventHandler.cpp \ diff --git a/mozilla/widget/timer/src/unix/xlib/Makefile.in b/mozilla/widget/timer/src/unix/xlib/Makefile.in index e5cb10144c5..d31a846c011 100644 --- a/mozilla/widget/timer/src/unix/xlib/Makefile.in +++ b/mozilla/widget/timer/src/unix/xlib/Makefile.in @@ -28,7 +28,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = timer_$(TIMER_SUFFIX) -REQUIRES = xpcom CPPSRCS = nsTimerXlib.cpp diff --git a/mozilla/widget/timer/src/windows/makefile.win b/mozilla/widget/timer/src/windows/makefile.win index 57d51f2a100..9f47c066a69 100644 --- a/mozilla/widget/timer/src/windows/makefile.win +++ b/mozilla/widget/timer/src/windows/makefile.win @@ -34,7 +34,6 @@ CPPSRCS = \ MODULE=timer -REQUIRES=xpcom CPP_OBJS= \ .\$(OBJDIR)\nsTimer.obj \ diff --git a/mozilla/xpcom/appshell/eventloop/photon/Makefile.in b/mozilla/xpcom/appshell/eventloop/photon/Makefile.in index 4a143f088a5..75107348e69 100644 --- a/mozilla/xpcom/appshell/eventloop/photon/Makefile.in +++ b/mozilla/xpcom/appshell/eventloop/photon/Makefile.in @@ -31,7 +31,6 @@ MODULE = xpcom_eventloop_photon LIBRARY_NAME = eventloop IS_COMPONENT = 1 -REQUIRES = xpcom CPPSRCS = \ nsCPhEvent.cpp \ diff --git a/mozilla/xpcom/appshell/eventloop/xp/Makefile.in b/mozilla/xpcom/appshell/eventloop/xp/Makefile.in index d3969637720..72017df500b 100644 --- a/mozilla/xpcom/appshell/eventloop/xp/Makefile.in +++ b/mozilla/xpcom/appshell/eventloop/xp/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom_eventloop_xp LIBRARY_NAME = xp_eventloop -REQUIRES = xpcom CPPSRCS = \ nsCBaseAppLoop.cpp \ diff --git a/mozilla/xpcom/appshell/nativeApp/Makefile.in b/mozilla/xpcom/appshell/nativeApp/Makefile.in index 29f205b1ebe..61b232e5fad 100644 --- a/mozilla/xpcom/appshell/nativeApp/Makefile.in +++ b/mozilla/xpcom/appshell/nativeApp/Makefile.in @@ -30,7 +30,6 @@ MODULE = xpcom_nativeapp LIBRARY_NAME = nativeapp IS_COMPONENT = 1 -REQUIRES = xpcom CPPSRCS = \ nsCNativeAppImpl.cpp \ diff --git a/mozilla/xpcom/base/Makefile.in b/mozilla/xpcom/base/Makefile.in index 63886ca194a..e04d25107c4 100644 --- a/mozilla/xpcom/base/Makefile.in +++ b/mozilla/xpcom/base/Makefile.in @@ -30,7 +30,6 @@ MODULE = xpcom XPIDL_MODULE = xpcom_base LIBRARY_NAME = xpcombase_s -REQUIRES = xpcom CPPSRCS = \ nsAllocator.cpp \ diff --git a/mozilla/xpcom/ds/Makefile.in b/mozilla/xpcom/ds/Makefile.in index 3fcc7c64e55..7f1b59c8f1a 100644 --- a/mozilla/xpcom/ds/Makefile.in +++ b/mozilla/xpcom/ds/Makefile.in @@ -30,7 +30,6 @@ MODULE = xpcom XPIDL_MODULE = xpcom_ds LIBRARY_NAME = xpcomds_s -REQUIRES = xpcom uconv unicharutil CSRCS = \ plvector.c \ diff --git a/mozilla/xpcom/io/Makefile.in b/mozilla/xpcom/io/Makefile.in index c031916d622..e2b98caf96f 100644 --- a/mozilla/xpcom/io/Makefile.in +++ b/mozilla/xpcom/io/Makefile.in @@ -30,7 +30,6 @@ MODULE = xpcom XPIDL_MODULE = xpcom_io LIBRARY_NAME = xpcomio_s -REQUIRES = xpcom uconv unicharutil CPPSRCS = \ nsDirectoryService.cpp \ diff --git a/mozilla/xpcom/proxy/src/Makefile.in b/mozilla/xpcom/proxy/src/Makefile.in index 343a013f4d6..3bfdce7ee58 100644 --- a/mozilla/xpcom/proxy/src/Makefile.in +++ b/mozilla/xpcom/proxy/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom LIBRARY_NAME = xpcomproxy_s -REQUIRES = xpcom CPPSRCS = \ nsProxyEvent.cpp \ diff --git a/mozilla/xpcom/reflect/xptcall/src/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/Makefile.in index 4e46c1579aa..45b64c42fdb 100644 --- a/mozilla/xpcom/reflect/xptcall/src/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom LIBRARY_NAME = xptcall -REQUIRES = xpcom DIRS = md diff --git a/mozilla/xpcom/reflect/xptinfo/src/Makefile.in b/mozilla/xpcom/reflect/xptinfo/src/Makefile.in index f44cafe31ee..629dff59e93 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/Makefile.in +++ b/mozilla/xpcom/reflect/xptinfo/src/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom LIBRARY_NAME = xptinfo -REQUIRES = xpcom CPPSRCS = \ xptiFile.cpp \ diff --git a/mozilla/xpcom/sample/Makefile.in b/mozilla/xpcom/sample/Makefile.in index 904e81b0fb8..fc11d0a785d 100644 --- a/mozilla/xpcom/sample/Makefile.in +++ b/mozilla/xpcom/sample/Makefile.in @@ -30,7 +30,6 @@ MODULE = sample LIBRARY_NAME = sample IS_COMPONENT = 1 -REQUIRES = sample raptor xpcom CPPSRCS = \ nsSample.cpp \ diff --git a/mozilla/xpcom/tests/makefile.win b/mozilla/xpcom/tests/makefile.win index df941f6e96b..a182e242e24 100644 --- a/mozilla/xpcom/tests/makefile.win +++ b/mozilla/xpcom/tests/makefile.win @@ -68,7 +68,6 @@ PROGRAMS = $(PROG1) \ LCFLAGS=-DUSE_NSREG -GX -REQUIRES=libreg LINCS= \ -Iservices \ diff --git a/mozilla/xpcom/threads/Makefile.in b/mozilla/xpcom/threads/Makefile.in index 58954d3697e..5ac67fb198d 100644 --- a/mozilla/xpcom/threads/Makefile.in +++ b/mozilla/xpcom/threads/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom_threads LIBRARY_NAME = xpcomthreads_s -REQUIRES = xpcom CSRCS = \ plevent.c \ diff --git a/mozilla/xpcom/typelib/xpt/src/Makefile.in b/mozilla/xpcom/typelib/xpt/src/Makefile.in index ca25453690a..3da256e11fa 100644 --- a/mozilla/xpcom/typelib/xpt/src/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/src/Makefile.in @@ -33,7 +33,6 @@ ifdef CROSS_COMPILE HOST_LIBRARY_NAME = hostxpt endif -REQUIRES = $(MODULE) CSRCS = xpt_arena.c xpt_struct.c xpt_xdr.c HOST_CSRCS = $(CSRCS) diff --git a/mozilla/xpfe/components/timebomb/Makefile.in b/mozilla/xpfe/components/timebomb/Makefile.in index d50ba16fa35..a8f1d8c4877 100644 --- a/mozilla/xpfe/components/timebomb/Makefile.in +++ b/mozilla/xpfe/components/timebomb/Makefile.in @@ -19,8 +19,6 @@ CPPSRCS = \ nsTimeBomb.cpp \ $(NULL) -#REQUIRES = nsappshell nspr xpcom security layer js jar pref img util rdf - EXPORTS = \ nsTimeBomb.h \ $(NULL) diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in index 6b80e98fce5..3aaa067292e 100644 --- a/mozilla/xpinstall/src/Makefile.in +++ b/mozilla/xpinstall/src/Makefile.in @@ -36,7 +36,6 @@ IS_COMPONENT = 1 EXTRA_DSO_LIBS = jsdom -REQUIRES = dom js netlib raptor xpcom # XXX shouldn't need to export this EXPORTS = nsXPITriggerInfo.h