diff --git a/accessible/build/Makefile.in b/accessible/build/Makefile.in index b5aaea3ff794..d5e842f2eff1 100644 --- a/accessible/build/Makefile.in +++ b/accessible/build/Makefile.in @@ -54,8 +54,6 @@ MODULE_NAME = nsAccessibilityModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - $(NULL) CPPSRCS = nsAccessibilityFactory.cpp diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in index eac3cde90200..c189df7511c3 100644 --- a/accessible/src/atk/Makefile.in +++ b/accessible/src/atk/Makefile.in @@ -45,23 +45,6 @@ MODULE = accessibility LIBRARY_NAME = accessibility_toolkit_s LIBXUL_LIBRARY = 1 -REQUIRES = content \ - docshell \ - dom \ - editor \ - gfx \ - thebes \ - intl \ - layout \ - locale \ - necko \ - string \ - uriloader \ - view \ - webshell \ - widget \ - xpcom \ - $(NULL) CPPSRCS = \ nsAccessNodeWrap.cpp \ diff --git a/accessible/src/base/Makefile.in b/accessible/src/base/Makefile.in index c421294ead83..0f43d5d25abe 100644 --- a/accessible/src/base/Makefile.in +++ b/accessible/src/base/Makefile.in @@ -46,31 +46,6 @@ MODULE = accessibility LIBRARY_NAME = accessibility_base_s LIBXUL_LIBRARY = 1 -REQUIRES = appshell \ - commandhandler \ - composer \ - content \ - docshell \ - dom \ - editor \ - gfx \ - thebes \ - intl \ - layout \ - locale \ - necko \ - plugin \ - pref \ - string \ - unicharutil \ - uriloader \ - view \ - webshell \ - widget \ - xpcom \ - xuldoc \ - imglib2 \ - $(NULL) CPPSRCS = \ nsAccessNode.cpp \ diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in index 77fc2e588469..4be4095d71b8 100644 --- a/accessible/src/html/Makefile.in +++ b/accessible/src/html/Makefile.in @@ -47,26 +47,6 @@ MODULE = accessibility LIBRARY_NAME = accessibility_html_s LIBXUL_LIBRARY = 1 -REQUIRES = composer \ - content \ - docshell \ - dom \ - editor \ - gfx \ - imglib2 \ - intl \ - js \ - layout \ - locale \ - necko \ - string \ - thebes \ - view \ - webshell \ - widget \ - xpcom \ - xpconnect \ - $(NULL) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) REQUIRES += editor diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in index cde2e317e40d..ec3477b7225a 100644 --- a/accessible/src/mac/Makefile.in +++ b/accessible/src/mac/Makefile.in @@ -45,22 +45,6 @@ MODULE = accessibility LIBRARY_NAME = accessibility_toolkit_s LIBXUL_LIBRARY = 1 -REQUIRES = content \ - layout \ - docshell \ - dom \ - editor \ - gfx \ - thebes \ - intl \ - locale \ - string \ - uriloader \ - view \ - widget \ - xpcom \ - necko \ - $(NULL) CMMSRCS = nsAccessNodeWrap.mm \ diff --git a/accessible/src/msaa/Makefile.in b/accessible/src/msaa/Makefile.in index d694b5129862..ee30a0f8b11d 100644 --- a/accessible/src/msaa/Makefile.in +++ b/accessible/src/msaa/Makefile.in @@ -45,27 +45,6 @@ MODULE = accessibility LIBRARY_NAME = accessibility_toolkit_s LIBXUL_LIBRARY = 1 -REQUIRES = content \ - docshell \ - dom \ - editor \ - gfx \ - thebes \ - htmlparser \ - intl \ - layout \ - locale \ - necko \ - plugin \ - pref \ - string \ - uriloader \ - view \ - webshell \ - widget \ - xpcom \ - xuldoc \ - $(NULL) CPPSRCS = \ nsAccessNodeWrap.cpp \ diff --git a/accessible/src/other/Makefile.in b/accessible/src/other/Makefile.in index 166870540609..76e10c754dbf 100644 --- a/accessible/src/other/Makefile.in +++ b/accessible/src/other/Makefile.in @@ -45,27 +45,6 @@ MODULE = accessibility LIBRARY_NAME = accessibility_toolkit_s LIBXUL_LIBRARY = 1 -REQUIRES = content \ - docshell \ - dom \ - editor \ - gfx \ - thebes \ - htmlparser \ - intl \ - layout \ - locale \ - necko \ - plugin \ - pref \ - string \ - uriloader \ - view \ - webshell \ - widget \ - xpcom \ - xuldoc \ - $(NULL) CPPSRCS = \ nsAccessNodeWrap.cpp \ diff --git a/accessible/src/xforms/Makefile.in b/accessible/src/xforms/Makefile.in index 508c09f6d9ac..47c7b5fc2f25 100644 --- a/accessible/src/xforms/Makefile.in +++ b/accessible/src/xforms/Makefile.in @@ -47,21 +47,6 @@ MODULE = accessibility LIBRARY_NAME = accessibility_xforms_s LIBXUL_LIBRARY = 1 -REQUIRES = content \ - docshell \ - dom \ - editor \ - gfx \ - thebes \ - intl \ - layout \ - locale \ - necko \ - pref \ - string \ - widget \ - xpcom \ - $(NULL) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) REQUIRES += editor diff --git a/accessible/src/xul/Makefile.in b/accessible/src/xul/Makefile.in index 985333c684f3..4ccbcf52ba07 100644 --- a/accessible/src/xul/Makefile.in +++ b/accessible/src/xul/Makefile.in @@ -47,21 +47,6 @@ MODULE = accessibility LIBRARY_NAME = accessibility_xul_s LIBXUL_LIBRARY = 1 -REQUIRES = content \ - docshell \ - dom \ - editor \ - gfx \ - thebes \ - intl \ - layout \ - locale \ - necko \ - pref \ - string \ - widget \ - xpcom \ - $(NULL) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) REQUIRES += editor diff --git a/browser/components/about/Makefile.in b/browser/components/about/Makefile.in index 45916f01692a..ea232e319b4a 100644 --- a/browser/components/about/Makefile.in +++ b/browser/components/about/Makefile.in @@ -49,7 +49,6 @@ ifndef MOZ_MEMORY USE_STATIC_LIBS = 1 endif -REQUIRES = xpcom string necko caps EXPORTS_NAMESPACES = mozilla/browser diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in index 0ddc7e2fbe76..59561ccd3fd4 100644 --- a/browser/components/build/Makefile.in +++ b/browser/components/build/Makefile.in @@ -18,21 +18,6 @@ ifndef MOZ_MEMORY USE_STATIC_LIBS = 1 endif -REQUIRES = \ - xpcom \ - string \ - rdf \ - uriloader \ - intl \ - necko \ - shellservice \ - xulapp \ - places \ - browserplaces \ - microsummaries \ - privatebrowsing \ - browserabout \ - $(NULL) EXPORTS = nsBrowserCompsCID.h diff --git a/browser/components/dirprovider/Makefile.in b/browser/components/dirprovider/Makefile.in index 4fbd1e4e0e6d..c0ef030766e4 100644 --- a/browser/components/dirprovider/Makefile.in +++ b/browser/components/dirprovider/Makefile.in @@ -57,12 +57,6 @@ ifndef MOZ_MEMORY USE_STATIC_LIBS = 1 endif -REQUIRES = \ - xpcom \ - string \ - pref \ - xulapp \ - $(NULL) CPPSRCS = nsBrowserDirectoryProvider.cpp diff --git a/browser/components/feeds/src/Makefile.in b/browser/components/feeds/src/Makefile.in index 8ea46677bb81..07a3ead992fb 100644 --- a/browser/components/feeds/src/Makefile.in +++ b/browser/components/feeds/src/Makefile.in @@ -60,7 +60,6 @@ EXTRA_PP_COMPONENTS = \ WebContentConverter.js \ $(NULL) -REQUIRES = xpcom string necko mimetype CPPSRCS = nsFeedSniffer.cpp diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in index 724a98966fd9..3fa87f0edfa8 100644 --- a/browser/components/migration/src/Makefile.in +++ b/browser/components/migration/src/Makefile.in @@ -49,26 +49,6 @@ ifndef MOZ_MEMORY USE_STATIC_LIBS = 1 endif -REQUIRES = \ - xpcom \ - string \ - necko \ - libreg \ - browsercomps \ - toolkitcomps \ - loginmgr \ - pref \ - rdf \ - satchel \ - intl \ - unicharutil \ - windowwatcher \ - dom \ - docshell \ - xulapp \ - places \ - browserplaces \ - $(NULL) CPPSRCS = nsProfileMigrator.cpp \ nsBrowserProfileMigratorUtils.cpp \ diff --git a/browser/components/places/src/Makefile.in b/browser/components/places/src/Makefile.in index 396b748fe7b0..e58faa4825d9 100644 --- a/browser/components/places/src/Makefile.in +++ b/browser/components/places/src/Makefile.in @@ -52,18 +52,6 @@ ifndef MOZ_MEMORY USE_STATIC_LIBS = 1 endif -REQUIRES = \ - xpcom \ - string \ - necko \ - browsercomps \ - toolkitcomps \ - unicharutil \ - htmlparser \ - content \ - places \ - microsummaries \ - $(NULL) CPPSRCS = nsPlacesImportExportService.cpp diff --git a/browser/components/privatebrowsing/src/Makefile.in b/browser/components/privatebrowsing/src/Makefile.in index 594eab47af12..308aff7eda28 100644 --- a/browser/components/privatebrowsing/src/Makefile.in +++ b/browser/components/privatebrowsing/src/Makefile.in @@ -50,13 +50,6 @@ ifndef MOZ_MEMORY USE_STATIC_LIBS = 1 endif -REQUIRES = \ - xpcom \ - string \ - necko \ - js \ - xpconnect \ - $(NULL) CPPSRCS = \ nsPrivateBrowsingServiceWrapper.cpp \ diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in index f83b2902c754..928475afee9b 100644 --- a/browser/components/shell/src/Makefile.in +++ b/browser/components/shell/src/Makefile.in @@ -49,21 +49,6 @@ ifndef MOZ_MEMORY USE_STATIC_LIBS = 1 endif -REQUIRES = \ - xpcom \ - string \ - uriloader \ - webbrowserpersist \ - dom \ - intl \ - necko \ - content \ - imglib2 \ - gfx \ - widget \ - pref \ - layout \ - $(NULL) ifneq (,$(filter WINCE WINNT,$(OS_ARCH))) CPPSRCS = nsWindowsShellService.cpp diff --git a/build/pymake/pymake/parser.py b/build/pymake/pymake/parser.py index be8dfce0fd04..4c9354d64d8e 100644 --- a/build/pymake/pymake/parser.py +++ b/build/pymake/pymake/parser.py @@ -64,6 +64,9 @@ def append(self, data): def getloc(self, offset): return self.startloc + self.data[:offset] + def endloc(self): + return self.startloc + self.data + def skipwhitespace(self, offset): """ Return the offset into data after skipping whitespace. @@ -556,7 +559,7 @@ def parsestream(fd, filename): raise SyntaxError("Unterminated define", d.getloc()) value = _iterflatten(iterdefinechars, d, startpos) - condstack[-1].append(parserdata.SetVariable(vname, value=value, valueloc=d.getloc(0), token='=', targetexp=None)) + condstack[-1].append(parserdata.SetVariable(vname, value=value, valueloc=d.getloc(0), token='=', targetexp=None, source=data.Variables.SOURCE_MAKEFILE, endloc=d.endloc())) continue if kword in ('include', '-include'): @@ -583,7 +586,7 @@ def parsestream(fd, filename): value = _iterflatten(itermakefilechars, d, offset).lstrip() - condstack[-1].append(parserdata.SetVariable(vname, value=value, valueloc=d.getloc(offset), token=token, targetexp=None, source=data.Variables.SOURCE_OVERRIDE)) + condstack[-1].append(parserdata.SetVariable(vname, value=value, valueloc=d.getloc(offset), token=token, targetexp=None, source=data.Variables.SOURCE_OVERRIDE, endloc=d.endloc())) continue if kword == 'export': @@ -598,7 +601,7 @@ def parsestream(fd, filename): condstack[-1].append(parserdata.ExportDirective(e, single=True)) value = _iterflatten(itermakefilechars, d, offset).lstrip() - condstack[-1].append(parserdata.SetVariable(e, value=value, valueloc=d.getloc(offset), token=token, targetexp=None)) + condstack[-1].append(parserdata.SetVariable(e, value=value, valueloc=d.getloc(offset), token=token, targetexp=None, source=data.Variables.SOURCE_MAKEFILE, endloc=d.endloc())) continue @@ -626,7 +629,7 @@ def parsestream(fd, filename): value = _iterflatten(itermakefilechars, d, offset).lstrip() - condstack[-1].append(parserdata.SetVariable(e, value=value, valueloc=d.getloc(offset), token=token, targetexp=None)) + condstack[-1].append(parserdata.SetVariable(e, value=value, valueloc=d.getloc(offset), token=token, targetexp=None, source=data.Variables.SOURCE_MAKEFILE, endloc=d.endloc())) else: doublecolon = token == '::' @@ -657,7 +660,7 @@ def parsestream(fd, filename): e.rstrip() value = _iterflatten(itermakefilechars, d, offset).lstrip() - condstack[-1].append(parserdata.SetVariable(e, value=value, valueloc=d.getloc(offset), token=token, targetexp=targets)) + condstack[-1].append(parserdata.SetVariable(e, value=value, valueloc=d.getloc(offset), token=token, targetexp=targets, source=data.Variables.SOURCE_MAKEFILE, endloc=d.endloc())) elif token == '|': raise SyntaxError('order-only prerequisites not implemented', d.getloc(offset)) else: diff --git a/build/pymake/pymake/parserdata.py b/build/pymake/pymake/parserdata.py index a43798590072..49e43379974e 100644 --- a/build/pymake/pymake/parserdata.py +++ b/build/pymake/pymake/parserdata.py @@ -91,7 +91,7 @@ def parsecommandlineargs(args): stmts.append(SetVariable(vnameexp, token=t, value=val, valueloc=Location('', i, len(vname) + len(t)), - targetexp=None, source=data.Variables.SOURCE_COMMANDLINE)) + targetexp=None, source=data.Variables.SOURCE_COMMANDLINE, endloc=None)) else: r.append(a) @@ -210,20 +210,19 @@ def dump(self, fd, indent): class SetVariable(Statement): __slots__ = ('vnameexp', 'token', 'value', 'valueloc', 'targetexp', 'source') - def __init__(self, vnameexp, token, value, valueloc, targetexp, source=None): + def __init__(self, vnameexp, token, value, valueloc, targetexp, source, + endloc): assert isinstance(vnameexp, (data.Expansion, data.StringExpansion)) assert isinstance(value, str) assert targetexp is None or isinstance(targetexp, (data.Expansion, data.StringExpansion)) - if source is None: - source = data.Variables.SOURCE_MAKEFILE - self.vnameexp = vnameexp self.token = token self.value = value self.valueloc = valueloc self.targetexp = targetexp self.source = source + self.endloc = endloc def execute(self, makefile, context): vname = self.vnameexp.resolvestr(makefile, makefile.variables) @@ -267,7 +266,7 @@ def execute(self, makefile, context): v.set(vname, flavor, self.source, value) def dump(self, fd, indent): - print >>fd, "%sSetVariable<%s> %s %s\n%s %r" % (indent, self.valueloc, self.vnameexp, self.token, indent, self.value) + print >>fd, "%sSetVariable<%s-%s> %s %s\n%s %r" % (indent, self.valueloc, self.endloc, self.vnameexp, self.token, indent, self.value) class Condition(object): """ @@ -369,6 +368,9 @@ def dump(self, fd, indent): print >>fd, "%s ~Condition" % (indent,) print >>fd, "%s~ConditionBlock" % (indent,) + def __iter__(self): + return iter(self._groups) + class Include(Statement): __slots__ = ('exp', 'required') @@ -486,3 +488,9 @@ def __str__(self): fd = StringIO() self.dump(fd, '') return fd.getvalue() + +def iterstatements(stmts): + for s in stmts: + yield s + if isinstance(s, ConditionBlock): + for c, ss in iterstatements(s): yield ss diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in index 61e5761188ea..d070de791a71 100644 --- a/caps/src/Makefile.in +++ b/caps/src/Makefile.in @@ -50,22 +50,6 @@ MODULE_NAME = nsSecurityManagerModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - pref \ - js \ - dom \ - xpconnect \ - necko \ - jar \ - widget \ - plugin \ - intl \ - docshell \ - windowwatcher \ - content \ - layout \ - $(NULL) CPPSRCS = \ nsPrincipal.cpp \ diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in index 1a000d862ac7..8b8a7058d1a8 100644 --- a/chrome/src/Makefile.in +++ b/chrome/src/Makefile.in @@ -50,28 +50,6 @@ MODULE_NAME = nsChromeModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - rdf \ - content \ - xuldoc \ - gfx \ - layout \ - locale \ - necko \ - dom \ - widget \ - js \ - appshell \ - toolkitcomps \ - caps \ - pref \ - docshell \ - xpconnect \ - jar \ - xulapp \ - unicharutil \ - $(NULL) CPPSRCS = \ nsChromeFactory.cpp \ diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index db9282abb9a2..e9b43a0527f1 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -46,46 +46,6 @@ MODULE = content LIBRARY_NAME = gkconbase_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - gfx \ - thebes \ - layout \ - widget \ - view \ - locale \ - htmlparser \ - js \ - webshell \ - necko \ - nkcache \ - mimetype \ - exthandler \ - chardet \ - caps \ - lwbrk \ - uconv \ - docshell \ - pref \ - xpconnect \ - unicharutil \ - intl \ - webbrowserpersist \ - imglib2 \ - plugin \ - prefetch \ - xuldoc \ - uriloader \ - rdf \ - xultmpl \ - util \ - appshell \ - shistory \ - editor \ - windowwatcher \ - html5 \ - $(NULL) ifdef ACCESSIBILITY REQUIRES += accessibility diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in index a5bc5e6fef29..1316dcfd4041 100644 --- a/content/base/test/Makefile.in +++ b/content/base/test/Makefile.in @@ -55,17 +55,6 @@ CPP_UNIT_TESTS = \ TestPlainTextSerializer.cpp \ $(NULL) -REQUIRES += \ - caps \ - content \ - dom \ - js \ - netwerk \ - string \ - xpcom \ - xpconnect \ - htmlparser \ - $(NULL) XPCSHELL_TESTS = \ unit \ diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index cd5c95af7151..f0b2678ce6e0 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -46,27 +46,6 @@ MODULE = content LIBRARY_NAME = gkconcvs_s LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - gfx \ - layout \ - widget \ - dom \ - js \ - locale \ - unicharutil \ - webshell \ - necko \ - pref \ - docshell \ - xpconnect \ - caps \ - imglib2 \ - thebes \ - view \ - qcms \ - $(NULL) CPPSRCS = \ diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index 6f321e917b58..b9a3f87e5314 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -45,26 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = content LIBRARY_NAME = gkconevents_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - js \ - locale \ - gfx \ - thebes \ - layout \ - widget \ - caps \ - xpconnect \ - webshell \ - docshell \ - pref \ - view \ - necko \ - unicharutil \ - imglib2 \ - editor \ - $(NULL) CPPSRCS = \ nsEventListenerManager.cpp \ diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index a426e2f034a0..0a7eb0715daa 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -46,35 +46,6 @@ MODULE = content LIBRARY_NAME = gkconhtmlcon_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - gfx \ - thebes \ - layout \ - widget \ - dom \ - js \ - locale \ - unicharutil \ - webshell \ - uriloader \ - htmlparser \ - necko \ - view \ - pref \ - docshell \ - xpconnect \ - xuldoc \ - caps \ - editor \ - imglib2 \ - mimetype \ - exthandler \ - chardet \ - uconv \ - intl \ - plugin \ - $(NULL) EXPORTS = \ nsImageMapUtils.h \ diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in index 6298ab652af8..c6ba8cbef1db 100644 --- a/content/html/document/src/Makefile.in +++ b/content/html/document/src/Makefile.in @@ -46,38 +46,6 @@ MODULE = content LIBRARY_NAME = gkconhtmldoc_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - gfx \ - thebes \ - layout \ - widget \ - dom \ - necko \ - htmlparser \ - locale \ - view \ - js \ - intl \ - webshell \ - docshell \ - caps \ - util \ - uconv \ - pref \ - chardet \ - nkcache \ - imglib2 \ - xpconnect \ - unicharutil \ - commandhandler \ - composer \ - editor \ - plugin \ - txtsvc \ - uriloader \ - html5 \ - $(NULL) CPPSRCS = \ nsHTMLContentSink.cpp \ diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in index 2c43318b9e9e..bf4e49a2f5b2 100644 --- a/content/mathml/content/src/Makefile.in +++ b/content/mathml/content/src/Makefile.in @@ -46,18 +46,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = content LIBRARY_NAME = gkcontentmathml_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - layout \ - widget \ - gfx \ - dom \ - js \ - locale \ - pref \ - webshell \ - thebes \ - $(NULL) CPPSRCS = \ nsMathMLElement.cpp \ diff --git a/content/media/Makefile.in b/content/media/Makefile.in index 10eb026e062d..7404718c3641 100644 --- a/content/media/Makefile.in +++ b/content/media/Makefile.in @@ -45,38 +45,6 @@ MODULE = content LIBRARY_NAME = gkconmedia_s LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - gfx \ - content \ - thebes \ - layout \ - widget \ - dom \ - js \ - locale \ - unicharutil \ - webshell \ - uriloader \ - htmlparser \ - necko \ - view \ - pref \ - docshell \ - xpconnect \ - xuldoc \ - caps \ - editor \ - imglib2 \ - mimetype \ - exthandler \ - uconv \ - intl \ - plugin \ - cairo \ - libpixman \ - $(NULL) EXPORTS = \ nsMediaDecoder.h \ diff --git a/content/media/ogg/Makefile.in b/content/media/ogg/Makefile.in index 1266088a8100..6ce9b92c4793 100644 --- a/content/media/ogg/Makefile.in +++ b/content/media/ogg/Makefile.in @@ -45,38 +45,6 @@ MODULE = content LIBRARY_NAME = gkconogg_s LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - gfx \ - content \ - thebes \ - layout \ - widget \ - dom \ - js \ - locale \ - unicharutil \ - webshell \ - uriloader \ - htmlparser \ - necko \ - view \ - pref \ - docshell \ - xpconnect \ - xuldoc \ - caps \ - editor \ - imglib2 \ - mimetype \ - exthandler \ - uconv \ - intl \ - plugin \ - cairo \ - libpixman \ - $(NULL) EXPORTS += \ nsChannelReader.h \ diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in index 3e52abdff997..618b4b30bd58 100644 --- a/content/media/wave/Makefile.in +++ b/content/media/wave/Makefile.in @@ -45,38 +45,6 @@ MODULE = content LIBRARY_NAME = gkconwave_s LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - gfx \ - content \ - thebes \ - layout \ - widget \ - dom \ - js \ - locale \ - unicharutil \ - webshell \ - uriloader \ - htmlparser \ - necko \ - view \ - pref \ - docshell \ - xpconnect \ - xuldoc \ - caps \ - editor \ - imglib2 \ - mimetype \ - exthandler \ - uconv \ - intl \ - plugin \ - cairo \ - libpixman \ - $(NULL) EXPORTS += \ nsWaveDecoder.h \ diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in index 0868b309ca05..dfb97ce67b40 100644 --- a/content/smil/Makefile.in +++ b/content/smil/Makefile.in @@ -46,16 +46,6 @@ MODULE = content LIBRARY_NAME = gkconsmil_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - layout \ - widget \ - gfx \ - unicharutil \ - dom \ - js \ - pref \ - $(NULL) CPPSRCS = \ nsSMILAnimationController.cpp \ diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in index a5d01eafabf7..9686428167aa 100644 --- a/content/svg/content/src/Makefile.in +++ b/content/svg/content/src/Makefile.in @@ -47,24 +47,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = content LIBRARY_NAME = gkcontentsvg_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - layout \ - widget \ - gfx \ - dom \ - js \ - locale \ - view \ - pref \ - necko \ - xpconnect \ - webshell \ - xuldoc \ - unicharutil \ - imglib2 \ - docshell \ - thebes CPPSRCS = \ nsDOMSVGZoomEvent.cpp \ diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in index 85e6653d6906..b3a77697b1a1 100644 --- a/content/svg/document/src/Makefile.in +++ b/content/svg/document/src/Makefile.in @@ -45,23 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = content LIBRARY_NAME = gkconsvgdoc_s LIBXUL_LIBRARY = 1 -REQUIRES = \ - layout \ - widget \ - xpcom \ - string \ - gfx \ - thebes \ - dom \ - webshell \ - docshell \ - htmlparser \ - necko \ - pref \ - js \ - caps \ - locale \ - $(NULL) CPPSRCS = \ nsSVGDocument.cpp \ diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 0bb2c8ef46f3..eddf0b482c97 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -46,29 +46,6 @@ MODULE = content LIBRARY_NAME = gkconxbl_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - js \ - dom \ - gfx \ - thebes \ - layout \ - xultmpl \ - widget \ - caps \ - htmlparser \ - necko \ - xpconnect \ - pref \ - docshell \ - webshell \ - xuldoc \ - rdf \ - imglib2 \ - unicharutil \ - locale \ - util \ - $(NULL) CPPSRCS = \ nsXBLBinding.cpp \ diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in index a3d2c8f815bf..bd522bee3225 100644 --- a/content/xml/content/src/Makefile.in +++ b/content/xml/content/src/Makefile.in @@ -46,21 +46,6 @@ MODULE = content LIBRARY_NAME = gkconxmlcon_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - js \ - dom \ - gfx \ - thebes \ - layout \ - widget \ - necko \ - webshell \ - docshell \ - unicharutil \ - pref \ - locale \ - $(NULL) CPPSRCS = \ nsXMLElement.cpp \ diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in index e967cd88ef56..0f5f4f895d88 100644 --- a/content/xml/document/src/Makefile.in +++ b/content/xml/document/src/Makefile.in @@ -46,29 +46,6 @@ MODULE = content LIBRARY_NAME = gkconxmldoc_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - js \ - dom \ - gfx \ - thebes \ - layout \ - widget \ - caps \ - htmlparser \ - necko \ - imglib2 \ - docshell \ - webshell \ - pref \ - xpconnect \ - uconv \ - exthandler \ - mimetype \ - unicharutil \ - locale \ - util \ - $(NULL) CPPSRCS = \ nsXMLContentSink.cpp \ diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in index be2f88609930..faa322ae823d 100644 --- a/content/xslt/src/base/Makefile.in +++ b/content/xslt/src/base/Makefile.in @@ -46,9 +46,6 @@ MODULE = transformiix LIBRARY_NAME = txbase_s LIBXUL_LIBRARY = 1 -REQUIRES = string \ - xpcom \ - $(NULL) ifndef MOZ_XSLT_STANDALONE REQUIRES += unicharutil \ diff --git a/content/xslt/src/main/Makefile.in b/content/xslt/src/main/Makefile.in index 0e721a641b49..88ae864ed68c 100644 --- a/content/xslt/src/main/Makefile.in +++ b/content/xslt/src/main/Makefile.in @@ -49,11 +49,6 @@ ifdef MARK_INC SIMPLE_PROGRAMS += txXSLTMarkDriver$(BIN_SUFFIX) endif -REQUIRES = string \ - xpcom \ - expat \ - jprof \ - $(NULL) CPP_PROG_LINK = 1 diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in index 2517b31c9353..889de50dfec7 100644 --- a/content/xslt/src/xml/Makefile.in +++ b/content/xslt/src/xml/Makefile.in @@ -46,10 +46,6 @@ MODULE = transformiix LIBRARY_NAME = txxml_s LIBXUL_LIBRARY = 1 -REQUIRES = \ - string \ - xpcom \ - $(NULL) ifndef MOZ_XSLT_STANDALONE REQUIRES += \ diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in index 7e28a9f7a26a..99cab9fc7fb9 100644 --- a/content/xslt/src/xpath/Makefile.in +++ b/content/xslt/src/xpath/Makefile.in @@ -46,9 +46,6 @@ MODULE = transformiix LIBRARY_NAME = txxpath_s LIBXUL_LIBRARY = 1 -REQUIRES = string \ - xpcom \ - $(NULL) ifndef MOZ_XSLT_STANDALONE REQUIRES += dom \ diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in index 4ba54a036040..b7f3d090d892 100644 --- a/content/xslt/src/xslt/Makefile.in +++ b/content/xslt/src/xslt/Makefile.in @@ -46,10 +46,6 @@ MODULE = transformiix LIBRARY_NAME = txxslt_s LIBXUL_LIBRARY = 1 -REQUIRES = \ - string \ - xpcom \ - $(NULL) ifndef MOZ_XSLT_STANDALONE REQUIRES += \ diff --git a/content/xtf/src/Makefile.in b/content/xtf/src/Makefile.in index 82c9df62cc90..de0c295de830 100644 --- a/content/xtf/src/Makefile.in +++ b/content/xtf/src/Makefile.in @@ -45,21 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = content LIBRARY_NAME = gkcontentxtf_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - layout \ - widget \ - gfx \ - thebes \ - dom \ - js \ - locale \ - pref \ - necko \ - xpconnect \ - webshell \ - unicharutil \ - $(NULL) CPPSRCS = \ nsXMLContentBuilder.cpp \ diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in index 5c3bdc1c32ff..f8a3d95e926d 100644 --- a/content/xul/content/src/Makefile.in +++ b/content/xul/content/src/Makefile.in @@ -49,28 +49,6 @@ LIBRARY_NAME = gkconxulcon_s LIBXUL_LIBRARY = 1 endif -REQUIRES = xpcom \ - string \ - gfx \ - thebes \ - layout \ - content \ - widget \ - necko \ - dom \ - js \ - caps \ - rdf \ - xpconnect \ - pref \ - locale \ - xuldoc \ - xultmpl \ - webshell \ - view \ - htmlparser \ - docshell \ - $(NULL) ifdef MOZ_XUL CPPSRCS += \ diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in index f205e1b8772f..b090c44c5c1a 100644 --- a/content/xul/document/src/Makefile.in +++ b/content/xul/document/src/Makefile.in @@ -46,33 +46,6 @@ MODULE = xuldoc LIBRARY_NAME = gkconxuldoc_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - exthandler \ - mimetype \ - gfx \ - thebes \ - layout \ - content \ - widget \ - dom \ - rdf \ - js \ - xpconnect \ - caps \ - locale \ - view \ - necko \ - htmlparser \ - docshell \ - pref \ - xultmpl \ - webshell \ - unicharutil \ - appshell \ - util \ - uriloader \ - $(NULL) CPPSRCS = nsXULControllers.cpp diff --git a/content/xul/templates/src/Makefile.in b/content/xul/templates/src/Makefile.in index 994ae98d44f7..21f49b10d191 100644 --- a/content/xul/templates/src/Makefile.in +++ b/content/xul/templates/src/Makefile.in @@ -46,26 +46,6 @@ MODULE = xultmpl LIBRARY_NAME = gkconxultmpl_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - js \ - xpconnect \ - caps \ - gfx \ - thebes \ - layout \ - content \ - pref \ - widget \ - dom \ - rdf \ - necko \ - locale \ - unicharutil \ - xuldoc \ - webshell \ - storage \ - $(NULL) CPPSRCS = \ nsContentSupportMap.cpp \ diff --git a/db/mork/build/Makefile.in b/db/mork/build/Makefile.in index 4ba110c9ae22..9ea83bbbb20c 100644 --- a/db/mork/build/Makefile.in +++ b/db/mork/build/Makefile.in @@ -49,8 +49,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsMorkModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - $(NULL) CPPSRCS = nsMorkFactory.cpp diff --git a/db/mork/src/Makefile.in b/db/mork/src/Makefile.in index d04313931e50..035a071de2a6 100644 --- a/db/mork/src/Makefile.in +++ b/db/mork/src/Makefile.in @@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = mork LIBRARY_NAME = msgmork_s -REQUIRES = xpcom \ - $(NULL) FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 diff --git a/db/morkreader/Makefile.in b/db/morkreader/Makefile.in index 59f77e44a999..3ef58888779d 100644 --- a/db/morkreader/Makefile.in +++ b/db/morkreader/Makefile.in @@ -53,10 +53,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - $(NULL) EXPORTS = nsMorkReader.h CPPSRCS = nsMorkReader.cpp diff --git a/db/morkreader/external/Makefile.in b/db/morkreader/external/Makefile.in index 33acaeabcbf9..64b6f77eaa15 100644 --- a/db/morkreader/external/Makefile.in +++ b/db/morkreader/external/Makefile.in @@ -49,10 +49,6 @@ LIBRARY_NAME = morkreader_external_s MOZILLA_INTERNAL_API = 1 FORCE_STATIC_LIB = 1 -REQUIRES = xpcom \ - string \ - necko \ - $(NULL) CPPSRCS = nsMorkReader.cpp diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index 1d2a693114bd..4ece95b54210 100644 --- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -51,42 +51,6 @@ LIBRARY_NAME = basedocshell_s GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - caps \ - necko \ - gfx \ - thebes \ - layout \ - content \ - dom \ - js \ - uriloader \ - exthandler \ - htmlparser \ - view \ - pref \ - locale \ - webbrwsr \ - xpconnect \ - widget \ - shistory \ - intl \ - plugin \ - webshell \ - chardet \ - uconv \ - xuldoc \ - find \ - nkcache \ - composer \ - commandhandler \ - editor \ - windowwatcher \ - imglib2 \ - jar \ - prefetch \ - $(NULL) SDK_XPIDLSRCS = \ nsIGlobalHistory.idl \ diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in index 1776474bc7c4..98139e5fd2f5 100644 --- a/docshell/build/Makefile.in +++ b/docshell/build/Makefile.in @@ -52,32 +52,6 @@ EXPORT_LIBRARY = 1 GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - shistory \ - necko \ - nkcache \ - gfx \ - thebes \ - content \ - layout \ - webshell \ - widget \ - pref \ - intl \ - htmlparser \ - chardet \ - find \ - composer \ - editor \ - commandhandler \ - uriloader \ - exthandler \ - mimetype \ - prefetch \ - imglib2 \ - $(NULL) EXPORTS = \ nsDocShellCID.h \ diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in index 5a6c9a9bd5e2..3659b02bbf2c 100644 --- a/docshell/shistory/src/Makefile.in +++ b/docshell/shistory/src/Makefile.in @@ -48,20 +48,6 @@ LIBRARY_NAME = shistory_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - dom \ - layout \ - docshell \ - pref \ - gfx \ - content \ - widget \ - nkcache \ - editor \ - composer \ - $(NULL) CPPSRCS = nsSHEntry.cpp \ nsSHTransaction.cpp \ diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in index 48ce288f5daa..913438e0592a 100644 --- a/dom/src/events/Makefile.in +++ b/dom/src/events/Makefile.in @@ -46,17 +46,6 @@ MODULE = dom LIBRARY_NAME = jsdomevents_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - js \ - caps \ - xpconnect \ - content \ - widget \ - gfx \ - layout \ - pref \ - $(NULL) CPPSRCS = \ nsJSEventListener.cpp \ diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in index 1477575bbbea..5392ae60c0f6 100644 --- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -48,21 +48,6 @@ LIBXUL_LIBRARY = 1 # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 -REQUIRES = \ - xpcom \ - content \ - layout \ - pref \ - widget \ - string \ - dom \ - js \ - caps \ - xpconnect\ - intl \ - necko \ - windowwatcher \ - $(NULL) CPPSRCS = \ nsGeolocation.cpp \ diff --git a/dom/src/json/Makefile.in b/dom/src/json/Makefile.in index 9d6b38455b29..0cbeeeea8c77 100644 --- a/dom/src/json/Makefile.in +++ b/dom/src/json/Makefile.in @@ -46,17 +46,6 @@ MODULE = dom LIBRARY_NAME = json_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - content \ - js \ - layout \ - necko \ - pref \ - uconv \ - widget \ - xpconnect \ - $(NULL) CPPSRCS = \ nsJSON.cpp \ diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in index 958285f97415..e3074a5a2e58 100644 --- a/dom/src/jsurl/Makefile.in +++ b/dom/src/jsurl/Makefile.in @@ -49,21 +49,6 @@ MODULE_NAME = javascript__protocol GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - js \ - dom \ - layout \ - necko \ - caps \ - widget \ - appshell \ - xpconnect \ - uconv \ - docshell \ - content \ - pref \ - $(NULL) XPIDLSRCS = \ $(NULL) diff --git a/dom/src/offline/Makefile.in b/dom/src/offline/Makefile.in index d30d730cbf07..d6e61253ceab 100644 --- a/dom/src/offline/Makefile.in +++ b/dom/src/offline/Makefile.in @@ -46,23 +46,6 @@ MODULE = dom LIBRARY_NAME = jsdomoffline_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - content \ - caps \ - gfx \ - thebes \ - js \ - layout \ - locale \ - necko \ - nkcache \ - pref \ - prefetch \ - docshell \ - widget \ - xpconnect \ - $(NULL) CPPSRCS = \ nsDOMOfflineResourceList.cpp \ diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index b4de498b4597..1fa613c24911 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -46,22 +46,6 @@ MODULE = dom LIBRARY_NAME = jsdomstorage_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - content \ - caps \ - gfx \ - thebes \ - js \ - layout \ - locale \ - necko \ - pref \ - unicharutil \ - widget \ - xpconnect \ - prefetch \ - $(NULL) ifdef MOZ_STORAGE REQUIRES += storage diff --git a/dom/src/threads/Makefile.in b/dom/src/threads/Makefile.in index 06e18d4a5ee1..95f5632c0b70 100644 --- a/dom/src/threads/Makefile.in +++ b/dom/src/threads/Makefile.in @@ -48,24 +48,6 @@ LIBRARY_NAME = domthreads_s LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -REQUIRES = \ - caps \ - content \ - docshell \ - gfx \ - js \ - layout \ - locale \ - necko \ - plugin \ - pref \ - string \ - thebes \ - uconv \ - widget \ - xpcom \ - xpconnect \ - $(NULL) CPPSRCS = \ nsDOMThreadService.cpp \ diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in index 18bbffc6090a..ad9be4dce2c8 100644 --- a/editor/composer/src/Makefile.in +++ b/editor/composer/src/Makefile.in @@ -49,28 +49,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsComposerModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - unicharutil \ - dom \ - layout \ - content \ - uriloader \ - txmgr \ - necko \ - pref \ - webshell \ - docshell \ - gfx \ - thebes \ - widget \ - xuldoc \ - txtsvc \ - imglib2 \ - commandhandler \ - composer \ - locale \ - $(NULL) CPPSRCS = \ nsComposeTxtSrvFilter.cpp \ diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in index 76b0e84bcd71..15179ef4c1df 100644 --- a/editor/libeditor/base/Makefile.in +++ b/editor/libeditor/base/Makefile.in @@ -50,25 +50,6 @@ MODULE = editor LIBRARY_NAME = editorbase_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - locale \ - layout \ - content \ - txmgr \ - txtsvc \ - htmlparser \ - necko \ - pref \ - view \ - gfx \ - thebes \ - widget \ - unicharutil \ - commandhandler \ - docshell \ - $(NULL) # Internal header files, needed by other editor sublibs: INTERNAL_HDR_DIR = ../internal diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in index 1e96ace580f1..e9e5bfe94f64 100644 --- a/editor/libeditor/html/Makefile.in +++ b/editor/libeditor/html/Makefile.in @@ -50,25 +50,6 @@ MODULE = editor LIBRARY_NAME = htmleditor_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - js \ - layout \ - locale \ - unicharutil \ - content \ - txmgr \ - txtsvc \ - htmlparser \ - necko \ - pref \ - gfx \ - thebes \ - widget \ - view \ - webshell \ - $(NULL) # Building the full blown HTML Editor so add its source files and objects: diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in index 176fef7a1691..2118518c1a37 100644 --- a/editor/libeditor/text/Makefile.in +++ b/editor/libeditor/text/Makefile.in @@ -50,23 +50,6 @@ MODULE = editor LIBRARY_NAME = texteditor_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - locale \ - layout \ - content \ - txmgr \ - txtsvc \ - necko \ - pref \ - lwbrk \ - view \ - gfx \ - thebes \ - widget \ - unicharutil \ - $(NULL) CPPSRCS = \ nsPlaintextDataTransfer.cpp \ diff --git a/editor/txmgr/src/Makefile.in b/editor/txmgr/src/Makefile.in index a139aafe96a5..f08c0a26c6dc 100644 --- a/editor/txmgr/src/Makefile.in +++ b/editor/txmgr/src/Makefile.in @@ -49,9 +49,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsTransactionManagerModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - $(NULL) CPPSRCS = \ nsTransactionItem.cpp \ diff --git a/editor/txmgr/tests/Makefile.in b/editor/txmgr/tests/Makefile.in index a1b8ce0d7333..40bbab92add9 100644 --- a/editor/txmgr/tests/Makefile.in +++ b/editor/txmgr/tests/Makefile.in @@ -43,7 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = txmgr xpcom CPP_UNIT_TESTS = TestTXMgr.cpp diff --git a/editor/txtsvc/src/Makefile.in b/editor/txtsvc/src/Makefile.in index 8bfbfa4f24d6..2cab8d8604d6 100644 --- a/editor/txtsvc/src/Makefile.in +++ b/editor/txtsvc/src/Makefile.in @@ -48,16 +48,6 @@ FORCE_STATIC_LIB = 1 MODULE_NAME = nsTextServicesModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - editor \ - gfx \ - layout \ - content \ - dom \ - widget \ - lwbrk \ - $(NULL) CPPSRCS = \ nsFilteredContentIterator.cpp \ diff --git a/embedding/base/Makefile.in b/embedding/base/Makefile.in index 5da90413914a..0b788490e32d 100644 --- a/embedding/base/Makefile.in +++ b/embedding/base/Makefile.in @@ -49,10 +49,6 @@ XPIDL_MODULE = embed_base include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom \ - intl \ - embedcomponents \ - $(NULL) DEFINES += -DMOZILLA_STRICT_API diff --git a/embedding/base/standalone/Makefile.in b/embedding/base/standalone/Makefile.in index 7be9b3c4aa76..93fa55f86f06 100644 --- a/embedding/base/standalone/Makefile.in +++ b/embedding/base/standalone/Makefile.in @@ -47,10 +47,6 @@ XPIDL_MODULE = embed_base include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom \ - intl \ - embedcomponents \ - $(NULL) DEFINES += -DMOZILLA_STRICT_API -DXPCOM_GLUE diff --git a/embedding/browser/activex/src/common/Makefile.in b/embedding/browser/activex/src/common/Makefile.in index 268a2304e0c9..b5c60bc3d59a 100644 --- a/embedding/browser/activex/src/common/Makefile.in +++ b/embedding/browser/activex/src/common/Makefile.in @@ -47,17 +47,6 @@ MODULE = ax_common LIBRARY_NAME = ax_common_s XPIDL_MODULE = ax_common -REQUIRES = \ - xpcom \ - string \ - dom \ - js \ - widget \ - gfx \ - layout \ - content \ - necko \ - $(NULL) CPPSRCS = \ IEHtmlNode.cpp \ diff --git a/embedding/browser/activex/src/control/Makefile.in b/embedding/browser/activex/src/control/Makefile.in index 9cb9a88f2273..b000d63d68c1 100644 --- a/embedding/browser/activex/src/control/Makefile.in +++ b/embedding/browser/activex/src/control/Makefile.in @@ -48,35 +48,6 @@ RESFILE = MozillaControl.res DEFFILE = L_mozctl.def FORCE_SHARED_LIB= 1 -REQUIRES = \ - xpcom \ - string \ - js \ - widget \ - gfx \ - view \ - necko \ - pref \ - webbrwsr \ - docshell \ - dom \ - uriloader \ - layout \ - content \ - editor \ - webshell \ - profile \ - embed_base \ - necko \ - windowwatcher \ - webbrowserpersist \ - exthandler \ - mimetype \ - composer \ - commandhandler \ - ax_common \ - locale \ - $(NULL) CPPSRCS = \ StdAfx.cpp \ diff --git a/embedding/browser/activex/src/plugin/Makefile.in b/embedding/browser/activex/src/plugin/Makefile.in index 603f18cce526..942bfa693b1e 100644 --- a/embedding/browser/activex/src/plugin/Makefile.in +++ b/embedding/browser/activex/src/plugin/Makefile.in @@ -61,24 +61,6 @@ endif DEFFILE = npmozax.def GRE_MODULE = 1 -REQUIRES = \ - xpcom \ - plugin \ - string \ - dom \ - content \ - layout \ - widget \ - gfx \ - js \ - pref \ - xpconnect \ - docshell \ - webshell \ - necko \ - windowwatcher \ - ax_common \ - $(NULL) ifdef XPC_IDISPATCH_SUPPORT REQUIRES += \ diff --git a/embedding/browser/build/Makefile.in b/embedding/browser/build/Makefile.in index 252c329d4190..542b3efdd03a 100644 --- a/embedding/browser/build/Makefile.in +++ b/embedding/browser/build/Makefile.in @@ -51,20 +51,6 @@ EXPORT_LIBRARY = 1 GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - docshell \ - dom \ - widget \ - gfx \ - content \ - necko \ - uriloader \ - shistory \ - windowwatcher \ - webbrowserpersist \ - embed_base \ - $(NULL) ifeq (,$(filter-out WINCE WINNT,$(OS_ARCH))) EXTRA_DSO_LIBS = gkgfx diff --git a/embedding/browser/gtk/src/Makefile.in b/embedding/browser/gtk/src/Makefile.in index 26eea455377e..80b141af6b08 100644 --- a/embedding/browser/gtk/src/Makefile.in +++ b/embedding/browser/gtk/src/Makefile.in @@ -49,23 +49,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 DEFINES += -DIMPL_XREAPI -REQUIRES = xpcom \ - content \ - string \ - docshell \ - necko \ - widget \ - dom \ - gfx \ - layout \ - uriloader \ - webbrwsr \ - shistory \ - embed_base \ - windowwatcher \ - profdirserviceprovider \ - xulapp \ - $(NULL) ifdef ACCESSIBILITY REQUIRES += accessibility diff --git a/embedding/browser/gtk/tests/Makefile.in b/embedding/browser/gtk/tests/Makefile.in index 797aa1fa1106..9aec4673576d 100644 --- a/embedding/browser/gtk/tests/Makefile.in +++ b/embedding/browser/gtk/tests/Makefile.in @@ -44,9 +44,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = gtkembedmoz -REQUIRES = xpcom \ - dom \ - $(NULL) CPPSRCS = \ TestGtkEmbed.cpp \ diff --git a/embedding/browser/photon/src/Makefile.in b/embedding/browser/photon/src/Makefile.in index 4a1d7136e4d8..666eaf04d684 100644 --- a/embedding/browser/photon/src/Makefile.in +++ b/embedding/browser/photon/src/Makefile.in @@ -46,27 +46,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = phembedmoz LIBRARY_NAME = phembedmoz EXPORT_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - docshell \ - webshell \ - necko \ - widget \ - dom \ - gfx \ - layout \ - content \ - uriloader \ - webbrwsr \ - shistory \ - embed_base \ - pref \ - windowwatcher \ - webbrowserpersist \ - find \ - exthandler \ - profdirserviceprovider \ - $(NULL) CPPSRCS = \ EmbedPrivate.cpp \ diff --git a/embedding/browser/photon/tests/Makefile.in b/embedding/browser/photon/tests/Makefile.in index 3e22bb910bcd..cb41dee9d71f 100644 --- a/embedding/browser/photon/tests/Makefile.in +++ b/embedding/browser/photon/tests/Makefile.in @@ -43,30 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom \ - string \ - docshell \ - webshell \ - necko \ - widget \ - dom \ - gfx \ - layout \ - content \ - uriloader \ - webbrwsr \ - shistory \ - embed_base \ - pref \ - view\ - windowwatcher \ - appshell \ - exthandler \ - mozcomps \ - find \ - appcomps \ - mimetype \ - $(NULL) CPPSRCS = \ TestPhEmbed.cpp diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in index 4fcdd6c80750..744bf3b091fc 100644 --- a/embedding/browser/webBrowser/Makefile.in +++ b/embedding/browser/webBrowser/Makefile.in @@ -49,30 +49,6 @@ LIBRARY_NAME = nsWebBrowser_s GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - docshell \ - widget \ - gfx \ - thebes \ - layout \ - content \ - dom \ - js \ - necko \ - uriloader \ - shistory \ - webshell \ - windowwatcher \ - webbrowserpersist \ - unicharutil \ - imglib2 \ - locale \ - embed_base \ - view \ - caps \ - xpconnect \ - $(NULL) ifdef MOZ_PHOENIX REQUIRES += toolkitcomps diff --git a/embedding/componentlib/Makefile.in b/embedding/componentlib/Makefile.in index 18e5f56afe8d..333812e7283b 100644 --- a/embedding/componentlib/Makefile.in +++ b/embedding/componentlib/Makefile.in @@ -42,8 +42,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom \ - $(NULL) LOCAL_INCLUDES = -I$(srcdir) diff --git a/embedding/components/appstartup/src/Makefile.in b/embedding/components/appstartup/src/Makefile.in index 1407cc1c960e..e07dbf863ecf 100644 --- a/embedding/components/appstartup/src/Makefile.in +++ b/embedding/components/appstartup/src/Makefile.in @@ -46,9 +46,6 @@ MODULE = embedcomponents LIBRARY_NAME = appstartupnotifier_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - $(NULL) CPPSRCS = nsAppStartupNotifier.cpp \ $(NULL) diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in index d9aaec1ac5de..14f26bc16a88 100644 --- a/embedding/components/build/Makefile.in +++ b/embedding/components/build/Makefile.in @@ -56,27 +56,6 @@ ifdef MOZ_PERF_METRICS EXTRA_DSO_LIBS = mozutil_s endif -REQUIRES = js \ - xpcom \ - string \ - windowwatcher \ - webbrwsr \ - gfx \ - widget \ - webbrowserpersist \ - find \ - htmlparser \ - embed_base \ - dom \ - lwbrk \ - mimetype \ - content \ - layout \ - uriloader \ - necko \ - commandhandler \ - xuldoc \ - $(NULL) CPPSRCS = nsEmbeddingModule.cpp diff --git a/embedding/components/commandhandler/src/Makefile.in b/embedding/components/commandhandler/src/Makefile.in index 41039aace059..4de3d801a19a 100644 --- a/embedding/components/commandhandler/src/Makefile.in +++ b/embedding/components/commandhandler/src/Makefile.in @@ -43,16 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = commandhandler -REQUIRES = string \ - xpcom \ - dom \ - content \ - widget \ - xuldoc \ - caps \ - xpconnect \ - js \ - $(NULL) LIBRARY_NAME = commandhandler_s LIBXUL_LIBRARY = 1 diff --git a/embedding/components/find/src/Makefile.in b/embedding/components/find/src/Makefile.in index 7ff8d49ac924..6b785b7112bc 100644 --- a/embedding/components/find/src/Makefile.in +++ b/embedding/components/find/src/Makefile.in @@ -46,25 +46,6 @@ MODULE = find LIBRARY_NAME = find_s LIBXUL_LIBRARY = 1 -REQUIRES = string \ - xpcom \ - dom \ - docshell \ - gfx \ - thebes \ - layout \ - editor \ - locale \ - content \ - widget \ - htmlparser \ - necko \ - unicharutil \ - lwbrk \ - js \ - xpconnect \ - caps \ - $(NULL) CPPSRCS = nsWebBrowserFind.cpp \ nsFind.cpp \ diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in index cd8f8605a88b..b08abb3134f0 100644 --- a/embedding/components/printingui/src/mac/Makefile.in +++ b/embedding/components/printingui/src/mac/Makefile.in @@ -46,16 +46,6 @@ MODULE = embedcomponents LIBRARY_NAME = printingui_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - windowwatcher \ - widget \ - gfx \ - layout \ - uriloader \ - webbrwsr \ - $(NULL) DIRS = printpde diff --git a/embedding/components/printingui/src/os2/Makefile.in b/embedding/components/printingui/src/os2/Makefile.in index f9ca79341fda..37d8cf8b8684 100644 --- a/embedding/components/printingui/src/os2/Makefile.in +++ b/embedding/components/printingui/src/os2/Makefile.in @@ -46,23 +46,6 @@ MODULE = embedcomponents LIBRARY_NAME = printingui_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - windowwatcher \ - widget \ - gfx \ - js \ - xpconnect \ - caps \ - layout \ - necko \ - uriloader \ - docshell \ - webbrwsr \ - embed_base \ - intl \ - $(NULL) CPPSRCS = \ nsPrintingPromptService.cpp \ diff --git a/embedding/components/printingui/src/unixshared/Makefile.in b/embedding/components/printingui/src/unixshared/Makefile.in index b692e0e7c0fc..37d8cf8b8684 100644 --- a/embedding/components/printingui/src/unixshared/Makefile.in +++ b/embedding/components/printingui/src/unixshared/Makefile.in @@ -46,16 +46,6 @@ MODULE = embedcomponents LIBRARY_NAME = printingui_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - windowwatcher \ - widget \ - gfx \ - layout \ - uriloader \ - webbrwsr \ - $(NULL) CPPSRCS = \ nsPrintingPromptService.cpp \ diff --git a/embedding/components/printingui/src/win/Makefile.in b/embedding/components/printingui/src/win/Makefile.in index 195a20fda461..0ee80564af42 100644 --- a/embedding/components/printingui/src/win/Makefile.in +++ b/embedding/components/printingui/src/win/Makefile.in @@ -46,21 +46,6 @@ MODULE = embedcomponents LIBRARY_NAME = printingui_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - content \ - windowwatcher \ - widget \ - gfx \ - xpconnect \ - layout \ - uriloader \ - docshell \ - webbrwsr \ - intl \ - pref \ - $(NULL) CPPSRCS = \ nsPrintingPromptService.cpp \ diff --git a/embedding/components/webbrowserpersist/src/Makefile.in b/embedding/components/webbrowserpersist/src/Makefile.in index 2ec0867d1e7e..beb89045d6d4 100644 --- a/embedding/components/webbrowserpersist/src/Makefile.in +++ b/embedding/components/webbrowserpersist/src/Makefile.in @@ -46,23 +46,6 @@ MODULE = webbrowserpersist LIBRARY_NAME = webbrowserpersist_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - content \ - layout \ - necko \ - widget \ - exthandler \ - uriloader \ - mimetype \ - intl \ - unicharutil \ - docshell \ - shistory \ - imglib2 \ - gfx \ - $(NULL) CPPSRCS = nsWebBrowserPersist.cpp \ $(NULL) diff --git a/embedding/components/windowwatcher/src/Makefile.in b/embedding/components/windowwatcher/src/Makefile.in index eb125cc7873a..eed0b252e96b 100644 --- a/embedding/components/windowwatcher/src/Makefile.in +++ b/embedding/components/windowwatcher/src/Makefile.in @@ -46,26 +46,6 @@ MODULE = embedcomponents LIBRARY_NAME = windowwatcher_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - gfx \ - windowwatcher \ - widget \ - js \ - xpconnect \ - caps \ - content \ - pref \ - necko \ - docshell \ - webbrwsr \ - embed_base \ - intl \ - layout \ - uriloader \ - thebes \ - $(NULL) CPPSRCS = nsPrompt.cpp \ nsWWJSUtils.cpp \ diff --git a/embedding/tests/winEmbed/Makefile.in b/embedding/tests/winEmbed/Makefile.in index ed8ec61f4a4f..5f18fb829fa3 100644 --- a/embedding/tests/winEmbed/Makefile.in +++ b/embedding/tests/winEmbed/Makefile.in @@ -41,23 +41,6 @@ RESFILE = winEmbed.res MODULE = winEmbed -REQUIRES = xpcom \ - string \ - embed_base \ - webbrwsr \ - webshell \ - windowwatcher \ - profile \ - necko \ - docshell \ - dom \ - widget \ - uriloader \ - shistory \ - webbrowserpersist \ - profdirserviceprovider \ - xulapp \ - $(NULL) CPPSRCS = \ winEmbed.cpp \ diff --git a/extensions/access-builtin/accessproxy/Makefile.in b/extensions/access-builtin/accessproxy/Makefile.in index 5b5d297676c8..2f5caff9ef5e 100644 --- a/extensions/access-builtin/accessproxy/Makefile.in +++ b/extensions/access-builtin/accessproxy/Makefile.in @@ -50,19 +50,6 @@ SHORT_LIBNAME = accproxy endif MOZILLA_INTERNAL_API = 1 -REQUIRES = \ - xpcom \ - string \ - docshell \ - dom \ - widget \ - gfx \ - layout \ - content \ - uriloader \ - pref \ - embedcomponents \ - $(NULL) EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsAccessProxy diff --git a/extensions/auth/Makefile.in b/extensions/auth/Makefile.in index ac87d129f31d..7f6c1a6a64b8 100644 --- a/extensions/auth/Makefile.in +++ b/extensions/auth/Makefile.in @@ -54,12 +54,6 @@ EXPORT_LIBRARY = 1 MODULE_NAME = nsAuthModule LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - necko \ - pref \ - $(NULL) CPPSRCS = \ nsAuthFactory.cpp \ diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in index 2b0b9eff18d5..d3b201e338d2 100644 --- a/extensions/cookie/Makefile.in +++ b/extensions/cookie/Makefile.in @@ -50,19 +50,6 @@ MODULE_NAME = nsCookieModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - dom \ - content \ - widget \ - pref \ - windowwatcher \ - docshell \ - appshell \ - caps \ - storage \ - $(NULL) CPPSRCS = \ nsCookieModule.cpp \ diff --git a/extensions/gnomevfs/Makefile.in b/extensions/gnomevfs/Makefile.in index 08f0c06b26dc..a71abe53abaa 100644 --- a/extensions/gnomevfs/Makefile.in +++ b/extensions/gnomevfs/Makefile.in @@ -47,13 +47,6 @@ LIBRARY_NAME = nkgnomevfs SHORT_LIBNAME = nkgnomevfs IS_COMPONENT = 1 -REQUIRES = xpcom \ - string \ - necko \ - intl \ - mimetype \ - pref \ - $(NULL) CPPSRCS = \ nsGnomeVFSProtocolHandler.cpp \ diff --git a/extensions/java/xpcom/glue/Makefile.in b/extensions/java/xpcom/glue/Makefile.in index 4a15b28c0dcb..20c6179d76d3 100644 --- a/extensions/java/xpcom/glue/Makefile.in +++ b/extensions/java/xpcom/glue/Makefile.in @@ -57,9 +57,6 @@ CPPSRCS = nsJavaXPCOMGlue.cpp DEFINES += -DXPCOM_GLUE -REQUIRES += \ - xpcom \ - $(NULL) LOCAL_INCLUDES = -I$(JAVA_INCLUDE_PATH) diff --git a/extensions/java/xpcom/src/Makefile.in b/extensions/java/xpcom/src/Makefile.in index a03b09405d3d..838ed9851a63 100644 --- a/extensions/java/xpcom/src/Makefile.in +++ b/extensions/java/xpcom/src/Makefile.in @@ -50,10 +50,6 @@ ifndef MOZ_ENABLE_LIBXUL DEFINES += -DIMPL_XREAPI endif -REQUIRES = xpcom \ - string \ - xulapp \ - $(NULL) CPPSRCS = \ nsAppFileLocProviderProxy.cpp \ diff --git a/extensions/java/xpcom/tools/genifaces/Makefile.in b/extensions/java/xpcom/tools/genifaces/Makefile.in index bda4937931ef..295a6ff03425 100644 --- a/extensions/java/xpcom/tools/genifaces/Makefile.in +++ b/extensions/java/xpcom/tools/genifaces/Makefile.in @@ -44,11 +44,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = javaxpcom -REQUIRES = \ - xpcom \ - string \ - necko \ - $(NULL) CPPSRCS = GenerateJavaInterfaces.cpp diff --git a/extensions/java/xpcom/tools/xpidl/Makefile.in b/extensions/java/xpcom/tools/xpidl/Makefile.in index 987d6f189501..3d68b7256300 100644 --- a/extensions/java/xpcom/tools/xpidl/Makefile.in +++ b/extensions/java/xpcom/tools/xpidl/Makefile.in @@ -46,9 +46,6 @@ MODULE = javaxpcom PROGRAM = java_xpidl$(BIN_SUFFIX) INTERNAL_TOOLS = 1 -REQUIRES = \ - xpcom \ - $(NULL) # glib and libIDL link against the non-debug msvcrt MOZ_NO_DEBUG_RTL=1 diff --git a/extensions/jssh/Makefile.in b/extensions/jssh/Makefile.in index 48249072cde0..5201c81eeaf7 100644 --- a/extensions/jssh/Makefile.in +++ b/extensions/jssh/Makefile.in @@ -12,15 +12,6 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsJSShModule -REQUIRES = \ - xpcom \ - js \ - xpconnect \ - string \ - necko \ - caps \ - dom \ - $(NULL) CPPSRCS = \ nsJSShServer.cpp \ diff --git a/extensions/layout-debug/src/Makefile.in b/extensions/layout-debug/src/Makefile.in index 54e967a5cf7e..661118b388de 100644 --- a/extensions/layout-debug/src/Makefile.in +++ b/extensions/layout-debug/src/Makefile.in @@ -49,22 +49,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsLayoutDebugModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - windowwatcher \ - docshell \ - dom \ - gfx \ - thebes \ - content \ - necko \ - layout \ - widget \ - locale \ - view \ - pref \ - toolkitcomps \ - $(NULL) XPIDLSRCS = \ nsILayoutRegressionTester.idl \ diff --git a/extensions/metrics/build/Makefile.in b/extensions/metrics/build/Makefile.in index 175964210496..aa5b45e36e87 100644 --- a/extensions/metrics/build/Makefile.in +++ b/extensions/metrics/build/Makefile.in @@ -49,11 +49,6 @@ SHORT_LIBNAME = metrics XPI_NAME = metrics -REQUIRES = \ - xpcom \ - necko \ - content \ - $(NULL) CPPSRCS = \ nsMetricsModule.cpp \ diff --git a/extensions/metrics/src/Makefile.in b/extensions/metrics/src/Makefile.in index 3d7f59edaa84..ca17f58884df 100644 --- a/extensions/metrics/src/Makefile.in +++ b/extensions/metrics/src/Makefile.in @@ -48,26 +48,6 @@ SHORT_LIBNAME = metrics_s XPI_NAME = metrics -REQUIRES = xpcom \ - string \ - necko \ - pref \ - uriloader \ - dom \ - docshell \ - layout \ - widget \ - $(BZ2_REQUIRES) \ - xulapp \ - extensions \ - rdf \ - plugin \ - content \ - autocomplete \ - places \ - toolkitcomps \ - locale \ - $(NULL) CSRCS = \ md5.c \ diff --git a/extensions/metrics/test/Makefile.in b/extensions/metrics/test/Makefile.in index 308db03daa6b..c6eda07b6bef 100644 --- a/extensions/metrics/test/Makefile.in +++ b/extensions/metrics/test/Makefile.in @@ -43,13 +43,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_metrics -REQUIRES = \ - xpcom \ - metrics \ - necko \ - dom \ - content \ - $(NULL) CPPSRCS = \ TestMetricsConfig.cpp \ diff --git a/extensions/permissions/Makefile.in b/extensions/permissions/Makefile.in index 27990c27a195..120feef74f9f 100644 --- a/extensions/permissions/Makefile.in +++ b/extensions/permissions/Makefile.in @@ -49,19 +49,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsPermissionsModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - dom \ - widget \ - content \ - layout \ - pref \ - docshell \ - caps \ - xpconnect \ - js \ - $(NULL) CPPSRCS = \ nsModuleFactory.cpp \ diff --git a/extensions/pref/autoconfig/src/Makefile.in b/extensions/pref/autoconfig/src/Makefile.in index 9396c6febdfd..35f94f843547 100644 --- a/extensions/pref/autoconfig/src/Makefile.in +++ b/extensions/pref/autoconfig/src/Makefile.in @@ -53,18 +53,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsAutoConfigModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - intl \ - js \ - xpconnect \ - necko \ - profile \ - pref \ - appcomps \ - embedcomponents \ - windowwatcher \ - $(NULL) include $(topsrcdir)/config/config.mk diff --git a/extensions/pref/system-pref/src/Makefile.in b/extensions/pref/system-pref/src/Makefile.in index 76c7ceceee91..ff9087b09faf 100644 --- a/extensions/pref/system-pref/src/Makefile.in +++ b/extensions/pref/system-pref/src/Makefile.in @@ -52,11 +52,6 @@ endif FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - embedcomponents \ - pref \ - $(NULL) ifdef MOZ_ENABLE_GTK2 DIRS = gconf diff --git a/extensions/pref/system-pref/src/gconf/Makefile.in b/extensions/pref/system-pref/src/gconf/Makefile.in index 44810c6f81ac..4bc7d7501e91 100644 --- a/extensions/pref/system-pref/src/gconf/Makefile.in +++ b/extensions/pref/system-pref/src/gconf/Makefile.in @@ -46,11 +46,6 @@ MODULE = system-pref LIBRARY_NAME = system-pref LIBXUL_LIBRARY = 1 -REQUIRES = pref \ - string \ - xpcom \ - embedcomponents \ - $(NULL) CPPSRCS = \ nsSystemPrefService.cpp \ diff --git a/extensions/spellcheck/hunspell/src/Makefile.in b/extensions/spellcheck/hunspell/src/Makefile.in index 32cb8bf6bb4c..a6239d646778 100644 --- a/extensions/spellcheck/hunspell/src/Makefile.in +++ b/extensions/spellcheck/hunspell/src/Makefile.in @@ -45,13 +45,6 @@ LIBRARY_NAME = hunspell_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - unicharutil \ - spellchecker \ - xulapp \ - $(NULL) CPPSRCS = mozHunspell.cpp \ mozHunspellDirProvider.cpp \ diff --git a/extensions/spellcheck/osxspell/src/Makefile.in b/extensions/spellcheck/osxspell/src/Makefile.in index 466e2bcabac0..e5ddd7af6662 100644 --- a/extensions/spellcheck/osxspell/src/Makefile.in +++ b/extensions/spellcheck/osxspell/src/Makefile.in @@ -45,10 +45,6 @@ LIBRARY_NAME = osxspell_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - spellchecker \ - $(NULL) CMMSRCS = \ mozOSXSpell.mm \ diff --git a/extensions/spellcheck/src/Makefile.in b/extensions/spellcheck/src/Makefile.in index 65404f5d384f..506ee67c6712 100644 --- a/extensions/spellcheck/src/Makefile.in +++ b/extensions/spellcheck/src/Makefile.in @@ -50,20 +50,6 @@ EXPORT_LIBRARY = 1 IS_COMPONENT = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - editor \ - content \ - gfx \ - layout \ - dom \ - necko \ - widget \ - pref \ - txtsvc \ - uconv \ - unicharutil \ - $(NULL) CPPSRCS = \ mozSpellCheckerFactory.cpp \ diff --git a/extensions/universalchardet/src/xpcom/Makefile.in b/extensions/universalchardet/src/xpcom/Makefile.in index 73ac7c07da6d..c82d796dc7aa 100644 --- a/extensions/universalchardet/src/xpcom/Makefile.in +++ b/extensions/universalchardet/src/xpcom/Makefile.in @@ -55,11 +55,6 @@ SHORT_LIBNAME = ucdet endif LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - chardet \ - $(NULL) CPPSRCS = \ nsUniversalCharDetModule.cpp \ diff --git a/extensions/widgetutils/src/Makefile.in b/extensions/widgetutils/src/Makefile.in index 8b4890622765..a3d7d796c8b8 100644 --- a/extensions/widgetutils/src/Makefile.in +++ b/extensions/widgetutils/src/Makefile.in @@ -51,24 +51,6 @@ endif FORCE_SHARED_LIB = 1 IS_COMPONENT = 1 -REQUIRES = \ - dom \ - layout \ - content \ - widget \ - necko \ - windowwatcher \ - xpcom \ - string \ - pref \ - gfx \ - locale \ - docshell \ - uriloader \ - webbrwsr \ - imglib2 \ - view \ - $(NULL) CPPSRCS = nsWidgetUtils.cpp diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in index 7d42c034593c..11227261ae77 100644 --- a/gfx/cairo/cairo/src/Makefile.in +++ b/gfx/cairo/cairo/src/Makefile.in @@ -66,10 +66,6 @@ MODULE_OPTIMIZE_FLAGS = -O2 endif endif -REQUIRES = $(PNG_REQUIRES) \ - $(ZLIB_REQUIRES) \ - libpixman \ - $(NULL) CSRCS = \ cairo.c \ diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in index ccf42bad30b8..48b65b183eaf 100644 --- a/gfx/src/Makefile.in +++ b/gfx/src/Makefile.in @@ -48,16 +48,6 @@ EXPORT_LIBRARY = 1 GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - widget \ - locale \ - view \ - unicharutil \ - thebes \ - js \ - xpconnect \ - $(NULL) DIRS = thebes diff --git a/gfx/src/psshared/Makefile.in b/gfx/src/psshared/Makefile.in index 468dfbdbba6a..990b98f3aff2 100644 --- a/gfx/src/psshared/Makefile.in +++ b/gfx/src/psshared/Makefile.in @@ -46,12 +46,6 @@ MODULE = gfx LIBRARY_NAME = gfxpsshar EXPORT_LIBRARY = 1 GRE_MODULE = 1 -REQUIRES = pref \ - string \ - widget \ - xpcom \ - thebes \ - $(NULL) LIBXUL_LIBRARY = 1 EXPORTS = nsCUPSShim.h \ diff --git a/gfx/src/thebes/Makefile.in b/gfx/src/thebes/Makefile.in index df5629a1a771..4de86e1e5d80 100644 --- a/gfx/src/thebes/Makefile.in +++ b/gfx/src/thebes/Makefile.in @@ -53,18 +53,6 @@ MODULE_NAME = nsGfxModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - thebes \ - widget \ - locale \ - view \ - pref \ - unicharutil \ - imglib2 \ - $(ZLIB_REQUIRES) \ - qcms \ - $(NULL) ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT))) REQUIRES += uconv diff --git a/gfx/tests/Makefile.in b/gfx/tests/Makefile.in index 0c9e5416c1a0..2687498a0aa0 100644 --- a/gfx/tests/Makefile.in +++ b/gfx/tests/Makefile.in @@ -46,10 +46,6 @@ MODULE = gfx MOZILLA_INTERNAL_API = 1 -REQUIRES = xpcom \ - string \ - gfx \ - $(NULL) CPP_UNIT_TESTS = \ TestColorNames.cpp \ diff --git a/gfx/thebes/public/Makefile.in b/gfx/thebes/public/Makefile.in index 318fd2802bd0..0a598a4997ee 100644 --- a/gfx/thebes/public/Makefile.in +++ b/gfx/thebes/public/Makefile.in @@ -8,9 +8,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = thebes -REQUIRES = cairo \ - unicharutil \ - $(NULL) EXPORTS = gfxASurface.h \ gfxAlphaRecovery.h \ diff --git a/gfx/thebes/src/Makefile.in b/gfx/thebes/src/Makefile.in index 3913a99cb24d..00eceaa23fb4 100644 --- a/gfx/thebes/src/Makefile.in +++ b/gfx/thebes/src/Makefile.in @@ -11,16 +11,6 @@ LIBRARY_NAME = thebes LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -REQUIRES = \ - cairo \ - string \ - pref \ - xpcom \ - unicharutil \ - uconv \ - $(LCMS_REQUIRES) \ - qcms \ - $(NULL) CPPSRCS = \ gfxASurface.cpp \ diff --git a/gfx/thebes/test/Makefile.in b/gfx/thebes/test/Makefile.in index c46626724a76..4f0683ecd25c 100644 --- a/gfx/thebes/test/Makefile.in +++ b/gfx/thebes/test/Makefile.in @@ -45,17 +45,6 @@ MOZILLA_INTERNAL_API = 1 include $(DEPTH)/config/autoconf.mk -REQUIRES = \ - xpcom \ - string \ - thebes \ - cairo \ - pref \ - necko \ - unicharutil \ - nspr \ - qcms \ - $(NULL) # All platforms CPPSRCS = \ diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in index 6e7757900a8d..6575340c7e0a 100644 --- a/intl/build/Makefile.in +++ b/intl/build/Makefile.in @@ -49,14 +49,6 @@ MODULE_NAME = nsI18nModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - unicharutil \ - uconv \ - lwbrk \ - intl \ - locale \ - $(NULL) CPPSRCS = \ nsI18nModule.cpp \ diff --git a/intl/chardet/src/Makefile.in b/intl/chardet/src/Makefile.in index b084cfdb334e..3d53970a0dd2 100644 --- a/intl/chardet/src/Makefile.in +++ b/intl/chardet/src/Makefile.in @@ -50,18 +50,6 @@ MODULE_NAME = nsChardetModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - unicharutil \ - webshell \ - htmlparser \ - necko \ - widget \ - content \ - layout \ - dom \ - $(NULL) CPPSRCS = \ nsObserverBase.cpp \ diff --git a/intl/chardet/tests/Makefile.in b/intl/chardet/tests/Makefile.in index 1bef6266247b..b57bd0f184cf 100644 --- a/intl/chardet/tests/Makefile.in +++ b/intl/chardet/tests/Makefile.in @@ -42,9 +42,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom \ - chardet \ - $(NULL) PROGRAM = DetectCharset$(BIN_SUFFIX) diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in index a404697b135b..46219ab3eb6f 100644 --- a/intl/locale/src/Makefile.in +++ b/intl/locale/src/Makefile.in @@ -46,12 +46,6 @@ MODULE = locale LIBRARY_NAME = nslocale_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - unicharutil \ - intl \ - $(NULL) ifneq (,$(filter mac os2 windows, $(MOZ_WIDGET_TOOLKIT))) DIRS = $(MOZ_WIDGET_TOOLKIT) diff --git a/intl/locale/src/mac/Makefile.in b/intl/locale/src/mac/Makefile.in index 404760d0608d..54bb6ac47ba7 100644 --- a/intl/locale/src/mac/Makefile.in +++ b/intl/locale/src/mac/Makefile.in @@ -47,11 +47,6 @@ LIBRARY_NAME = platlocale_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - unicharutil \ - uconv \ - $(NULL) CPPSRCS = \ nsCollationMacUC.cpp \ diff --git a/intl/locale/src/os2/Makefile.in b/intl/locale/src/os2/Makefile.in index 543890ed3347..519fadbc8a48 100644 --- a/intl/locale/src/os2/Makefile.in +++ b/intl/locale/src/os2/Makefile.in @@ -48,13 +48,6 @@ EXPORT_LIBRARY = 1 FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - unicharutil \ - pref \ - uconv \ - intl \ - $(NULL) CPPSRCS = \ nsOS2Locale.cpp \ diff --git a/intl/locale/src/unix/Makefile.in b/intl/locale/src/unix/Makefile.in index a2fb5de4ff6c..9e2485c92c9c 100644 --- a/intl/locale/src/unix/Makefile.in +++ b/intl/locale/src/unix/Makefile.in @@ -47,12 +47,6 @@ LIBRARY_NAME = platlocale_s FORCE_STATIC_LIB= 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - unicharutil \ - pref \ - uconv \ - $(NULL) CPPSRCS = \ nsCollationUnix.cpp \ diff --git a/intl/locale/src/windows/Makefile.in b/intl/locale/src/windows/Makefile.in index 7a2534d96eac..975ca019f2b4 100644 --- a/intl/locale/src/windows/Makefile.in +++ b/intl/locale/src/windows/Makefile.in @@ -47,12 +47,6 @@ LIBRARY_NAME = platlocale_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - unicharutil \ - uconv \ - intl \ - $(NULL) CPPSRCS = \ nsCollationWin.cpp \ diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in index 97a15c9df798..871a958639ef 100644 --- a/intl/lwbrk/src/Makefile.in +++ b/intl/lwbrk/src/Makefile.in @@ -47,10 +47,6 @@ LIBRARY_NAME = lwbrk_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - unicharutil \ - $(NULL) CPPSRCS = \ nsJISx4501LineBreaker.cpp \ diff --git a/intl/lwbrk/tests/Makefile.in b/intl/lwbrk/tests/Makefile.in index d51f11541596..d304f60dc51a 100644 --- a/intl/lwbrk/tests/Makefile.in +++ b/intl/lwbrk/tests/Makefile.in @@ -44,9 +44,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = TestLineBreak$(BIN_SUFFIX) -REQUIRES = xpcom \ - string \ - $(NULL) CPPSRCS = TestLineBreak.cpp diff --git a/intl/strres/src/Makefile.in b/intl/strres/src/Makefile.in index 30a7502ad4ce..dd01f04519e8 100644 --- a/intl/strres/src/Makefile.in +++ b/intl/strres/src/Makefile.in @@ -47,10 +47,6 @@ LIBRARY_NAME = strres_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - $(NULL) CPPSRCS = \ nsStringBundle.cpp \ diff --git a/intl/uconv/native/Makefile.in b/intl/uconv/native/Makefile.in index c48072ef1a46..0abf159ce607 100644 --- a/intl/uconv/native/Makefile.in +++ b/intl/uconv/native/Makefile.in @@ -48,11 +48,6 @@ LIBRARY_NAME = ucnative_s FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - intl \ - $(NULL) ifeq ($(MOZ_WIDGET_TOOLKIT),windows) CPPSRCS = nsWinCEUConvService.cpp diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in index 6c5763351b07..c5803fd96a4d 100644 --- a/intl/uconv/src/Makefile.in +++ b/intl/uconv/src/Makefile.in @@ -54,13 +54,6 @@ ifneq ($(OS_ARCH),WINNT) SHORT_LIBNAME = mozuconv endif -REQUIRES = xpcom \ - string \ - intl \ - locale \ - unicharutil \ - necko \ - $(NULL) CPPSRCS = \ nsUConvModule.cpp \ diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in index 97c3d959a295..e16a9c83b753 100644 --- a/intl/uconv/ucvcn/Makefile.in +++ b/intl/uconv/ucvcn/Makefile.in @@ -47,11 +47,6 @@ LIBRARY_NAME = ucvcn_s FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - unicharutil \ - uconv \ - $(NULL) CPPSRCS = \ nsGB2312ToUnicodeV2.cpp \ diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in index 8ad48f511502..46ec02479263 100644 --- a/intl/uconv/ucvibm/Makefile.in +++ b/intl/uconv/ucvibm/Makefile.in @@ -48,9 +48,6 @@ LIBRARY_NAME = ucvibm_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - uconv \ - $(NULL) CPPSRCS = \ nsCP850ToUnicode.cpp \ diff --git a/intl/uconv/ucvja/Makefile.in b/intl/uconv/ucvja/Makefile.in index a9e41ccef3a1..07cb3378e812 100644 --- a/intl/uconv/ucvja/Makefile.in +++ b/intl/uconv/ucvja/Makefile.in @@ -48,11 +48,6 @@ LIBRARY_NAME = ucvja_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - pref \ - $(NULL) CPPSRCS = \ nsJapaneseToUnicode.cpp \ diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in index a4cb2efc00f9..0e7a72a9cd95 100644 --- a/intl/uconv/ucvko/Makefile.in +++ b/intl/uconv/ucvko/Makefile.in @@ -47,10 +47,6 @@ LIBRARY_NAME = ucvko_s FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - $(NULL) CPPSRCS = \ nsEUCKRToUnicode.cpp \ diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in index eb7a74048b00..a0a9614a22c1 100644 --- a/intl/uconv/ucvlatin/Makefile.in +++ b/intl/uconv/ucvlatin/Makefile.in @@ -47,10 +47,6 @@ LIBRARY_NAME = ucvlatin_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - $(NULL) CPPSRCS = \ nsAsciiToUnicode.cpp \ diff --git a/intl/uconv/ucvmath/Makefile.in b/intl/uconv/ucvmath/Makefile.in index f28d599404ca..0d06a5811e82 100644 --- a/intl/uconv/ucvmath/Makefile.in +++ b/intl/uconv/ucvmath/Makefile.in @@ -51,10 +51,6 @@ MODULE_NAME = nsUCvMathModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - $(NULL) LOCAL_INCLUDES = -I$(srcdir)/../util diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in index 1ee3686ee6b8..eb20a17cd14e 100644 --- a/intl/uconv/ucvtw/Makefile.in +++ b/intl/uconv/ucvtw/Makefile.in @@ -47,9 +47,6 @@ LIBRARY_NAME = ucvtw_s FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - uconv \ - $(NULL) CPPSRCS = \ nsBIG5ToUnicode.cpp \ diff --git a/intl/uconv/ucvtw2/Makefile.in b/intl/uconv/ucvtw2/Makefile.in index 44d02df448c3..d1792236db0b 100644 --- a/intl/uconv/ucvtw2/Makefile.in +++ b/intl/uconv/ucvtw2/Makefile.in @@ -47,9 +47,6 @@ LIBRARY_NAME = ucvtw2_s FORCE_STATIC_LIB=1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - uconv \ - $(NULL) CPPSRCS = \ nsEUCTWToUnicode.cpp \ diff --git a/intl/uconv/util/Makefile.in b/intl/uconv/util/Makefile.in index d603b67a3540..276648b06139 100644 --- a/intl/uconv/util/Makefile.in +++ b/intl/uconv/util/Makefile.in @@ -49,8 +49,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 MODULE_NAME = nsUCUtil -REQUIRES = xpcom \ - $(NULL) CSRCS = \ ugen.c \ diff --git a/intl/unicharutil/src/Makefile.in b/intl/unicharutil/src/Makefile.in index 79c63479a68b..5b9a08e15748 100644 --- a/intl/unicharutil/src/Makefile.in +++ b/intl/unicharutil/src/Makefile.in @@ -47,11 +47,6 @@ LIBRARY_NAME = ucharucomp_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - intl \ - $(NULL) CPPSRCS = \ nsCaseConversionImp2.cpp \ diff --git a/intl/unicharutil/tests/Makefile.in b/intl/unicharutil/tests/Makefile.in index e4fef084b649..7d9ef8247267 100644 --- a/intl/unicharutil/tests/Makefile.in +++ b/intl/unicharutil/tests/Makefile.in @@ -45,12 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_intl_unicharutil XPCSHELL_TESTS = unit -REQUIRES = xpcom \ - string \ - unicharutil \ - necko \ - uconv \ - $(NULL) CPPSRCS = UnicharSelfTest.cpp \ NormalizationTest.cpp \ diff --git a/intl/unicharutil/util/Makefile.in b/intl/unicharutil/util/Makefile.in index ea77ad20ded0..4cf64502f994 100644 --- a/intl/unicharutil/util/Makefile.in +++ b/intl/unicharutil/util/Makefile.in @@ -55,9 +55,6 @@ LIBRARY_NAME=unicharutil_external_s DIST_INSTALL = 1 SDK_LIBRARY = $(LIBRARY) -REQUIRES=xpcom \ - string \ - $(NULL) SDK_HEADERS = \ nsUnicharUtils.h \ diff --git a/intl/unicharutil/util/internal/Makefile.in b/intl/unicharutil/util/internal/Makefile.in index b4492387c023..167cbb2c6495 100644 --- a/intl/unicharutil/util/internal/Makefile.in +++ b/intl/unicharutil/util/internal/Makefile.in @@ -59,10 +59,6 @@ EXTRA_DEPS += $(srcdir)/../objs.mk LOCAL_INCLUDES += -I$(srcdir)/.. \ -REQUIRES=xpcom \ - string \ - uconv \ - $(NULL) CPPSRCS = $(INTL_UNICHARUTIL_UTIL_LCPPSRCS) diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in index 0c6d1f96dee0..3257106245b5 100644 --- a/js/jsd/Makefile.in +++ b/js/jsd/Makefile.in @@ -53,7 +53,6 @@ LIBRARY_NAME = jsd$(MOZ_BITS)$(VERSION_NUMBER) endif # REQUIRES = java js -REQUIRES = js ifndef JSD_STANDALONE REQUIRES += \ diff --git a/js/src/xpconnect/loader/Makefile.in b/js/src/xpconnect/loader/Makefile.in index 3b6837c78003..6af114d0fb77 100644 --- a/js/src/xpconnect/loader/Makefile.in +++ b/js/src/xpconnect/loader/Makefile.in @@ -46,13 +46,6 @@ LIBRARY_NAME = jsloader_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - xpconnect \ - js \ - caps \ - necko \ - $(NULL) CPPSRCS = mozJSComponentLoader.cpp mozJSSubScriptLoader.cpp diff --git a/js/src/xpconnect/sample/Makefile.in b/js/src/xpconnect/sample/Makefile.in index 3e533d51d362..e01ac8d11772 100644 --- a/js/src/xpconnect/sample/Makefile.in +++ b/js/src/xpconnect/sample/Makefile.in @@ -49,10 +49,6 @@ IS_COMPONENT = 1 MODULE_NAME = xpconnect_sample MOZILLA_INTERNAL_API = 1 -REQUIRES = XPCOM \ - XPCONNECT \ - JS \ - $(NULL) XPIDLSRCS = \ xpcsample1.idl \ diff --git a/js/src/xpconnect/shell/Makefile.in b/js/src/xpconnect/shell/Makefile.in index 10d74118ced7..928f395ea128 100644 --- a/js/src/xpconnect/shell/Makefile.in +++ b/js/src/xpconnect/shell/Makefile.in @@ -46,12 +46,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcshell PROGRAM = xpcshell$(BIN_SUFFIX) -REQUIRES = xpconnect \ - xpcom \ - js \ - caps \ - xulapp \ - $(NULL) CPPSRCS = xpcshell.cpp diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in index 030bc6477cdd..92cb536b19cd 100644 --- a/js/src/xpconnect/src/Makefile.in +++ b/js/src/xpconnect/src/Makefile.in @@ -57,25 +57,9 @@ SHORT_LIBNAME = xpc$(MOZ_BITS)$(VERSION_NUMBER) endif LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - js \ - caps \ - necko \ - dom \ - $(NULL) # These modules are required because the auto-generated file # dom_quickstubs.cpp #includes header files from many places. -REQUIRES += content \ - editor \ - layout \ - rdf \ - svg \ - xuldoc \ - xultmpl \ - widget \ - $(NULL) CPPSRCS = \ diff --git a/js/src/xpconnect/tests/Makefile.in b/js/src/xpconnect/tests/Makefile.in index 8099956970e4..e8079feea72d 100644 --- a/js/src/xpconnect/tests/Makefile.in +++ b/js/src/xpconnect/tests/Makefile.in @@ -46,12 +46,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = TestXPC SIMPLE_PROGRAMS = TestXPC$(BIN_SUFFIX) -REQUIRES = xpconnect \ - xpcom \ - string \ - js \ - xpconnect_tests \ - $(NULL) DIRS = idl mochitest chrome diff --git a/js/src/xpconnect/tests/components/Makefile.in b/js/src/xpconnect/tests/components/Makefile.in index 31b96a0cf174..fc219f95f8a9 100644 --- a/js/src/xpconnect/tests/components/Makefile.in +++ b/js/src/xpconnect/tests/components/Makefile.in @@ -51,12 +51,6 @@ IS_COMPONENT = 1 MODULE_NAME = xpconnect_test MOZILLA_INTERNAL_API = 1 -REQUIRES = xpconnect \ - xpcom \ - string \ - js \ - xpconnect_tests \ - $(NULL) CPPSRCS = \ xpctest_array.cpp \ diff --git a/js/src/xpconnect/tools/src/Makefile.in b/js/src/xpconnect/tools/src/Makefile.in index 0091ce8bc13f..e494d82c595e 100644 --- a/js/src/xpconnect/tools/src/Makefile.in +++ b/js/src/xpconnect/tools/src/Makefile.in @@ -47,11 +47,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpctools LIBRARY_NAME = xpctools -REQUIRES = xpcom \ - xpconnect \ - js \ - string \ - $(NULL) MODULE_NAME = xpctools IS_COMPONENT = 1 FORCE_SHARED_LIB = 1 diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index f6591abba265..9b481afb7c9d 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -52,34 +52,6 @@ GRE_MODULE = 1 LIBRARY_NAME = gkbase_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - content \ - xuldoc \ - gfx \ - widget \ - view \ - necko \ - docshell \ - webshell \ - webbrwsr \ - uriloader \ - js \ - xpconnect \ - plugin \ - locale \ - pref \ - imglib2 \ - unicharutil \ - htmlparser \ - util \ - windowwatcher \ - shistory \ - caps \ - thebes \ - qcms \ - $(NULL) ifdef ACCESSIBILITY REQUIRES += accessibility diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index a44772eb0735..00961ba640ae 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -63,39 +63,6 @@ EXTRA_DSO_LIBS = gkgfx endif EXTRA_DSO_LIBS += thebes -REQUIRES = xpcom \ - string \ - content \ - gfx \ - widget \ - view \ - locale \ - necko \ - dom \ - storage \ - editor \ - txmgr \ - webshell \ - docshell \ - htmlparser \ - js \ - xpconnect \ - caps \ - rdf \ - xuldoc \ - imglib2 \ - pref \ - unicharutil \ - xultmpl \ - lwbrk \ - plugin \ - commandhandler \ - webbrwsr \ - uconv \ - txtsvc \ - thebes \ - html5 \ - $(NULL) CPPSRCS = \ nsLayoutModule.cpp \ diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index b4ad88dca8f4..67fe82d1f264 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -52,29 +52,6 @@ MODULE = layout LIBRARY_NAME = gkforms_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - locale \ - content \ - gfx \ - thebes \ - widget \ - view \ - dom \ - necko \ - webshell \ - editor \ - uconv \ - txmgr \ - xuldoc \ - imglib2 \ - unicharutil \ - commandhandler \ - xpconnect \ - js \ - pref \ - docshell \ - $(NULL) ifdef ACCESSIBILITY REQUIRES += accessibility diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index 3e180233cedc..34b886d030d3 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -49,33 +49,6 @@ MODULE = layout LIBRARY_NAME = gkgeneric_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - content \ - thebes \ - gfx \ - widget \ - locale \ - view \ - necko \ - js \ - caps \ - pref \ - htmlparser \ - webshell \ - plugin \ - docshell \ - webbrwsr \ - unicharutil \ - lwbrk \ - imglib2 \ - xpconnect \ - java \ - intl \ - thebes \ - cairo \ - $(NULL) ifdef ACCESSIBILITY REQUIRES += accessibility diff --git a/layout/html/tests/Makefile.in b/layout/html/tests/Makefile.in index eb9ad00f16df..5d566fc57b3e 100644 --- a/layout/html/tests/Makefile.in +++ b/layout/html/tests/Makefile.in @@ -44,17 +44,6 @@ include $(DEPTH)/config/autoconf.mk MOZILLA_INTERNAL_API = 1 -REQUIRES = xpcom \ - string \ - necko \ - content \ - layout \ - gfx \ - thebes \ - widget \ - locale \ - dom \ - $(NULL) SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in index 6c3c41227ed8..6dc800129947 100644 --- a/layout/inspector/src/Makefile.in +++ b/layout/inspector/src/Makefile.in @@ -46,19 +46,6 @@ MODULE = inspector LIBRARY_NAME = inspector_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - gfx \ - thebes \ - layout \ - content \ - widget \ - locale \ - necko \ - docshell \ - webshell \ - $(NULL) ifdef ACCESSIBILITY REQUIRES += accessibility diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in index 97d624914344..f2b11b5e7182 100644 --- a/layout/mathml/Makefile.in +++ b/layout/mathml/Makefile.in @@ -48,24 +48,6 @@ MODULE = layout LIBRARY_NAME = gkmathml_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - content \ - gfx \ - thebes \ - widget \ - view \ - webshell \ - locale \ - unicharutil \ - necko \ - docshell \ - webbrwsr \ - pref \ - js \ - qcms \ - $(NULL) LOCAL_INCLUDES = \ -I$(srcdir)/../style \ diff --git a/layout/printing/Makefile.in b/layout/printing/Makefile.in index a0bf255b74bb..25ac9f9cae1a 100644 --- a/layout/printing/Makefile.in +++ b/layout/printing/Makefile.in @@ -47,27 +47,6 @@ GRE_MODULE = 1 LIBRARY_NAME = gkprinting_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - content \ - dom \ - widget \ - gfx \ - thebes \ - view \ - necko \ - webshell \ - docshell \ - uriloader \ - webbrwsr \ - locale \ - intl \ - imglib2 \ - windowwatcher \ - htmlparser \ - js \ - pref \ - $(NULL) XPIDLSRCS = \ nsIPrintProgress.idl \ diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in index cf7842e37136..69e2f7a4489f 100644 --- a/layout/style/Makefile.in +++ b/layout/style/Makefile.in @@ -51,29 +51,6 @@ MODULE = layout LIBRARY_NAME = gkstyle_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - content \ - gfx \ - thebes \ - widget \ - caps \ - locale \ - unicharutil \ - js \ - necko \ - mimetype \ - webshell \ - uconv \ - xuldoc \ - xpconnect \ - view \ - intl \ - pref \ - imglib2 \ - docshell \ - $(NULL) EXPORTS = \ nsCSSAnonBoxList.h \ diff --git a/layout/svg/base/src/Makefile.in b/layout/svg/base/src/Makefile.in index 716eb3593681..b218513ea8fc 100644 --- a/layout/svg/base/src/Makefile.in +++ b/layout/svg/base/src/Makefile.in @@ -46,25 +46,6 @@ MODULE = layout LIBRARY_NAME = gksvgbase_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - content \ - gfx \ - widget \ - dom \ - locale \ - view \ - pref \ - necko \ - unicharutil \ - webshell \ - imglib2 \ - js \ - xpconnect \ - docshell \ - thebes \ - qcms \ - $(NULL) CPPSRCS = \ nsSVGAFrame.cpp \ diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in index 6e87a58c1c09..e1917e5224d3 100644 --- a/layout/tables/Makefile.in +++ b/layout/tables/Makefile.in @@ -46,21 +46,6 @@ MODULE = layout LIBRARY_NAME = gktable_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - content \ - gfx \ - thebes \ - widget \ - locale \ - view \ - necko \ - webshell \ - js \ - pref \ - docshell \ - $(NULL) ifdef ACCESSIBILITY REQUIRES += accessibility diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index 6678500af187..722e0c735a2b 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -46,26 +46,6 @@ MODULE = layout LIBRARY_NAME = gkxulbase_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - locale \ - content \ - gfx \ - thebes \ - widget \ - view \ - docshell \ - necko \ - webshell \ - pref \ - intl \ - imglib2 \ - unicharutil \ - xpconnect \ - js \ - xultmpl \ - $(NULL) ifdef MOZ_ENABLE_CANVAS REQUIRES += \ diff --git a/layout/xul/base/src/grid/Makefile.in b/layout/xul/base/src/grid/Makefile.in index c5a8efd2704d..5cb215c85b74 100644 --- a/layout/xul/base/src/grid/Makefile.in +++ b/layout/xul/base/src/grid/Makefile.in @@ -45,18 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkxulgrid_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - content \ - gfx \ - thebes \ - widget \ - locale \ - view \ - necko \ - dom \ - webshell \ - $(NULL) CPPSRCS = \ nsGridLayout2.cpp \ diff --git a/layout/xul/base/src/tree/src/Makefile.in b/layout/xul/base/src/tree/src/Makefile.in index 846b029c0bf7..bd21435f2b00 100644 --- a/layout/xul/base/src/tree/src/Makefile.in +++ b/layout/xul/base/src/tree/src/Makefile.in @@ -45,25 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout LIBRARY_NAME = gkxultree_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - content \ - gfx \ - thebes \ - widget \ - locale \ - view \ - xultmpl \ - rdf \ - necko \ - imglib2 \ - xpconnect \ - js \ - webshell \ - pref \ - unicharutil \ - $(NULL) CPPSRCS = \ nsTreeBodyFrame.cpp \ diff --git a/modules/lcms/src/Makefile.in b/modules/lcms/src/Makefile.in index 6d03f36af8ee..4245b8b66de1 100644 --- a/modules/lcms/src/Makefile.in +++ b/modules/lcms/src/Makefile.in @@ -70,8 +70,6 @@ endif # LCMS is on the critical path, so force it O2 on all platforms MODULE_OPTIMIZE_FLAGS=-O2 -REQUIRES = $(LCMS_REQUIRES) \ - $(NULL) CSRCS = cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ cmslut.c cmsmatsh.c cmsmtrx.c cmspack.c cmspcs.c cmswtpnt.c \ diff --git a/modules/libimg/png/Makefile.in b/modules/libimg/png/Makefile.in index 44f1bcfc5201..d7450b2d0ddc 100644 --- a/modules/libimg/png/Makefile.in +++ b/modules/libimg/png/Makefile.in @@ -56,8 +56,6 @@ OS_COMPILE_CFLAGS += -GL- endif endif -REQUIRES = $(ZLIB_REQUIRES) \ - $(NULL) CSRCS = \ png.c \ diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in index 952227f64113..72bbeb3eefb5 100644 --- a/modules/libjar/Makefile.in +++ b/modules/libjar/Makefile.in @@ -63,15 +63,6 @@ MODULE_NAME = nsJarModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - caps \ - mimetype \ - js \ - xpconnect \ - necko \ - $(ZLIB_REQUIRES) \ - $(NULL) CPPSRCS = $(MODULES_LIBJAR_LCPPSRCS) diff --git a/modules/libjar/zipwriter/src/Makefile.in b/modules/libjar/zipwriter/src/Makefile.in index db2a06ad4e4c..9ec804141495 100644 --- a/modules/libjar/zipwriter/src/Makefile.in +++ b/modules/libjar/zipwriter/src/Makefile.in @@ -52,13 +52,6 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 IS_COMPONENT = 1 -REQUIRES = \ - xpcom \ - string \ - necko \ - jar \ - $(ZLIB_REQUIRES) \ - $(NULL) CPPSRCS = \ StreamFunctions.cpp \ diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in index 7fd5be1fdfa0..7584c50b9976 100644 --- a/modules/libmar/tool/Makefile.in +++ b/modules/libmar/tool/Makefile.in @@ -53,7 +53,6 @@ endif # Mozilla distribution. HOST_PROGRAM = mar$(HOST_BIN_SUFFIX) -REQUIRES = libmar HOST_CSRCS = \ mar.c \ diff --git a/modules/libpr0n/build/Makefile.in b/modules/libpr0n/build/Makefile.in index c1e851bcee60..291a56213029 100644 --- a/modules/libpr0n/build/Makefile.in +++ b/modules/libpr0n/build/Makefile.in @@ -50,18 +50,6 @@ MODULE_NAME = nsImageLib2Module GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - thebes \ - necko \ - nkcache \ - gfx \ - caps \ - $(JPEG_REQUIRES) \ - $(PNG_REQUIRES) \ - $(ZLIB_REQUIRES) \ - qcms \ - $(NULL) CPPSRCS = \ nsImageModule.cpp \ diff --git a/modules/libpr0n/decoders/bmp/Makefile.in b/modules/libpr0n/decoders/bmp/Makefile.in index 2739980b6c33..29feacaeb7c4 100644 --- a/modules/libpr0n/decoders/bmp/Makefile.in +++ b/modules/libpr0n/decoders/bmp/Makefile.in @@ -49,12 +49,6 @@ FORCE_STATIC_LIB = 1 MODULE_NAME = nsBMPModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - gfx \ - thebes \ - imglib2 \ - $(NULL) CPPSRCS = nsBMPDecoder.cpp nsICODecoder.cpp diff --git a/modules/libpr0n/decoders/gif/Makefile.in b/modules/libpr0n/decoders/gif/Makefile.in index 5cc3f1a7a7eb..ea35b2dcc3fe 100644 --- a/modules/libpr0n/decoders/gif/Makefile.in +++ b/modules/libpr0n/decoders/gif/Makefile.in @@ -48,13 +48,6 @@ FORCE_STATIC_LIB = 1 MODULE_NAME = nsGIFModule2 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - gfx \ - thebes \ - imglib2 \ - qcms \ - $(NULL) CPPSRCS = nsGIFDecoder2.cpp diff --git a/modules/libpr0n/decoders/icon/Makefile.in b/modules/libpr0n/decoders/icon/Makefile.in index b00936369b59..2cb4a486bb3c 100644 --- a/modules/libpr0n/decoders/icon/Makefile.in +++ b/modules/libpr0n/decoders/icon/Makefile.in @@ -78,13 +78,6 @@ ifeq ($(OS_ARCH),BeOS) PLATFORM = beos endif -REQUIRES = xpcom \ - string \ - gfx \ - thebes \ - imglib2 \ - necko \ - $(NULL) CPPSRCS = \ nsIconURI.cpp \ diff --git a/modules/libpr0n/decoders/icon/beos/Makefile.in b/modules/libpr0n/decoders/icon/beos/Makefile.in index c0a8b49bbdf8..a32f6187479d 100644 --- a/modules/libpr0n/decoders/icon/beos/Makefile.in +++ b/modules/libpr0n/decoders/icon/beos/Makefile.in @@ -46,12 +46,6 @@ MODULE = imgicon LIBRARY_NAME = imgiconbeos_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - intl \ - mimetype \ - $(NULL) CPPSRCS = nsIconChannel.cpp diff --git a/modules/libpr0n/decoders/icon/gtk/Makefile.in b/modules/libpr0n/decoders/icon/gtk/Makefile.in index 00adb158f844..e6a0448a53e5 100644 --- a/modules/libpr0n/decoders/icon/gtk/Makefile.in +++ b/modules/libpr0n/decoders/icon/gtk/Makefile.in @@ -45,12 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = imgicon LIBRARY_NAME = imgicongtk_s -REQUIRES = xpcom \ - string \ - necko \ - intl \ - mimetype \ - $(NULL) CPPSRCS = nsIconChannel.cpp diff --git a/modules/libpr0n/decoders/icon/mac/Makefile.in b/modules/libpr0n/decoders/icon/mac/Makefile.in index da5646f0043b..c87b641b4071 100644 --- a/modules/libpr0n/decoders/icon/mac/Makefile.in +++ b/modules/libpr0n/decoders/icon/mac/Makefile.in @@ -46,12 +46,6 @@ MODULE = imgicon LIBRARY_NAME = imgiconmac_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - mimetype \ - exthandler \ - $(NULL) CMMSRCS = nsIconChannelCocoa.mm diff --git a/modules/libpr0n/decoders/icon/os2/Makefile.in b/modules/libpr0n/decoders/icon/os2/Makefile.in index 20d8d0a91340..90826b214bd4 100644 --- a/modules/libpr0n/decoders/icon/os2/Makefile.in +++ b/modules/libpr0n/decoders/icon/os2/Makefile.in @@ -46,13 +46,6 @@ MODULE = imgicon LIBRARY_NAME = imgiconos2_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - mimetype \ - exthandler \ - widget \ - $(NULL) CPPSRCS = nsIconChannel.cpp diff --git a/modules/libpr0n/decoders/icon/qt/Makefile.in b/modules/libpr0n/decoders/icon/qt/Makefile.in index 663488f1b7c3..edc6afe4e73b 100644 --- a/modules/libpr0n/decoders/icon/qt/Makefile.in +++ b/modules/libpr0n/decoders/icon/qt/Makefile.in @@ -45,13 +45,6 @@ MODULE = imgicon LIBRARY_NAME = imgiconqt_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - intl \ - mimetype \ - gtkqticonsconverter \ - $(NULL) CPPSRCS = nsIconChannel.cpp diff --git a/modules/libpr0n/decoders/icon/win/Makefile.in b/modules/libpr0n/decoders/icon/win/Makefile.in index 8b558c4bcd14..ea4d1fe69ace 100644 --- a/modules/libpr0n/decoders/icon/win/Makefile.in +++ b/modules/libpr0n/decoders/icon/win/Makefile.in @@ -46,12 +46,6 @@ MODULE = imgicon LIBRARY_NAME = imgiconwin_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - mimetype \ - exthandler \ - $(NULL) CPPSRCS = nsIconChannel.cpp diff --git a/modules/libpr0n/decoders/jpeg/Makefile.in b/modules/libpr0n/decoders/jpeg/Makefile.in index 30c5ef054c4c..049d67e6a6c7 100644 --- a/modules/libpr0n/decoders/jpeg/Makefile.in +++ b/modules/libpr0n/decoders/jpeg/Makefile.in @@ -48,14 +48,6 @@ FORCE_STATIC_LIB = 1 MODULE_NAME = nsJPEGDecoderModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - gfx \ - thebes \ - imglib2 \ - $(JPEG_REQUIRES) \ - qcms \ - $(NULL) CPPSRCS = nsJPEGDecoder.cpp diff --git a/modules/libpr0n/decoders/png/Makefile.in b/modules/libpr0n/decoders/png/Makefile.in index cbdd482b4b0b..b775942b034d 100644 --- a/modules/libpr0n/decoders/png/Makefile.in +++ b/modules/libpr0n/decoders/png/Makefile.in @@ -50,15 +50,6 @@ LIBXUL_LIBRARY = 1 EXTRA_DSO_LIBS = gkgfx -REQUIRES = xpcom \ - string \ - gfx \ - thebes \ - imglib2 \ - $(PNG_REQUIRES) \ - $(ZLIB_REQUIRES) \ - qcms \ - $(NULL) CPPSRCS = nsPNGDecoder.cpp diff --git a/modules/libpr0n/encoders/jpeg/Makefile.in b/modules/libpr0n/encoders/jpeg/Makefile.in index 3c1a3a2d80b7..e3c71946dfe0 100644 --- a/modules/libpr0n/encoders/jpeg/Makefile.in +++ b/modules/libpr0n/encoders/jpeg/Makefile.in @@ -48,11 +48,6 @@ LIBXUL_LIBRARY = 1 EXTRA_DSO_LIBS = gkgfx -REQUIRES = xpcom \ - string \ - imglib2 \ - $(JPEG_REQUIRES) \ - $(NULL) CPPSRCS = nsJPEGEncoder.cpp diff --git a/modules/libpr0n/encoders/png/Makefile.in b/modules/libpr0n/encoders/png/Makefile.in index 6a1ef0df441a..ed2d24909196 100644 --- a/modules/libpr0n/encoders/png/Makefile.in +++ b/modules/libpr0n/encoders/png/Makefile.in @@ -48,12 +48,6 @@ LIBXUL_LIBRARY = 1 EXTRA_DSO_LIBS = gkgfx -REQUIRES = xpcom \ - string \ - imglib2 \ - $(PNG_REQUIRES) \ - $(ZLIB_REQUIRES) \ - $(NULL) ifneq (,$(filter png,$(MOZ_IMG_ENCODERS))) DEFINES += -DMOZ_PNG_WRITE diff --git a/modules/libpr0n/src/Makefile.in b/modules/libpr0n/src/Makefile.in index 434e31ab1d8b..d513e6fa4f7b 100644 --- a/modules/libpr0n/src/Makefile.in +++ b/modules/libpr0n/src/Makefile.in @@ -49,18 +49,6 @@ MODULE_NAME = nsImageLib2Module GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - nkcache \ - gfx \ - thebes \ - caps \ - xpconnect \ - js \ - uriloader \ - qcms \ - $(NULL) CPPSRCS = \ imgContainer.cpp \ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index c73f5dd32a2b..4e0c02fe866b 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -53,11 +53,6 @@ endif GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - intl \ - necko \ - $(NULL) ifndef MOZ_NO_XPCOM_OBSOLETE REQUIRES += xpcom_obsolete diff --git a/modules/libutil/src/Makefile.in b/modules/libutil/src/Makefile.in index 170190c587f6..633625950d86 100644 --- a/modules/libutil/src/Makefile.in +++ b/modules/libutil/src/Makefile.in @@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = util LIBRARY_NAME = mozutil_s -REQUIRES = xpcom \ - $(NULL) CPPSRCS = stopwatch.cpp diff --git a/modules/plugin/base/src/Makefile.in b/modules/plugin/base/src/Makefile.in index dbaa40eda947..dbd9f7777e5e 100644 --- a/modules/plugin/base/src/Makefile.in +++ b/modules/plugin/base/src/Makefile.in @@ -51,30 +51,6 @@ MODULE_NAME = nsPluginModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - xpconnect \ - string \ - java \ - pref \ - necko \ - caps \ - intl \ - uconv \ - unicharutil \ - dom \ - gfx \ - thebes \ - content \ - widget \ - mimetype \ - exthandler \ - docshell \ - windowwatcher \ - imglib2 \ - layout \ - js \ - locale \ - $(NULL) ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) REQUIRES += gtkxtbin diff --git a/modules/plugin/default/os2/Makefile.in b/modules/plugin/default/os2/Makefile.in index f568096aa8b5..23b891d6c3cb 100644 --- a/modules/plugin/default/os2/Makefile.in +++ b/modules/plugin/default/os2/Makefile.in @@ -47,10 +47,6 @@ MODULE = plugin LIBRARY_NAME = npnulos2 RESFILE = npnulos2.res -REQUIRES = java \ - xpcom \ - pref \ - $(NULL) CPPSRCS = \ maindll.cpp \ diff --git a/modules/plugin/default/unix/Makefile.in b/modules/plugin/default/unix/Makefile.in index 70a637ab3d60..844f9310bdde 100644 --- a/modules/plugin/default/unix/Makefile.in +++ b/modules/plugin/default/unix/Makefile.in @@ -46,8 +46,6 @@ MODULE = plugin LIBRARY_NAME = nullplugin GRE_MODULE = 1 -REQUIRES = java \ - $(NULL) CSRCS = \ npshell.c\ diff --git a/modules/plugin/default/windows/Makefile.in b/modules/plugin/default/windows/Makefile.in index e13350db98cf..2dcad624be9e 100644 --- a/modules/plugin/default/windows/Makefile.in +++ b/modules/plugin/default/windows/Makefile.in @@ -48,10 +48,6 @@ RESFILE = npnul32.res DEFFILE = $(win_srcdir)/npnul32.def GRE_MODULE = 1 -REQUIRES = java \ - xpcom \ - pref \ - $(NULL) CPPSRCS = \ maindll.cpp \ diff --git a/modules/plugin/sdk/samples/basic/windows/Makefile.in b/modules/plugin/sdk/samples/basic/windows/Makefile.in index 16c2a7c59394..4e0a94c6fbf7 100644 --- a/modules/plugin/sdk/samples/basic/windows/Makefile.in +++ b/modules/plugin/sdk/samples/basic/windows/Makefile.in @@ -47,8 +47,6 @@ LIBRARY_NAME = npbasic NO_DIST_INSTALL = 1 -REQUIRES = plugin \ - $(NULL) CPPSRCS = plugin.cpp diff --git a/modules/plugin/sdk/samples/common/Makefile.in b/modules/plugin/sdk/samples/common/Makefile.in index 4b54e1ab25be..7f3dcfa6e917 100644 --- a/modules/plugin/sdk/samples/common/Makefile.in +++ b/modules/plugin/sdk/samples/common/Makefile.in @@ -46,8 +46,6 @@ LIBRARY_NAME = plugingate_s NO_DIST_INSTALL = 1 -REQUIRES = plugin \ - $(NULL) CPPSRCS = npn_gate.cpp \ npp_gate.cpp \ diff --git a/modules/plugin/sdk/samples/npruntime/Makefile.in b/modules/plugin/sdk/samples/npruntime/Makefile.in index 1ff433ae9b1d..4fd93ee320d9 100644 --- a/modules/plugin/sdk/samples/npruntime/Makefile.in +++ b/modules/plugin/sdk/samples/npruntime/Makefile.in @@ -45,9 +45,6 @@ CPPSRCS = \ plugin.cpp \ $(NULL) -REQUIRES = \ - plugin \ - $(NULL) LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public \ -I/usr/lib/glib/include diff --git a/modules/plugin/sdk/samples/unixprinting/Makefile.in b/modules/plugin/sdk/samples/unixprinting/Makefile.in index c9230a13ff10..98ce9f357c35 100644 --- a/modules/plugin/sdk/samples/unixprinting/Makefile.in +++ b/modules/plugin/sdk/samples/unixprinting/Makefile.in @@ -46,8 +46,6 @@ MODULE = plugin LIBRARY_NAME = unixprintplugin GRE_MODULE = 1 -REQUIRES = java \ - $(NULL) CSRCS = \ npshell.c \ diff --git a/modules/plugin/sdk/samples/winless/windows/Makefile.in b/modules/plugin/sdk/samples/winless/windows/Makefile.in index 0a965bd3927d..d1d1a60b68f9 100644 --- a/modules/plugin/sdk/samples/winless/windows/Makefile.in +++ b/modules/plugin/sdk/samples/winless/windows/Makefile.in @@ -47,8 +47,6 @@ LIBRARY_NAME = npwinless NO_DIST_INSTALL = 1 -REQUIRES = plugin \ - $(NULL) CPPSRCS = plugin.cpp diff --git a/modules/plugin/test/testplugin/Makefile.in b/modules/plugin/test/testplugin/Makefile.in index 47e50fff2ce8..d866bad72791 100644 --- a/modules/plugin/test/testplugin/Makefile.in +++ b/modules/plugin/test/testplugin/Makefile.in @@ -46,9 +46,6 @@ MODULE = nptest LIBRARY_NAME = nptest MODULE_NAME = TestPlugin -REQUIRES = \ - plugin \ - $(NULL) # Need to custom install plugins NO_DIST_INSTALL = 1 diff --git a/modules/staticmod/Makefile.in b/modules/staticmod/Makefile.in index 6374d0b94e3b..af678c61ed16 100644 --- a/modules/staticmod/Makefile.in +++ b/modules/staticmod/Makefile.in @@ -51,7 +51,6 @@ FORCE_SHARED_LIB = 1 CPPSRCS = nsMetaModule.cpp -REQUIRES = xpcom include $(topsrcdir)/config/config.mk diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index af1326ac6424..5ea960196ae4 100644 --- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -47,13 +47,6 @@ MODULE = necko LIBRARY_NAME = neckobase_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - mimetype \ - uconv \ - locale \ - pref \ - $(NULL) CPPSRCS = \ nsTransportUtils.cpp \ diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index bb612685eb5c..cb908abf2fdd 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -50,17 +50,6 @@ MODULE_NAME = necko GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - nkcache \ - pref \ - mimetype \ - locale \ - intl \ - uconv \ - unicharutil \ - $(ZLIB_REQUIRES) \ - $(NULL) CPPSRCS = nsNetModule.cpp EXPORTS = nsNetCID.h diff --git a/netwerk/cache/src/Makefile.in b/netwerk/cache/src/Makefile.in index db6cb59ccdc0..9257bd85e60a 100644 --- a/netwerk/cache/src/Makefile.in +++ b/netwerk/cache/src/Makefile.in @@ -48,11 +48,6 @@ LIBRARY_NAME = nkcache_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - pref \ - $(NULL) EXPORTS = \ nsCacheService.h \ diff --git a/netwerk/cookie/src/Makefile.in b/netwerk/cookie/src/Makefile.in index e15191e624e2..7bea25175118 100644 --- a/netwerk/cookie/src/Makefile.in +++ b/netwerk/cookie/src/Makefile.in @@ -46,12 +46,6 @@ LIBRARY_NAME = neckocookie_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - pref \ - storage \ - $(NULL) CPPSRCS = \ nsCookie.cpp \ diff --git a/netwerk/dns/src/Makefile.in b/netwerk/dns/src/Makefile.in index 92f81bdbc166..6cba69e48066 100644 --- a/netwerk/dns/src/Makefile.in +++ b/netwerk/dns/src/Makefile.in @@ -47,11 +47,6 @@ MODULE = necko LIBRARY_NAME = neckodns_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - pref \ - unicharutil \ - $(NULL) CPPSRCS = nsIDNService.cpp \ nsDNSService2.cpp \ diff --git a/netwerk/mime/src/Makefile.in b/netwerk/mime/src/Makefile.in index 002ce56985ce..bf93437a9938 100644 --- a/netwerk/mime/src/Makefile.in +++ b/netwerk/mime/src/Makefile.in @@ -46,10 +46,6 @@ MODULE = mimetype LIBRARY_NAME = nkmime_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - $(NULL) CPPSRCS = \ nsMIMEHeaderParamImpl.cpp \ diff --git a/netwerk/protocol/about/src/Makefile.in b/netwerk/protocol/about/src/Makefile.in index 844cb2bbb309..115ac81ebb87 100644 --- a/netwerk/protocol/about/src/Makefile.in +++ b/netwerk/protocol/about/src/Makefile.in @@ -46,10 +46,6 @@ MODULE = necko LIBRARY_NAME = nkabout_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - nkcache \ - $(NULL) CPPSRCS = \ nsAboutProtocolHandler.cpp \ diff --git a/netwerk/protocol/data/src/Makefile.in b/netwerk/protocol/data/src/Makefile.in index fe0349cd1679..8ffec4484c7f 100644 --- a/netwerk/protocol/data/src/Makefile.in +++ b/netwerk/protocol/data/src/Makefile.in @@ -46,9 +46,6 @@ MODULE = necko LIBRARY_NAME = nkdata_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - $(NULL) CPPSRCS = \ nsDataHandler.cpp \ diff --git a/netwerk/protocol/file/src/Makefile.in b/netwerk/protocol/file/src/Makefile.in index 2ba0547d483c..263892642f57 100644 --- a/netwerk/protocol/file/src/Makefile.in +++ b/netwerk/protocol/file/src/Makefile.in @@ -46,11 +46,6 @@ MODULE = necko LIBRARY_NAME = nkfile_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - mimetype \ - uconv \ - $(NULL) CPPSRCS = \ nsFileProtocolHandler.cpp \ diff --git a/netwerk/protocol/ftp/src/Makefile.in b/netwerk/protocol/ftp/src/Makefile.in index a9f488cfe71f..df6809631e86 100644 --- a/netwerk/protocol/ftp/src/Makefile.in +++ b/netwerk/protocol/ftp/src/Makefile.in @@ -46,14 +46,6 @@ MODULE = necko LIBRARY_NAME = nkftp_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - mimetype \ - pref \ - intl \ - nkcache \ - uconv \ - $(NULL) CPPSRCS = \ nsFtpProtocolHandler.cpp \ diff --git a/netwerk/protocol/gopher/src/Makefile.in b/netwerk/protocol/gopher/src/Makefile.in index b76505744efe..610ade15dace 100644 --- a/netwerk/protocol/gopher/src/Makefile.in +++ b/netwerk/protocol/gopher/src/Makefile.in @@ -47,12 +47,6 @@ MODULE = necko LIBRARY_NAME = nkgopher_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - mimetype \ - intl \ - uconv \ - $(NULL) CPPSRCS = \ nsGopherHandler.cpp \ diff --git a/netwerk/protocol/http/src/Makefile.in b/netwerk/protocol/http/src/Makefile.in index 86ed160863f8..1d89d0a04407 100644 --- a/netwerk/protocol/http/src/Makefile.in +++ b/netwerk/protocol/http/src/Makefile.in @@ -46,15 +46,6 @@ MODULE = necko LIBRARY_NAME = nkhttp_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - pref \ - nkcache \ - mimetype \ - intl \ - unicharutil \ - uconv \ - $(NULL) CPPSRCS = \ nsHttp.cpp \ diff --git a/netwerk/protocol/res/src/Makefile.in b/netwerk/protocol/res/src/Makefile.in index 8fcb5bab3113..999d22bc586f 100644 --- a/netwerk/protocol/res/src/Makefile.in +++ b/netwerk/protocol/res/src/Makefile.in @@ -46,10 +46,6 @@ MODULE = necko LIBRARY_NAME = nkres_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - uconv \ - $(NULL) CPPSRCS = \ nsResProtocolHandler.cpp \ diff --git a/netwerk/protocol/viewsource/src/Makefile.in b/netwerk/protocol/viewsource/src/Makefile.in index 56823b5d6734..cdc1c54154f1 100644 --- a/netwerk/protocol/viewsource/src/Makefile.in +++ b/netwerk/protocol/viewsource/src/Makefile.in @@ -47,10 +47,6 @@ MODULE = necko LIBRARY_NAME = nkviewsource_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - mimetype \ - $(NULL) CPPSRCS = \ nsViewSourceHandler.cpp \ diff --git a/netwerk/socket/base/Makefile.in b/netwerk/socket/base/Makefile.in index f4e0c8e736aa..723bb2804751 100644 --- a/netwerk/socket/base/Makefile.in +++ b/netwerk/socket/base/Makefile.in @@ -48,9 +48,6 @@ XPIDL_MODULE = necko_socket LIBRARY_NAME = neckosocket_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - $(NULL) CPPSRCS = \ nsSocketProviderService.cpp \ diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in index 812d62ea064c..e24e7905eadf 100644 --- a/netwerk/streamconv/converters/Makefile.in +++ b/netwerk/streamconv/converters/Makefile.in @@ -46,16 +46,6 @@ MODULE = necko LIBRARY_NAME = nkcnvts_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - mimetype \ - locale \ - intl \ - unicharutil \ - pref \ - uconv \ - $(ZLIB_REQUIRES) \ - $(NULL) CPPSRCS = \ mozTXTToHTMLConv.cpp \ diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in index 8eb6e5e586f6..051053aa2ae1 100644 --- a/netwerk/streamconv/src/Makefile.in +++ b/netwerk/streamconv/src/Makefile.in @@ -46,9 +46,6 @@ MODULE = necko LIBRARY_NAME = nkconv_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - $(NULL) CPPSRCS = \ nsStreamConverterService.cpp \ diff --git a/netwerk/streamconv/test/Makefile.in b/netwerk/streamconv/test/Makefile.in index ea2f55b490e4..7d57878f4174 100644 --- a/netwerk/streamconv/test/Makefile.in +++ b/netwerk/streamconv/test/Makefile.in @@ -45,10 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = TestStreamConv PROGRAM = TestStreamConv$(BIN_SUFFIX) -REQUIRES = necko \ - xpcom \ - string \ - $(NULL) CPPSRCS = \ Converters.cpp \ diff --git a/netwerk/system/mac/Makefile.in b/netwerk/system/mac/Makefile.in index 1a17d72a0610..f28bd716d051 100644 --- a/netwerk/system/mac/Makefile.in +++ b/netwerk/system/mac/Makefile.in @@ -45,9 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = neckosystem_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - $(NULL) FORCE_STATIC_LIB = 1 diff --git a/netwerk/system/win32/Makefile.in b/netwerk/system/win32/Makefile.in index e8bb13121b17..949f84593900 100644 --- a/netwerk/system/win32/Makefile.in +++ b/netwerk/system/win32/Makefile.in @@ -45,10 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = neckosystem_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - pref \ - $(NULL) FORCE_STATIC_LIB = 1 diff --git a/netwerk/system/wince/Makefile.in b/netwerk/system/wince/Makefile.in index 28227d8778ca..a007eb3a2c49 100644 --- a/netwerk/system/wince/Makefile.in +++ b/netwerk/system/wince/Makefile.in @@ -45,10 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = necko LIBRARY_NAME = neckosystem_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - pref \ - $(NULL) FORCE_STATIC_LIB = 1 diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in index c4979a55a916..8d76f04cf083 100644 --- a/netwerk/test/Makefile.in +++ b/netwerk/test/Makefile.in @@ -49,11 +49,6 @@ DIRS = \ httpserver \ $(NULL) -REQUIRES = xpcom \ - string \ - necko \ - pref \ - $(NULL) CPPSRCS = \ TestIncrementalDownload.cpp \ diff --git a/netwerk/wifi/src/Makefile.in b/netwerk/wifi/src/Makefile.in index a6e808ed2989..b919dfde3ec7 100644 --- a/netwerk/wifi/src/Makefile.in +++ b/netwerk/wifi/src/Makefile.in @@ -46,12 +46,6 @@ LIBRARY_NAME = neckowifi_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - pref \ - storage \ - $(NULL) CPPSRCS = nsWifiMonitor.cpp \ nsWifiAccessPoint.cpp \ diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in index 4680b78cd259..66483a327d06 100644 --- a/parser/html/Makefile.in +++ b/parser/html/Makefile.in @@ -45,27 +45,6 @@ MODULE = html5 LIBRARY_NAME = html5p_s LIBXUL_LIBRARY = 1 -REQUIRES = \ - gfx \ - thebes \ - locale \ - js \ - pref \ - necko \ - xpcom \ - string \ - htmlparser \ - content \ - layout \ - widget \ - dom \ - uconv \ - xpconnect \ - util \ - webshell \ - docshell \ - chardet \ - $(NULL) EXPORTS = \ nsHtml5Module.h \ diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in index 0790e6990c67..bcca6d6e23c2 100644 --- a/parser/htmlparser/src/Makefile.in +++ b/parser/htmlparser/src/Makefile.in @@ -50,25 +50,6 @@ SHORT_LIBNAME = gkparser GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - util \ - uconv \ - unicharutil \ - expat \ - xml \ - content \ - dom \ - pref \ - nkcache \ - intl \ - xpconnect \ - layout \ - widget \ - caps \ - js \ - $(NULL) SHARED_LIBRARY_LIBS = \ $(DEPTH)/parser/expat/lib/$(LIB_PREFIX)mozexpat_s.$(LIB_SUFFIX) \ diff --git a/parser/htmlparser/tests/grabpage/Makefile.in b/parser/htmlparser/tests/grabpage/Makefile.in index 26da855a3eb2..ff6f93fca080 100644 --- a/parser/htmlparser/tests/grabpage/Makefile.in +++ b/parser/htmlparser/tests/grabpage/Makefile.in @@ -44,10 +44,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = grabpage$(BIN_SUFFIX) -REQUIRES = xpcom \ - string \ - necko \ - $(NULL) CPPSRCS = grabpage.cpp diff --git a/parser/htmlparser/tests/html/Makefile.in b/parser/htmlparser/tests/html/Makefile.in index cfb5cab9c74b..2f585e73a21d 100644 --- a/parser/htmlparser/tests/html/Makefile.in +++ b/parser/htmlparser/tests/html/Makefile.in @@ -44,11 +44,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = TestParser$(BIN_SUFFIX) -REQUIRES = xpcom \ - string \ - necko \ - content \ - $(NULL) CPPSRCS = \ TestParser.cpp\ diff --git a/parser/htmlparser/tests/logparse/Makefile.in b/parser/htmlparser/tests/logparse/Makefile.in index 81cec85d2886..e98a8e2fb2b9 100644 --- a/parser/htmlparser/tests/logparse/Makefile.in +++ b/parser/htmlparser/tests/logparse/Makefile.in @@ -45,12 +45,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = logparse$(BIN_SUFFIX) MOZILLA_INTERNAL_API = 1 -REQUIRES = \ - xpcom \ - string \ - necko \ - htmlparser \ - $(NULL) CPPSRCS = \ logparse.cpp\ diff --git a/parser/htmlparser/tests/outsinks/Makefile.in b/parser/htmlparser/tests/outsinks/Makefile.in index 79cea11ea7a8..70d5a009f84b 100644 --- a/parser/htmlparser/tests/outsinks/Makefile.in +++ b/parser/htmlparser/tests/outsinks/Makefile.in @@ -45,13 +45,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = TestOutput$(BIN_SUFFIX) MOZILLA_INTERNAL_API = 1 -REQUIRES = xpcom \ - string \ - htmlparser \ - necko \ - layout \ - content \ - $(NULL) CPPSRCS = \ Convert.cpp \ diff --git a/parser/xml/src/Makefile.in b/parser/xml/src/Makefile.in index 578224f6ed29..c790a579dc79 100644 --- a/parser/xml/src/Makefile.in +++ b/parser/xml/src/Makefile.in @@ -47,15 +47,6 @@ LIBRARY_NAME = saxp MOZILLA_INTERNAL_API = 1 LIBXUL_LIBRARY = 1 -REQUIRES = \ - necko \ - xpcom \ - string \ - htmlparser \ - content \ - uconv \ - xpconnect \ - $(NULL) CPPSRCS = \ nsSAXAttributes.cpp \ diff --git a/profile/dirserviceprovider/src/Makefile.in b/profile/dirserviceprovider/src/Makefile.in index 4acefb1448b8..1668303b5339 100644 --- a/profile/dirserviceprovider/src/Makefile.in +++ b/profile/dirserviceprovider/src/Makefile.in @@ -46,9 +46,6 @@ MODULE = profdirserviceprovider LIBRARY_NAME = profdirserviceprovider_s MOZILLA_INTERNAL_API = 1 -REQUIRES = xpcom \ - string \ - $(NULL) CPPSRCS = $(MODULES_PROFILEDIRSERVICE_SRC_LCSRCS) diff --git a/profile/dirserviceprovider/standalone/Makefile.in b/profile/dirserviceprovider/standalone/Makefile.in index cbfe77910a84..b682bc5b2c1c 100644 --- a/profile/dirserviceprovider/standalone/Makefile.in +++ b/profile/dirserviceprovider/standalone/Makefile.in @@ -44,9 +44,6 @@ include $(srcdir)/../src/objs.mk MODULE = profdirserviceprovider LIBRARY_NAME = profdirserviceprovidersa_s -REQUIRES = xpcom \ - string \ - $(NULL) CPPSRCS = $(MODULES_PROFILEDIRSERVICE_SRC_LCSRCS) diff --git a/rdf/base/src/Makefile.in b/rdf/base/src/Makefile.in index db28ff53ec0e..e333f1a2c551 100644 --- a/rdf/base/src/Makefile.in +++ b/rdf/base/src/Makefile.in @@ -46,17 +46,6 @@ MODULE = rdf LIBRARY_NAME = rdfbase_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - rdfutil \ - js \ - caps \ - necko \ - content \ - htmlparser \ - xpconnect \ - unicharutil \ - $(NULL) CPPSRCS = \ rdfTriplesSerializer.cpp \ diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in index 48af6f264726..2458968a25ba 100644 --- a/rdf/build/Makefile.in +++ b/rdf/build/Makefile.in @@ -52,12 +52,6 @@ GRE_MODULE = 1 LIBXUL_LIBRARY = 1 EXTRA_DSO_LIBS = -REQUIRES = xpcom \ - string \ - content \ - htmlparser \ - necko \ - $(NULL) CPPSRCS = \ nsRDFModule.cpp \ diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in index 861d73bc159e..9d71810721fc 100644 --- a/rdf/datasource/src/Makefile.in +++ b/rdf/datasource/src/Makefile.in @@ -46,10 +46,6 @@ MODULE = rdf LIBRARY_NAME = rdfdatasource_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - $(NULL) CPPSRCS = \ nsLocalStore.cpp \ diff --git a/rdf/tests/dsds/Makefile.in b/rdf/tests/dsds/Makefile.in index 394e31f76c7a..eac4a4f98eb9 100644 --- a/rdf/tests/dsds/Makefile.in +++ b/rdf/tests/dsds/Makefile.in @@ -45,10 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = rdf MOZILLA_INTERNAL_API = 1 -REQUIRES = xpcom \ - string \ - necko \ - $(NULL) LIBRARY_NAME = rdfdsds diff --git a/rdf/tests/rdfcat/Makefile.in b/rdf/tests/rdfcat/Makefile.in index 53fd34cdb951..65f96529bd90 100644 --- a/rdf/tests/rdfcat/Makefile.in +++ b/rdf/tests/rdfcat/Makefile.in @@ -45,10 +45,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = rdfcat$(BIN_SUFFIX) CPPSRCS = rdfcat.cpp -REQUIRES = xpcom \ - rdf \ - necko \ - $(NULL) LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ diff --git a/rdf/tests/rdfpoll/Makefile.in b/rdf/tests/rdfpoll/Makefile.in index 7cf8cc7e7da8..eee8aad65840 100644 --- a/rdf/tests/rdfpoll/Makefile.in +++ b/rdf/tests/rdfpoll/Makefile.in @@ -45,11 +45,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = rdfpoll$(BIN_SUFFIX) CPPSRCS = rdfpoll.cpp -REQUIRES = xpcom \ - string \ - rdf \ - necko \ - $(NULL) LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ diff --git a/rdf/tests/triplescat/Makefile.in b/rdf/tests/triplescat/Makefile.in index 5175655f1f6b..a6871d73bb51 100644 --- a/rdf/tests/triplescat/Makefile.in +++ b/rdf/tests/triplescat/Makefile.in @@ -46,11 +46,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = triplescat$(BIN_SUFFIX) CPPSRCS = triplescat.cpp -REQUIRES = xpcom \ - rdf \ - necko \ - string \ - $(NULL) LIBS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ diff --git a/rdf/util/src/Makefile.in b/rdf/util/src/Makefile.in index acb3064ea09e..ab1503c25b93 100644 --- a/rdf/util/src/Makefile.in +++ b/rdf/util/src/Makefile.in @@ -56,10 +56,6 @@ MODULE = rdfutil LIBRARY_NAME = rdfutil_external_s DIST_INSTALL = 1 -REQUIRES = xpcom \ - string \ - rdf \ - $(NULL) CPPSRCS = $(RDF_UTIL_SRC_LCPPSRCS) diff --git a/rdf/util/src/internal/Makefile.in b/rdf/util/src/internal/Makefile.in index 6d14f03b2a8c..4c24a4ba8c68 100644 --- a/rdf/util/src/internal/Makefile.in +++ b/rdf/util/src/internal/Makefile.in @@ -54,10 +54,6 @@ MODULE = rdfutil LIBRARY_NAME = rdfutil_s MOZILLA_INTERNAL_API = 1 -REQUIRES = xpcom \ - string \ - rdf \ - $(NULL) CPPSRCS = $(RDF_UTIL_SRC_LCPPSRCS) diff --git a/security/manager/boot/src/Makefile.in b/security/manager/boot/src/Makefile.in index 8ce350243e9a..58d37ad16981 100644 --- a/security/manager/boot/src/Makefile.in +++ b/security/manager/boot/src/Makefile.in @@ -60,22 +60,6 @@ CPPSRCS = \ nsSecurityWarningDialogs.cpp \ $(NULL) -REQUIRES = nspr \ - xpcom \ - string \ - necko \ - uriloader \ - dom \ - intl \ - docshell \ - widget \ - layout \ - content \ - caps \ - pref \ - pipnss \ - imglib2 \ - $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/security/manager/pki/src/Makefile.in b/security/manager/pki/src/Makefile.in index e78aed7f33bd..ce4b61ed6662 100644 --- a/security/manager/pki/src/Makefile.in +++ b/security/manager/pki/src/Makefile.in @@ -63,17 +63,6 @@ CPPSRCS = \ nsFormSigningDialog.cpp \ $(NULL) -REQUIRES = nspr \ - xpcom \ - string \ - dom \ - intl \ - locale \ - windowwatcher \ - necko \ - pipnss \ - layout \ - $(NULL) INCLUDES += \ -I$(DIST)/public/nss \ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in index 3517646f4b60..ae916b02b29d 100644 --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -110,27 +110,6 @@ endif CSRCS += md4.c -REQUIRES = nspr \ - xpcom \ - string \ - necko \ - uriloader \ - pref \ - docshell \ - caps \ - dom \ - intl \ - locale \ - profile \ - windowwatcher \ - js \ - widget \ - layout \ - content \ - xpconnect \ - unicharutil \ - pipboot \ - $(NULL) EXTRA_DEPS = $(NSS_DEP_LIBS) diff --git a/storage/build/Makefile.in b/storage/build/Makefile.in index 96b0484f38ee..0204b300a71e 100644 --- a/storage/build/Makefile.in +++ b/storage/build/Makefile.in @@ -52,13 +52,6 @@ IS_COMPONENT = 1 MODULE_NAME = mozStorageModule LIBXUL_LIBRARY = 1 -REQUIRES = \ - sqlite3 \ - xpcom \ - string \ - js \ - xpconnect \ - $(NULL) EXPORTS = mozStorageCID.h diff --git a/storage/src/Makefile.in b/storage/src/Makefile.in index 6e22f4b86d0f..06f1dec8c2ad 100644 --- a/storage/src/Makefile.in +++ b/storage/src/Makefile.in @@ -53,13 +53,6 @@ FORCE_STATIC_LIB = 1 GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - sqlite3 \ - js \ - xpconnect \ - necko \ - $(NULL) EXPORTS_NAMESPACES = mozilla/storage diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in index ed355aa683f3..49d5d78e6e16 100644 --- a/storage/test/Makefile.in +++ b/storage/test/Makefile.in @@ -66,11 +66,6 @@ endif endif endif -REQUIRES = \ - xpcom \ - string \ - storage \ - $(NULL) LOCAL_INCLUDES = \ -I$(srcdir)/../src \ diff --git a/testing/mochitest/ssltunnel/Makefile.in b/testing/mochitest/ssltunnel/Makefile.in index 97ad9a938671..71a3d9495678 100644 --- a/testing/mochitest/ssltunnel/Makefile.in +++ b/testing/mochitest/ssltunnel/Makefile.in @@ -50,10 +50,6 @@ CPPSRCS = ssltunnel.cpp # Despite not catching exceptions, we're using STL ENABLE_CXX_EXCEPTIONS=1 -REQUIRES = \ - nspr \ - nss \ - $(NULL) # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's diff --git a/toolkit/components/alerts/src/Makefile.in b/toolkit/components/alerts/src/Makefile.in index e298555e5262..1f61b9001da1 100644 --- a/toolkit/components/alerts/src/Makefile.in +++ b/toolkit/components/alerts/src/Makefile.in @@ -48,13 +48,6 @@ LIBRARY_NAME = alerts_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - windowwatcher \ - dom \ - widget \ - gfx \ - $(NULL) CPPSRCS = \ nsAlertsService.cpp \ diff --git a/toolkit/components/alerts/src/mac/Makefile.in b/toolkit/components/alerts/src/mac/Makefile.in index 86bd9fc81293..fb524dcfbe13 100644 --- a/toolkit/components/alerts/src/mac/Makefile.in +++ b/toolkit/components/alerts/src/mac/Makefile.in @@ -46,17 +46,6 @@ LIBRARY_NAME = alerts_s IS_COMPONENT = 1 FORCE_SHARED_LIB = 1 -REQUIRES = \ - xpcom \ - string \ - necko \ - intl \ - js \ - xpconnect \ - dom \ - content \ - widget \ - $(NULL) CMMSRCS = \ nsAlertsService.mm \ diff --git a/toolkit/components/autocomplete/src/Makefile.in b/toolkit/components/autocomplete/src/Makefile.in index f8f8230f0383..9ca71027a112 100644 --- a/toolkit/components/autocomplete/src/Makefile.in +++ b/toolkit/components/autocomplete/src/Makefile.in @@ -51,14 +51,6 @@ IS_COMPONENT = 1 EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - layout \ - unicharutil \ - toolkitcomps \ - necko \ - $(NULL) CPPSRCS = nsAutoCompleteController.cpp \ nsAutoCompleteSimpleResult.cpp \ diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in index 3c8cc800c1f3..3d3ca343053d 100644 --- a/toolkit/components/build/Makefile.in +++ b/toolkit/components/build/Makefile.in @@ -55,35 +55,6 @@ ALERTS_SERVICE=1 DEFINES += -DALERTS_SERVICE endif -REQUIRES = \ - xpcom \ - string \ - widget \ - layout \ - dom \ - intl \ - docshell \ - appcomps \ - downloads \ - fastfind \ - mimetype \ - webbrowserpersist \ - necko \ - uriloader \ - xulapp \ - embed_base \ - content \ - find \ - gfx \ - thebes \ - locale \ - unicharutil \ - xuldoc \ - feeds \ - storage \ - pipnss \ - places \ - $(NULL) ifdef ALERTS_SERVICE REQUIRES += alerts diff --git a/toolkit/components/commandlines/src/Makefile.in b/toolkit/components/commandlines/src/Makefile.in index 1e3bdbc075e9..6e8b7c5ff654 100644 --- a/toolkit/components/commandlines/src/Makefile.in +++ b/toolkit/components/commandlines/src/Makefile.in @@ -53,13 +53,6 @@ IS_COMPONENT = 1 MODULE_NAME = CommandLineModule LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - necko \ - unicharutil \ - dom \ - $(NULL) CPPSRCS = \ nsCommandLine.cpp \ diff --git a/toolkit/components/downloads/src/Makefile.in b/toolkit/components/downloads/src/Makefile.in index 9b43752c0602..2caff2c372c3 100644 --- a/toolkit/components/downloads/src/Makefile.in +++ b/toolkit/components/downloads/src/Makefile.in @@ -49,27 +49,6 @@ LIBRARY_NAME = download_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - rdf \ - uriloader \ - mimetype \ - necko \ - pref \ - intl \ - windowwatcher \ - webbrowserpersist \ - appshell \ - dom \ - embed_base \ - alerts \ - parentalcontrols \ - storage \ - exthandler \ - docshell \ - toolkitcomps \ - places \ - $(NULL) CPPSRCS = \ nsDownloadManager.cpp \ diff --git a/toolkit/components/feeds/src/Makefile.in b/toolkit/components/feeds/src/Makefile.in index f33379f0a49e..006a1636de4f 100644 --- a/toolkit/components/feeds/src/Makefile.in +++ b/toolkit/components/feeds/src/Makefile.in @@ -48,16 +48,6 @@ MOZILLA_INTERNAL_API = 1 FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - necko \ - string \ - widget \ - dom \ - htmlparser \ - content \ - layout \ - $(NULL) CPPSRCS = nsScriptableUnescapeHTML.cpp \ $(NULL) diff --git a/toolkit/components/filepicker/src/Makefile.in b/toolkit/components/filepicker/src/Makefile.in index 2198eb6df268..24669137e377 100644 --- a/toolkit/components/filepicker/src/Makefile.in +++ b/toolkit/components/filepicker/src/Makefile.in @@ -52,14 +52,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsFileViewModule LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - layout \ - dom \ - string \ - locale \ - autocomplete \ - $(NULL) CPPSRCS = \ nsFileView.cpp \ diff --git a/toolkit/components/parentalcontrols/src/Makefile.in b/toolkit/components/parentalcontrols/src/Makefile.in index e49b80dc2ab8..79d21272f6b2 100644 --- a/toolkit/components/parentalcontrols/src/Makefile.in +++ b/toolkit/components/parentalcontrols/src/Makefile.in @@ -49,12 +49,6 @@ LIBRARY_NAME = parentalcontrols_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - pref \ - gfx \ - widget \ - $(NULL) CPPSRCS = \ nsParentalControlsServiceWin.cpp \ diff --git a/toolkit/components/places/src/Makefile.in b/toolkit/components/places/src/Makefile.in index 8607ef2c6cdd..9087c81a8b8b 100644 --- a/toolkit/components/places/src/Makefile.in +++ b/toolkit/components/places/src/Makefile.in @@ -53,27 +53,6 @@ EXPORT_LIBRARY = 1 MODULE_NAME = nsPlacesModule IS_COMPONENT = 1 -REQUIRES = xpcom \ - string \ - docshell \ - dom \ - morkreader \ - pref \ - necko \ - imglib2 \ - gfx \ - intl \ - layout \ - locale \ - uconv \ - unicharutil \ - autocomplete \ - storage \ - txmgr \ - nkcache \ - widget \ - chardet \ - $(NULL) CPPSRCS = \ nsAnnoProtocolHandler.cpp \ diff --git a/toolkit/components/remote/Makefile.in b/toolkit/components/remote/Makefile.in index 6b781201f718..e34fbc94ca07 100644 --- a/toolkit/components/remote/Makefile.in +++ b/toolkit/components/remote/Makefile.in @@ -51,21 +51,6 @@ MODULE_NAME = RemoteServiceModule LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - appcomps \ - toolkitcomps \ - appshell \ - layout \ - xulapp \ - widget \ - gfx \ - dom \ - content \ - layout \ - docshell \ - $(NULL) XPIDLSRCS = nsIRemoteService.idl diff --git a/toolkit/components/satchel/src/Makefile.in b/toolkit/components/satchel/src/Makefile.in index ce018372dec3..a0c16f3dc7aa 100644 --- a/toolkit/components/satchel/src/Makefile.in +++ b/toolkit/components/satchel/src/Makefile.in @@ -54,25 +54,6 @@ EXTRA_COMPONENTS = \ nsFormAutoComplete.js \ $(NULL) -REQUIRES = \ - xpcom \ - string \ - autocomplete \ - dom \ - layout \ - docshell \ - gfx \ - thebes \ - morkreader \ - necko \ - widget \ - content \ - locale \ - unicharutil \ - pref \ - storage \ - loginmgr \ - $(NULL) CPPSRCS = nsFormFillController.cpp \ nsStorageFormHistory.cpp \ diff --git a/toolkit/components/startup/src/Makefile.in b/toolkit/components/startup/src/Makefile.in index dbeb0c1f3a8f..531123c1fe82 100644 --- a/toolkit/components/startup/src/Makefile.in +++ b/toolkit/components/startup/src/Makefile.in @@ -46,22 +46,6 @@ LIBRARY_NAME = appstartup_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - widget \ - appshell \ - appcomps \ - exthandler \ - dom \ - pref \ - profile \ - embed_base \ - webbrwsr \ - windowwatcher \ - intl \ - xulapp \ - $(NULL) CPPSRCS = \ nsAppStartup.cpp \ diff --git a/toolkit/components/typeaheadfind/src/Makefile.in b/toolkit/components/typeaheadfind/src/Makefile.in index 5481a16163f8..1308e78830db 100644 --- a/toolkit/components/typeaheadfind/src/Makefile.in +++ b/toolkit/components/typeaheadfind/src/Makefile.in @@ -47,28 +47,6 @@ GRE_MODULE = 1 FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = content \ - docshell \ - dom \ - editor \ - find \ - gfx \ - thebes \ - layout \ - locale \ - necko \ - pref \ - string \ - unicharutil \ - uriloader \ - view \ - webshell \ - widget \ - webbrwsr \ - windowwatcher \ - xpcom \ - xuldoc \ - $(NULL) CPPSRCS = \ nsTypeAheadFind.cpp \ diff --git a/toolkit/components/url-classifier/src/Makefile.in b/toolkit/components/url-classifier/src/Makefile.in index 91718674bfb8..68dea3bfd597 100644 --- a/toolkit/components/url-classifier/src/Makefile.in +++ b/toolkit/components/url-classifier/src/Makefile.in @@ -12,16 +12,6 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 -REQUIRES = docshell \ - necko \ - storage \ - string \ - uriloader \ - xpcom \ - pipnss \ - sqlite3 \ - $(ZLIB_REQUIRES) \ - $(NULL) CPPSRCS = \ nsUrlClassifierDBService.cpp \ diff --git a/toolkit/components/url-classifier/tests/Makefile.in b/toolkit/components/url-classifier/tests/Makefile.in index f3ad48c5457c..ea742cb3f984 100644 --- a/toolkit/components/url-classifier/tests/Makefile.in +++ b/toolkit/components/url-classifier/tests/Makefile.in @@ -48,12 +48,6 @@ MODULE = test_url-classifier MOZILLA_INTERNAL_API = 1 -REQUIRES = \ - string \ - url-classifier \ - xpcom \ - necko \ - $(NULL) # mochitest tests DIRS += mochitest \ diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index c9581f70106b..c5650347ec3a 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -45,10 +45,6 @@ MODULE = crashreporter LIBXUL_LIBRARY = 1 LIBRARY_NAME = exception_handler_s -REQUIRES = \ - xpcom \ - string \ - $(NULL) DIRS = \ $(NULL) diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in index 10b9e1fc0192..5330304ede72 100644 --- a/toolkit/crashreporter/client/Makefile.in +++ b/toolkit/crashreporter/client/Makefile.in @@ -46,8 +46,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = crashreporter$(BIN_SUFFIX) DIST_PROGRAM = crashreporter$(BIN_SUFFIX) -REQUIRES = \ - $(NULL) LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 7271d9d9c6d9..09984dcd52a4 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -63,12 +63,6 @@ LIBRARY_NAME=XUL MAKE_FRAMEWORK=1 endif -REQUIRES = \ - xpcom \ - string \ - $(ZLIB_REQUIRES) \ - xulapp \ - $(NULL) ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) CPPSRCS += dlldeps-xul.cpp diff --git a/toolkit/mozapps/update/src/updater/Makefile.in b/toolkit/mozapps/update/src/updater/Makefile.in index 4dcade26af72..1ed973c0a4dc 100644 --- a/toolkit/mozapps/update/src/updater/Makefile.in +++ b/toolkit/mozapps/update/src/updater/Makefile.in @@ -53,10 +53,6 @@ CPPSRCS = \ PROGRAM = updater$(BIN_SUFFIX) -REQUIRES = \ - libmar \ - $(BZ2_REQUIRES) \ - $(NULL) LIBS += \ $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \ diff --git a/toolkit/profile/src/Makefile.in b/toolkit/profile/src/Makefile.in index 04f11ce712b0..3797447f594f 100644 --- a/toolkit/profile/src/Makefile.in +++ b/toolkit/profile/src/Makefile.in @@ -47,10 +47,6 @@ LIBRARY_NAME = profile_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - $(NULL) LOCAL_INCLUDES = \ -I$(srcdir)/../../xre \ diff --git a/toolkit/system/dbus/Makefile.in b/toolkit/system/dbus/Makefile.in index 4687bf597b9c..332558da731e 100644 --- a/toolkit/system/dbus/Makefile.in +++ b/toolkit/system/dbus/Makefile.in @@ -48,11 +48,6 @@ GRE_MODULE = 1 IS_COMPONENT = 1 FORCE_SHARED_LIB = 1 -REQUIRES = xpcom \ - string \ - necko \ - embedcomponents \ - $(NULL) EXTRA_DSO_LDOPTS = \ $(XPCOM_GLUE_LDOPTS) \ diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in index 007575690a9a..917bb7fdbd66 100644 --- a/toolkit/system/gnome/Makefile.in +++ b/toolkit/system/gnome/Makefile.in @@ -47,18 +47,6 @@ LIBRARY_NAME = mozgnome FORCE_SHARED_LIB = 1 IS_COMPONENT = 1 -REQUIRES = \ - xpcom \ - string \ - necko \ - alerts \ - gfx \ - imglib2 \ - intl \ - widget \ - thebes \ - cairo \ - $(NULL) CPPSRCS = \ nsGConfService.cpp \ diff --git a/toolkit/system/osxproxy/Makefile.in b/toolkit/system/osxproxy/Makefile.in index be0c259b14d8..b07a522d28bb 100644 --- a/toolkit/system/osxproxy/Makefile.in +++ b/toolkit/system/osxproxy/Makefile.in @@ -52,11 +52,6 @@ MODULE_NAME = nsOSXProxyModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - necko \ - $(NULL) FRAMEWORKS += \ -framework SystemConfiguration \ diff --git a/toolkit/system/unixproxy/Makefile.in b/toolkit/system/unixproxy/Makefile.in index 9140e606a9d3..0498750c601a 100644 --- a/toolkit/system/unixproxy/Makefile.in +++ b/toolkit/system/unixproxy/Makefile.in @@ -51,12 +51,6 @@ MODULE_NAME = nsUnixProxyModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = \ - xpcom \ - string \ - necko \ - mozgnome \ - $(NULL) EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) diff --git a/toolkit/system/windowsproxy/Makefile.in b/toolkit/system/windowsproxy/Makefile.in index 5ad344b65bda..d54856a623ac 100644 --- a/toolkit/system/windowsproxy/Makefile.in +++ b/toolkit/system/windowsproxy/Makefile.in @@ -52,11 +52,6 @@ MODULE_NAME = nsWindowsProxyModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = \ - necko \ - string \ - xpcom \ - $(NULL) EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index d2cd12e02b78..837e5ba00a22 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -47,31 +47,6 @@ MODULE = xulapp LIBRARY_NAME = xulapp_s LIBXUL_LIBRARY = 1 -REQUIRES = \ - appcomps \ - toolkitcomps \ - appshell \ - chrome \ - content \ - docshell \ - dom \ - embed_base \ - embedcomponents \ - extensions \ - gfx \ - intl \ - js \ - necko \ - pref \ - profile \ - string \ - uriloader \ - widget \ - windowwatcher \ - xpcom \ - xpconnect \ - xpinstall \ - $(NULL) ifdef MOZ_JPROF REQUIRES += jprof diff --git a/toolkit/xre/test/win/Makefile.in b/toolkit/xre/test/win/Makefile.in index 43bc2c7993e5..75048526b4b6 100644 --- a/toolkit/xre/test/win/Makefile.in +++ b/toolkit/xre/test/win/Makefile.in @@ -43,9 +43,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_xulapp -REQUIRES = \ - string \ - $(NULL) CPPSRCS = \ TestXREMakeCommandLineWin.cpp \ diff --git a/tools/codesighs/Makefile.in b/tools/codesighs/Makefile.in index e243f2d325bb..73efdf27b341 100644 --- a/tools/codesighs/Makefile.in +++ b/tools/codesighs/Makefile.in @@ -43,7 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = $(NULL) CSRCS += \ codesighs.c \ diff --git a/tools/jprof/stub/Makefile.in b/tools/jprof/stub/Makefile.in index fb93f5dbc5fa..52757a9673d3 100644 --- a/tools/jprof/stub/Makefile.in +++ b/tools/jprof/stub/Makefile.in @@ -58,7 +58,6 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -REQUIRES = xpcom include $(topsrcdir)/config/rules.mk diff --git a/tools/leaky/Makefile.in b/tools/leaky/Makefile.in index 36d7d4cfba77..b8b9198ff025 100644 --- a/tools/leaky/Makefile.in +++ b/tools/leaky/Makefile.in @@ -56,7 +56,6 @@ CPPSRCS = \ strset.cpp \ $(NULL) -REQUIRES = xpcom LIBS = \ -lbfd \ diff --git a/tools/testy/Makefile.in b/tools/testy/Makefile.in index 3f7799816694..9ab528fc1d04 100644 --- a/tools/testy/Makefile.in +++ b/tools/testy/Makefile.in @@ -9,8 +9,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = testy -REQUIRES = \ - $(NULL) TESTCPPSRCS = Testy.cpp diff --git a/tools/testy/sample/Makefile.in b/tools/testy/sample/Makefile.in index 3249645481ae..1d64c966f855 100644 --- a/tools/testy/sample/Makefile.in +++ b/tools/testy/sample/Makefile.in @@ -8,8 +8,6 @@ LIBRARY_NAME = SimpleTest include $(DEPTH)/config/autoconf.mk MODULE = testy -REQUIRES = \ - $(NULL) LOCAL_INCLUDES = \ -I$(srcdir)/.. \ diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in index 792ea88f7d4a..cd3eba478a8b 100644 --- a/tools/trace-malloc/Makefile.in +++ b/tools/trace-malloc/Makefile.in @@ -42,10 +42,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -REQUIRES = xpcom \ - string \ - tracemalloc \ - $(NULL) SIMPLECSRCS += \ bloatblame.c \ diff --git a/tools/trace-malloc/lib/Makefile.in b/tools/trace-malloc/lib/Makefile.in index 5c4b024c43cc..33b890396ce6 100644 --- a/tools/trace-malloc/lib/Makefile.in +++ b/tools/trace-malloc/lib/Makefile.in @@ -51,7 +51,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom CSRCS = \ nsTraceMalloc.c \ diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in index 6e1af89a2901..a04211ccfede 100644 --- a/uriloader/base/Makefile.in +++ b/uriloader/base/Makefile.in @@ -47,24 +47,6 @@ LIBRARY_NAME = uriloaderbase_s GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - dom \ - exthandler \ - js \ - docshell \ - gfx \ - thebes \ - layout \ - content \ - widget \ - caps \ - intl \ - xpconnect \ - mimetype \ - locale \ - $(NULL) CPPSRCS = \ nsURILoader.cpp \ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index 14ab5e4d857d..2ca00214d170 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -71,22 +71,6 @@ VPATH := $(srcdir) $(srcdir)/$(OSDIR) MODULE = exthandler LIBRARY_NAME = exthandler_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - unicharutil \ - mimetype \ - uriloader \ - necko \ - webshell \ - plugin \ - pref \ - intl \ - uconv \ - docshell \ - windowwatcher \ - embed_base \ - dom \ - $(NULL) ifdef MOZ_PHOENIX REQUIRES += toolkitcomps diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in index 6b83845e9d00..659ce099c9ef 100644 --- a/uriloader/prefetch/Makefile.in +++ b/uriloader/prefetch/Makefile.in @@ -45,19 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = prefetch LIBRARY_NAME = prefetch_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - dom \ - content \ - widget \ - layout \ - string \ - necko \ - uriloader \ - nkcache \ - chardet \ - pref \ - caps \ - $(NULL) CPPSRCS = \ nsPrefetchService.cpp \ diff --git a/view/src/Makefile.in b/view/src/Makefile.in index ffff5980ec39..fd8576311dc7 100644 --- a/view/src/Makefile.in +++ b/view/src/Makefile.in @@ -49,18 +49,6 @@ MODULE_NAME = nsViewModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - gfx \ - widget \ - dom \ - pref \ - thebes \ - cairo \ - content \ - js \ - layout \ - $(NULL) EXTRA_DSO_LIBS = gkgfx diff --git a/widget/src/beos/Makefile.in b/widget/src/beos/Makefile.in index 71a676faa330..d9baa1ef67d9 100644 --- a/widget/src/beos/Makefile.in +++ b/widget/src/beos/Makefile.in @@ -50,25 +50,6 @@ MODULE_NAME = nsWidgetBeOSModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - webshell \ - appshell \ - docshell \ - gfx \ - layout \ - content \ - gfx \ - dom \ - intl \ - uconv \ - necko \ - pref \ - view \ - locale \ - cairo \ - thebes \ - $(NULL) CPPSRCS = \ nsAppShell.cpp \ diff --git a/widget/src/build/Makefile.in b/widget/src/build/Makefile.in index 69e5c98e63ec..63ae889d3aba 100644 --- a/widget/src/build/Makefile.in +++ b/widget/src/build/Makefile.in @@ -50,17 +50,6 @@ RESFILE = widget.res MODULE_NAME = nsWidgetModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - necko \ - uconv \ - gfx \ - dom \ - timer \ - accessibility \ - thebes \ - cairo \ - $(NULL) CPPSRCS = nsWinWidgetFactory.cpp diff --git a/widget/src/cocoa/Makefile.in b/widget/src/cocoa/Makefile.in index 31ac378e9830..b2e86c14fffb 100644 --- a/widget/src/cocoa/Makefile.in +++ b/widget/src/cocoa/Makefile.in @@ -51,27 +51,6 @@ XPIDL_MODULE = widget_cocoa GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - gfx \ - string \ - uconv \ - dom \ - plugin \ - content \ - layout \ - view \ - necko \ - locale \ - pref \ - intl \ - exthandler \ - appshell \ - qcms \ - thebes \ - js \ - xpconnect \ - imglib2 \ - $(NULL) ifdef ACCESSIBILITY REQUIRES += accessibility diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in index 23c3c6fc0100..36d397d7f7f6 100644 --- a/widget/src/gtk2/Makefile.in +++ b/widget/src/gtk2/Makefile.in @@ -52,25 +52,6 @@ LIBXUL_LIBRARY = 1 NATIVE_THEME_SUPPORT = 1 -REQUIRES = xpcom \ - string \ - gfx \ - pref \ - dom \ - docshell \ - necko \ - uconv \ - intl \ - imglib2 \ - view \ - content \ - layout \ - util \ - locale \ - thebes \ - cairo \ - qcms \ - $(NULL) ifdef MOZ_X11 REQUIRES += gtkxtbin diff --git a/widget/src/gtkxtbin/Makefile.in b/widget/src/gtkxtbin/Makefile.in index 70ebeb4ac298..2841fde41fd9 100644 --- a/widget/src/gtkxtbin/Makefile.in +++ b/widget/src/gtkxtbin/Makefile.in @@ -58,7 +58,6 @@ endif EXPORTS = gtk2xtbin.h -REQUIRES = xpcom include $(topsrcdir)/config/rules.mk diff --git a/widget/src/os2/Makefile.in b/widget/src/os2/Makefile.in index 50b526a53b03..3b712778db2b 100644 --- a/widget/src/os2/Makefile.in +++ b/widget/src/os2/Makefile.in @@ -51,24 +51,6 @@ MODULE_NAME = nsWidgetOS2Module GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = gfx \ - xpcom \ - string \ - dom \ - necko \ - uconv \ - intl \ - pref \ - plugin \ - docshell \ - webbrowserpersist \ - content \ - imglib2 \ - unicharutil \ - layout \ - cairo \ - thebes \ - $(NULL) ifdef BUILD_STATIC_LIBS EXPORTS = wdgtos2rc.h diff --git a/widget/src/photon/Makefile.in b/widget/src/photon/Makefile.in index f87ae24e247c..771d1ee9d3c0 100644 --- a/widget/src/photon/Makefile.in +++ b/widget/src/photon/Makefile.in @@ -49,22 +49,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsWidgetPhModule LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - appshell \ - gfx \ - pref \ - dom \ - uconv \ - necko \ - view \ - util \ - docshell\ - layout\ - content\ - webshell\ - intl\ - $(NULL) CPPSRCS = \ PtRawDrawContainer.cpp \ diff --git a/widget/src/qt/Makefile.in b/widget/src/qt/Makefile.in index 2a677e540818..be7bc901d726 100644 --- a/widget/src/qt/Makefile.in +++ b/widget/src/qt/Makefile.in @@ -51,24 +51,6 @@ MODULE_NAME = nsWidgetQtModule GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - gfx \ - pref \ - dom \ - necko \ - uconv \ - intl \ - imglib2 \ - view \ - content \ - layout \ - util \ - locale \ - thebes \ - cairo \ - unicharutil \ - $(NULL) MOCSRCS = \ moc_mozqwidget.cpp \ diff --git a/widget/src/windows/Makefile.in b/widget/src/windows/Makefile.in index c0b73eec9a07..6cdca5fee92f 100644 --- a/widget/src/windows/Makefile.in +++ b/widget/src/windows/Makefile.in @@ -46,33 +46,6 @@ MODULE = widget LIBRARY_NAME = widget_windows LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - dom \ - accessibility \ - content \ - content_xul \ - gfx \ - necko \ - pref \ - plugin \ - timer \ - uconv \ - intl \ - locale \ - webshell \ - docshell \ - layout \ - xuldoc \ - view \ - imglib2 \ - uriloader \ - webbrowserpersist \ - unicharutil \ - thebes \ - cairo \ - qcms \ - $(NULL) CPPSRCS = \ nsWindow.cpp \ diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in index be30cffc5f6c..ec88c4878533 100644 --- a/widget/src/xpwidgets/Makefile.in +++ b/widget/src/xpwidgets/Makefile.in @@ -46,24 +46,6 @@ MODULE = widget LIBRARY_NAME = xpwidgets_s LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - gfx \ - layout \ - content \ - dom \ - imglib2 \ - pref \ - locale \ - necko \ - htmlparser \ - uconv \ - unicharutil \ - view \ - windowwatcher \ - qcms \ - thebes \ - $(NULL) DEFINES += -D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT diff --git a/widget/src/xremoteclient/Makefile.in b/widget/src/xremoteclient/Makefile.in index 8335f685ea73..85c99c5ce57f 100644 --- a/widget/src/xremoteclient/Makefile.in +++ b/widget/src/xremoteclient/Makefile.in @@ -50,9 +50,6 @@ MODULE = xremoteclient LIBRARY_NAME = xremote_client_s FORCE_STATIC_LIB = 1 -REQUIRES = \ - xpcom \ - $(NULL) ifdef MOZ_ENABLE_PHOTON CPPSRCS += PhRemoteClient.cpp diff --git a/xpcom/analysis/Makefile.in b/xpcom/analysis/Makefile.in index 7ce4a11851f2..9dca76e4381c 100644 --- a/xpcom/analysis/Makefile.in +++ b/xpcom/analysis/Makefile.in @@ -7,10 +7,6 @@ include $(DEPTH)/config/autoconf.mk MOZILLA_INTERNAL_API = 1 -REQUIRES = \ - string \ - xpcom \ - $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index 4a5d2451890b..886fbdf240fc 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -48,8 +48,6 @@ LIBRARY_NAME = xpcombase_s GRE_MODULE = 1 MOZILLA_INTERNAL_API =1 -REQUIRES = string \ - $(NULL) CPPSRCS = \ nsAllocator.cpp \ diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index a7bc26cd51aa..d9cbf2df6c7c 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -63,8 +63,6 @@ endif GRE_MODULE = 1 MOZILLA_INTERNAL_API = 1 -REQUIRES = string \ - $(NULL) ifdef NS_TRACE_MALLOC REQUIRES += tracemalloc diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in index 3bcc7b200383..c0631f8ab10e 100644 --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in @@ -48,8 +48,6 @@ LIBRARY_NAME = xpcomcomponents_s GRE_MODULE = 1 MOZILLA_INTERNAL_API = 1 -REQUIRES = string \ - $(NULL) CPPSRCS = \ nsCategoryManager.cpp \ diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in index cb7a95b218df..c90cda24d0a6 100644 --- a/xpcom/ds/Makefile.in +++ b/xpcom/ds/Makefile.in @@ -48,9 +48,6 @@ LIBRARY_NAME = xpcomds_s GRE_MODULE = 1 MOZILLA_INTERNAL_API = 1 -REQUIRES = \ - string \ - $(NULL) CPPSRCS = \ TimeStamp.cpp \ diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in index e595bc5c041e..cc85eb0dedfe 100644 --- a/xpcom/glue/Makefile.in +++ b/xpcom/glue/Makefile.in @@ -51,9 +51,6 @@ MODULE = xpcom LIBRARY_NAME = xpcomglue_s DIST_INSTALL = 1 -REQUIRES = \ - string \ - $(NULL) ifdef NS_TRACE_MALLOC REQUIRES += tracemalloc diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in index 08411fe0c1ff..6857b85b89aa 100644 --- a/xpcom/glue/standalone/Makefile.in +++ b/xpcom/glue/standalone/Makefile.in @@ -49,8 +49,6 @@ MODULE = xpcom LIBRARY_NAME = xpcomglue DIST_INSTALL = 1 -REQUIRES = string \ - $(NULL) LOCAL_INCLUDES = \ -I$(srcdir)/../../build \ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index 778c7d01a814..bf35c09a4977 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -47,8 +47,6 @@ XPIDL_MODULE = xpcom_io LIBRARY_NAME = xpcomio_s GRE_MODULE = 1 MOZILLA_INTERNAL_API = 1 -REQUIRES = string \ - $(NULL) # work around bug 408258 ifdef GNU_CC diff --git a/xpcom/obsolete/Makefile.in b/xpcom/obsolete/Makefile.in index 7b84589077bc..25306d0a3f10 100644 --- a/xpcom/obsolete/Makefile.in +++ b/xpcom/obsolete/Makefile.in @@ -53,9 +53,6 @@ LIBXUL_LIBRARY = 1 DIRS = component -REQUIRES = xpcom \ - string \ - $(NULL) CPPSRCS = \ nsFileSpec.cpp \ diff --git a/xpcom/obsolete/component/Makefile.in b/xpcom/obsolete/component/Makefile.in index 33e9545a0331..26a116f428c5 100644 --- a/xpcom/obsolete/component/Makefile.in +++ b/xpcom/obsolete/component/Makefile.in @@ -54,11 +54,6 @@ IS_COMPONENT = 1 GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - xpcom_obsolete \ - string \ - libreg \ - $(NULL) CPPSRCS = \ nsXPCOMObsolete.cpp \ diff --git a/xpcom/proxy/src/Makefile.in b/xpcom/proxy/src/Makefile.in index 07320eddca29..59a3b42c4efa 100644 --- a/xpcom/proxy/src/Makefile.in +++ b/xpcom/proxy/src/Makefile.in @@ -46,8 +46,6 @@ MODULE = xpcom LIBRARY_NAME = xpcomproxy_s MOZILLA_INTERNAL_API = 1 -REQUIRES = string \ - $(NULL) CPPSRCS = \ nsProxyEvent.cpp \ diff --git a/xpcom/proxy/tests/Makefile.in b/xpcom/proxy/tests/Makefile.in index 55490e5d81e3..170ad294e13a 100644 --- a/xpcom/proxy/tests/Makefile.in +++ b/xpcom/proxy/tests/Makefile.in @@ -44,7 +44,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom_tests XPIDL_MODULE = proxytest -REQUIRES = xpcom CPPSRCS = proxytests.cpp \ proxy-create-threadsafety.cpp \ diff --git a/xpcom/reflect/xptcall/src/Makefile.in b/xpcom/reflect/xptcall/src/Makefile.in index 8fe693cbf590..f2a772f053c6 100644 --- a/xpcom/reflect/xptcall/src/Makefile.in +++ b/xpcom/reflect/xptcall/src/Makefile.in @@ -48,7 +48,6 @@ MOZILLA_INTERNAL_API = 1 DIRS = md -REQUIRES = string CPPSRCS = xptcall.cpp diff --git a/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/xpcom/reflect/xptcall/src/md/os2/Makefile.in index aae936e1e661..88a1caa17762 100644 --- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in @@ -50,7 +50,6 @@ CPPSRCS = \ ../unix/xptcinvoke_gcc_x86_unix.cpp \ xptcstubs_gcc_x86_os2.cpp \ $(NULL) -REQUIRES = string LOCAL_INCLUDES = \ -I$(srcdir)/../unix \ -I$(srcdir)/../../../../xptinfo/src \ diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in index 0c563e0ef3bc..180e18d6061f 100644 --- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -46,7 +46,6 @@ MODULE = xpcom LIBRARY_NAME = xptcmd MOZILLA_INTERNAL_API = 1 -REQUIRES = string # # The default is this buildable, but non-functioning code. diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in index 4ab8dbae3e81..f759896efa37 100644 --- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in @@ -65,7 +65,6 @@ CPPSRCS = xptcinvoke.cpp xptcstubs.cpp endif -REQUIRES = string LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src diff --git a/xpcom/reflect/xptcall/tests/Makefile.in b/xpcom/reflect/xptcall/tests/Makefile.in index a34aa736a1eb..798c89d99fa4 100644 --- a/xpcom/reflect/xptcall/tests/Makefile.in +++ b/xpcom/reflect/xptcall/tests/Makefile.in @@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = TestXPTC SIMPLE_PROGRAMS = TestXPTCInvoke$(BIN_SUFFIX) -REQUIRES = xpcom \ - $(NULL) CPPSRCS = TestXPTCInvoke.cpp diff --git a/xpcom/reflect/xptcall/tests/eVC4/Makefile.in b/xpcom/reflect/xptcall/tests/eVC4/Makefile.in index 0b09d78c8890..002bd8b0cf22 100644 --- a/xpcom/reflect/xptcall/tests/eVC4/Makefile.in +++ b/xpcom/reflect/xptcall/tests/eVC4/Makefile.in @@ -44,7 +44,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = TestXPTC SIMPLE_PROGRAMS = TestXPTCInvoke$(BIN_SUFFIX) -REQUIRES = xpcom \ $(NULL) CPPSRCS = TestXPTCInvoke.cpp diff --git a/xpcom/reflect/xptinfo/src/Makefile.in b/xpcom/reflect/xptinfo/src/Makefile.in index 0fe17b6cd017..71789660ecce 100644 --- a/xpcom/reflect/xptinfo/src/Makefile.in +++ b/xpcom/reflect/xptinfo/src/Makefile.in @@ -46,9 +46,6 @@ MODULE = xpcom LIBRARY_NAME = xptinfo MOZILLA_INTERNAL_API = 1 -REQUIRES = \ - string \ - $(NULL) CPPSRCS = \ xptiFile.cpp \ diff --git a/xpcom/string/src/Makefile.in b/xpcom/string/src/Makefile.in index b552cc2c1616..e7f03b82fa40 100644 --- a/xpcom/string/src/Makefile.in +++ b/xpcom/string/src/Makefile.in @@ -49,8 +49,6 @@ MODULE = string LIBRARY_NAME = string_s MOZILLA_INTERNAL_API = 1 -REQUIRES = xpcom \ - $(NULL) CPPSRCS = \ nsDependentString.cpp \ diff --git a/xpcom/stub/Makefile.in b/xpcom/stub/Makefile.in index 575a584c4877..895f23eaa04e 100644 --- a/xpcom/stub/Makefile.in +++ b/xpcom/stub/Makefile.in @@ -54,8 +54,6 @@ NSDISTMODE = copy GRE_MODULE = 1 MOZILLA_INTERNAL_API = 1 -REQUIRES = string \ - $(NULL) LOCAL_INCLUDES = -I$(srcdir)/../build diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index 8a38e68d3796..225dbde223f4 100644 --- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -57,9 +57,6 @@ ifdef DEHYDRA_PATH DIRS += static-checker endif -REQUIRES = \ - string \ - $(NULL) CPPSRCS = \ nsIFileEnumerator.cpp \ diff --git a/xpcom/tests/external/Makefile.in b/xpcom/tests/external/Makefile.in index f6254929ab0b..8e997e7dc817 100644 --- a/xpcom/tests/external/Makefile.in +++ b/xpcom/tests/external/Makefile.in @@ -44,7 +44,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom -REQUIRES = string CPPSRCS = \ TestMinStringAPI.cpp \ diff --git a/xpcom/tests/static-checker/Makefile.in b/xpcom/tests/static-checker/Makefile.in index 5647b02b52d7..a012dcdbbc7b 100644 --- a/xpcom/tests/static-checker/Makefile.in +++ b/xpcom/tests/static-checker/Makefile.in @@ -129,7 +129,6 @@ STATIC_PASS_TESTCASES = \ $(FLOW_PASS_TESTCASES) \ $(NULL) -REQUIRES = xpcom include $(topsrcdir)/config/rules.mk diff --git a/xpcom/tests/windows/Makefile.in b/xpcom/tests/windows/Makefile.in index d29eb8546d9a..0816d46263e3 100644 --- a/xpcom/tests/windows/Makefile.in +++ b/xpcom/tests/windows/Makefile.in @@ -44,10 +44,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom -REQUIRES = \ - string \ - xpcom \ - $(NULL) include $(topsrcdir)/config/config.mk diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in index b02a5738edb6..290d0866a448 100644 --- a/xpcom/threads/Makefile.in +++ b/xpcom/threads/Makefile.in @@ -52,8 +52,6 @@ LIBRARY_NAME = xpcomthreads_s GRE_MODULE = 1 MOZILLA_INTERNAL_API = 1 -REQUIRES = string \ - $(NULL) CPPSRCS = \ nsEventQueue.cpp \ diff --git a/xpfe/appshell/src/Makefile.in b/xpfe/appshell/src/Makefile.in index b0519e9cf45f..4b0bd263fb56 100644 --- a/xpfe/appshell/src/Makefile.in +++ b/xpfe/appshell/src/Makefile.in @@ -51,30 +51,6 @@ SHORT_LIBNAME = appshell GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - widget \ - docshell \ - webshell \ - gfx \ - thebes \ - layout \ - content \ - dom \ - necko \ - uriloader \ - js \ - locale \ - webbrwsr \ - pref \ - xpconnect \ - intl \ - windowwatcher \ - embed_base \ - caps \ - unicharutil \ - uconv \ - $(NULL) CPPSRCS = \ nsChromeTreeOwner.cpp \ diff --git a/xpfe/browser/src/Makefile.in b/xpfe/browser/src/Makefile.in index 406697b94be6..5d999090c06b 100644 --- a/xpfe/browser/src/Makefile.in +++ b/xpfe/browser/src/Makefile.in @@ -47,22 +47,6 @@ LIBRARY_NAME = mozbrwsr_s FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 MODULE_NAME = nsBrowserModule -REQUIRES = xpcom \ - string \ - necko \ - shistory \ - widget \ - gfx \ - docshell \ - appcomps \ - dom \ - content \ - uriloader \ - places \ - pref \ - webbrwsr \ - windowwatcher \ - $(NULL) ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER)) REQUIRES += toolkitcomps diff --git a/xpfe/components/autocomplete/src/Makefile.in b/xpfe/components/autocomplete/src/Makefile.in index 1e9bb0cd115c..630547c055b6 100644 --- a/xpfe/components/autocomplete/src/Makefile.in +++ b/xpfe/components/autocomplete/src/Makefile.in @@ -50,10 +50,6 @@ MOZILLA_INTERNAL_API = 1 EXPORT_LIBRARY = 1 IS_COMPONENT = 1 -REQUIRES = xpcom \ - string \ - dom \ - $(NULL) CPPSRCS = nsAutoComplete.cpp diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in index bdd0c3e39c7c..49d44cc15935 100644 --- a/xpfe/components/build/Makefile.in +++ b/xpfe/components/build/Makefile.in @@ -49,15 +49,6 @@ IS_COMPONENT = 1 MODULE_NAME = application LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - rdf \ - necko \ - uriloader \ - docshell \ - webshell \ - browser \ - $(NULL) CPPSRCS = nsModule.cpp diff --git a/xpfe/components/directory/Makefile.in b/xpfe/components/directory/Makefile.in index a12fdadfd50e..1edd40a3e2e3 100644 --- a/xpfe/components/directory/Makefile.in +++ b/xpfe/components/directory/Makefile.in @@ -48,22 +48,6 @@ LIBRARY_NAME = directory_s LIBXUL_LIBRARY = 1 XPIDLSRCS = nsIHTTPIndex.idl -REQUIRES = xpcom \ - string \ - necko \ - rdf \ - content \ - layout \ - js \ - xpconnect \ - docshell \ - widget \ - dom \ - webshell \ - uconv \ - pref \ - windowwatcher \ - $(NULL) CPPSRCS = nsDirectoryViewer.cpp diff --git a/xpfe/components/find/src/Makefile.in b/xpfe/components/find/src/Makefile.in index 53bad03a18f0..29a25180c923 100644 --- a/xpfe/components/find/src/Makefile.in +++ b/xpfe/components/find/src/Makefile.in @@ -50,9 +50,6 @@ IS_COMPONENT = 1 MODULE_NAME = nsFindComponent LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - $(NULL) CPPSRCS = \ nsFindService.cpp \ diff --git a/xpfe/components/intl/Makefile.in b/xpfe/components/intl/Makefile.in index 270204b8bc54..a65d874e8951 100644 --- a/xpfe/components/intl/Makefile.in +++ b/xpfe/components/intl/Makefile.in @@ -49,14 +49,6 @@ MODULE_NAME = nsXPIntlModule EXPORT_LIBRARY = 1 IS_COMPONENT = 1 -REQUIRES = xpcom \ - string \ - uconv \ - locale \ - rdf \ - pref \ - necko \ - $(NULL) CPPSRCS= \ nsCharsetMenu.cpp \ diff --git a/xpfe/components/windowds/Makefile.in b/xpfe/components/windowds/Makefile.in index 8f14df27d9b6..019881d7222a 100644 --- a/xpfe/components/windowds/Makefile.in +++ b/xpfe/components/windowds/Makefile.in @@ -50,13 +50,6 @@ LIBXUL_LIBRARY = 1 IS_COMPONENT = 1 EXPORT_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - appshell \ - rdf \ - dom \ - docshell \ - $(NULL) CPPSRCS = nsWindowDataSource.cpp diff --git a/xpinstall/src/Makefile.in b/xpinstall/src/Makefile.in index 1f4e76f859dd..d590d0922c48 100644 --- a/xpinstall/src/Makefile.in +++ b/xpinstall/src/Makefile.in @@ -63,28 +63,6 @@ MODULE_NAME = nsSoftwareUpdate GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -REQUIRES = xpcom \ - string \ - jar \ - caps \ - content \ - necko \ - js \ - pref \ - widget \ - uriloader \ - xpconnect \ - dom \ - windowwatcher \ - appshell \ - docshell \ - layout \ - chrome \ - extensions \ - pipnss \ - pipboot \ - $(ZLIB_REQUIRES) \ - $(NULL) # XXX shouldn't need to export this EXPORTS = nsXPITriggerInfo.h diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in index bac419405af4..373940df0eec 100644 --- a/xulrunner/app/Makefile.in +++ b/xulrunner/app/Makefile.in @@ -74,13 +74,6 @@ ifdef TARGET_XPCOM_ABI DEFINES += -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\" endif -REQUIRES = \ - xpcom \ - string \ - appshell \ - xulapp \ - xulrunner \ - $(NULL) CPPSRCS = nsXULRunnerApp.cpp diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in index 45230a55f7a9..0096d87fb07b 100644 --- a/xulrunner/stub/Makefile.in +++ b/xulrunner/stub/Makefile.in @@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = xulrunner -REQUIRES = xpcom string xulapp CPPSRCS = nsXULStub.cpp