--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@@ -49,18 +49,16 @@ EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = access
endif
IS_COMPONENT = 1
MODULE_NAME = nsAccessibilityModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- $(NULL)
CPPSRCS = nsAccessibilityFactory.cpp
LOCAL_INCLUDES = -I$(srcdir)/../src
SHARED_LIBRARY_LIBS = \
../src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \
../src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@@ -40,33 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsAccessibleWrap.cpp \
nsDocAccessibleWrap.cpp \
nsRootAccessibleWrap.cpp \
nsApplicationAccessibleWrap.cpp \
nsMaiInterfaceComponent.cpp \
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@@ -41,41 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsAccessibleEventData.cpp \
nsARIAGridAccessible.cpp \
nsARIAMap.cpp \
nsDocAccessible.cpp \
nsOuterDocAccessible.cpp \
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -42,36 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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
endif
CPPSRCS = \
nsHTMLAreaAccessible.cpp \
nsHTMLFormControlAccessible.cpp \
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@@ -40,32 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsRootAccessibleWrap.mm \
nsAccessibleWrap.mm \
mozAccessible.mm \
mozDocAccessible.mm \
mozActionElements.mm \
--- a/accessible/src/msaa/Makefile.in
+++ b/accessible/src/msaa/Makefile.in
@@ -40,37 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsAccessibleWrap.cpp \
nsTextAccessibleWrap.cpp \
nsDocAccessibleWrap.cpp \
nsRootAccessibleWrap.cpp \
nsHTMLWin32ObjectAccessible.cpp \
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@@ -40,37 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsAccessibleWrap.cpp \
nsRootAccessibleWrap.cpp \
$(NULL)
EXPORTS = \
--- a/accessible/src/xforms/Makefile.in
+++ b/accessible/src/xforms/Makefile.in
@@ -42,31 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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
endif
CPPSRCS = \
nsXFormsAccessible.cpp \
nsXFormsFormControlsAccessible.cpp \
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -42,31 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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
endif
CPPSRCS = \
nsXULAlertAccessible.cpp \
nsXULColorPickerAccessible.cpp \
--- a/browser/components/about/Makefile.in
+++ b/browser/components/about/Makefile.in
@@ -44,17 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = browserabout
LIBRARY_NAME = browserabout_s
FORCE_STATIC_LIB = 1
FORCE_USE_PIC = 1
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
-REQUIRES = xpcom string necko caps
EXPORTS_NAMESPACES = mozilla/browser
EXPORTS_mozilla/browser = AboutRedirector.h
CPPSRCS = AboutRedirector.cpp
LOCAL_INCLUDES = -I$(srcdir)/../build
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -13,31 +13,16 @@ MODULE_NAME = nsBrowserCompsModule
FORCE_SHARED_LIB = 1
# Because we are an application component, link against the CRT statically
# (on Windows, but only if we're not building our own CRT for jemalloc)
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
CPPSRCS = nsModule.cpp \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
DEFINES += -DPSTOREC_DLL=\"$(subst \,\\,$(WINDIR))\\system32\\pstorec.dll\"
--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -52,22 +52,16 @@ MODULE_NAME = BrowserDirProvide
FORCE_SHARED_LIB = 1
# Because we are an application component, link against the CRT statically
# (on Windows, but only if we're not building our own CRT for jemalloc)
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
-REQUIRES = \
- xpcom \
- string \
- pref \
- xulapp \
- $(NULL)
CPPSRCS = nsBrowserDirectoryProvider.cpp
EXTRA_DSO_LDOPTS = \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \
$(NULL)
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -55,15 +55,14 @@ DEFINES += \
$(NULL)
EXTRA_PP_COMPONENTS = \
FeedConverter.js \
FeedWriter.js \
WebContentConverter.js \
$(NULL)
-REQUIRES = xpcom string necko mimetype
CPPSRCS = nsFeedSniffer.cpp
LOCAL_INCLUDES = -I$(srcdir)/../../build
include $(topsrcdir)/config/rules.mk
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -44,36 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = migration
LIBRARY_NAME = migration_s
FORCE_STATIC_LIB = 1
FORCE_USE_PIC = 1
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 \
nsNetscapeProfileMigratorBase.cpp \
nsSeamonkeyProfileMigrator.cpp \
nsPhoenixProfileMigrator.cpp \
$(NULL)
--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@@ -47,28 +47,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = browserplaces
LIBRARY_NAME = browserplaces_s
FORCE_STATIC_LIB = 1
FORCE_USE_PIC = 1
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
-REQUIRES = \
- xpcom \
- string \
- necko \
- browsercomps \
- toolkitcomps \
- unicharutil \
- htmlparser \
- content \
- places \
- microsummaries \
- $(NULL)
CPPSRCS = nsPlacesImportExportService.cpp
EXTRA_COMPONENTS = nsPlacesTransactionsService.js
include $(topsrcdir)/config/rules.mk
XPIDL_FLAGS += -I$(topsrcdir)/browser/components
--- a/browser/components/privatebrowsing/src/Makefile.in
+++ b/browser/components/privatebrowsing/src/Makefile.in
@@ -45,23 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = privatebrowsing
LIBRARY_NAME = privatebrowsing_s
FORCE_STATIC_LIB = 1
FORCE_USE_PIC = 1
ifndef MOZ_MEMORY
USE_STATIC_LIBS = 1
endif
-REQUIRES = \
- xpcom \
- string \
- necko \
- js \
- xpconnect \
- $(NULL)
CPPSRCS = \
nsPrivateBrowsingServiceWrapper.cpp \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)/../../build
EXTRA_PP_COMPONENTS = \
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -44,31 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = shellservice
FORCE_STATIC_LIB = 1
FORCE_USE_PIC = 1
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
REQUIRES += \
browsercomps \
$(NULL)
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
--- a/build/pymake/pymake/parser.py
+++ b/build/pymake/pymake/parser.py
@@ -59,16 +59,19 @@ class Data(object):
return Data(parserdata.Location(path, 1, 0), str)
def append(self, data):
self.data += 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.
"""
while offset < len(self.data):
c = self.data[offset]
if not c.isspace():
break
@@ -551,17 +554,17 @@ def parsestream(fd, filename):
vname, t, i = parsemakesyntax(d, offset, (), itermakefilechars)
vname.rstrip()
startpos = len(d.data)
if not d.readline():
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'):
currule = False
incfile, t, offset = parsemakesyntax(d, offset, (), itermakefilechars)
condstack[-1].append(parserdata.Include(incfile, kword == 'include'))
continue
@@ -578,32 +581,32 @@ def parsestream(fd, filename):
vname.lstrip()
vname.rstrip()
if token is None:
raise SyntaxError("Malformed override directive, need =", d.getloc(offset))
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':
currule = False
e, token, offset = parsemakesyntax(d, offset, _varsettokens, itermakefilechars)
e.lstrip()
e.rstrip()
if token is None:
condstack[-1].append(parserdata.ExportDirective(e, single=False))
else:
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
if kword == 'unexport':
e, token, offset = parsemakesyntax(d, offset, (), itermakefilechars)
condstack[-1].append(parserdata.UnexportDirective(e))
continue
@@ -621,17 +624,17 @@ def parsestream(fd, filename):
currule = False
if token in _varsettokens:
e.lstrip()
e.rstrip()
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 == '::'
# `e` is targets or target patterns, which can end up as
# * a rule
# * an implicit rule
# * a static pattern rule
# * a target-specific variable definition
@@ -652,17 +655,17 @@ def parsestream(fd, filename):
e, t, offset = parsemakesyntax(d, offset, (), itercommandchars)
condstack[-1].append(parserdata.Command(e))
elif token in _varsettokens:
e.lstrip()
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:
assert token == ':'
# static pattern rule
pattern = e
--- a/build/pymake/pymake/parserdata.py
+++ b/build/pymake/pymake/parserdata.py
@@ -86,17 +86,17 @@ def parsecommandlineargs(args):
if t != '':
overrides.append(_flagescape.sub(r'\\\1', a))
vname = vname.strip()
vnameexp = data.Expansion.fromstring(vname, "Command-line argument")
stmts.append(SetVariable(vnameexp, token=t,
value=val, valueloc=Location('<command-line>', 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)
return stmts, r, ' '.join(overrides)
class Statement(object):
"""
A statement is an abstract object representing a single "chunk" of makefile syntax. Subclasses
@@ -205,30 +205,29 @@ class Command(Statement):
context.currule.addcommand(self.exp)
def dump(self, fd, indent):
print >>fd, "%sCommand %s" % (indent, self.exp,)
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)
if len(vname) == 0:
raise data.DataError("Empty variable name", self.vnameexp.loc)
if self.targetexp is None:
setvariables = [makefile.variables]
@@ -262,17 +261,17 @@ class SetVariable(Statement):
flavor = data.Variables.FLAVOR_SIMPLE
d = parser.Data.fromstring(self.value, self.valueloc)
e, t, o = parser.parsemakesyntax(d, 0, (), parser.iterdata)
value = e.resolvestr(makefile, makefile.variables)
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):
"""
An abstract "condition", either ifeq or ifdef, perhaps negated. Subclasses must implement:
def evaluate(self, makefile)
"""
@@ -364,16 +363,19 @@ class ConditionBlock(Statement):
indent2 = indent + ' '
for c, statements in self._groups:
print >>fd, "%s Condition %s" % (indent, c)
statements.dump(fd, indent2)
print >>fd, "%s ~Condition" % (indent,)
print >>fd, "%s~ConditionBlock" % (indent,)
+ def __iter__(self):
+ return iter(self._groups)
+
class Include(Statement):
__slots__ = ('exp', 'required')
def __init__(self, exp, required):
assert isinstance(exp, (data.Expansion, data.StringExpansion))
self.exp = exp
self.required = required
@@ -481,8 +483,14 @@ class StatementList(list):
def dump(self, fd, indent):
for s in self:
s.dump(fd, indent)
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
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -45,32 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = caps
LIBRARY_NAME = caps
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
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 \
nsSystemPrincipal.cpp \
nsNullPrincipal.cpp \
nsNullPrincipalURI.cpp \
nsJSPrincipals.cpp \
nsScriptSecurityManager.cpp \
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -45,38 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = chrome
LIBRARY_NAME = chrome
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
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 \
nsChromeRegistry.cpp \
nsChromeProtocolHandler.cpp \
$(NULL)
EXTRA_DSO_LDOPTS = \
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -41,56 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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
endif
EXPORTS = \
nsAtomListUtils.h \
nsAttrName.h \
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -50,27 +50,16 @@ DIRS += \
MODULE = content
CPP_UNIT_TESTS = \
TestNativeXMLHttpRequest.cpp \
TestGetURL.cpp \
TestPlainTextSerializer.cpp \
$(NULL)
-REQUIRES += \
- caps \
- content \
- dom \
- js \
- netwerk \
- string \
- xpcom \
- xpconnect \
- htmlparser \
- $(NULL)
XPCSHELL_TESTS = \
unit \
$(NULL)
include $(topsrcdir)/config/rules.mk
_TEST_FILES = test_bug5141.html \
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -41,37 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 = \
CanvasUtils.cpp \
nsCanvasRenderingContext2D.cpp \
$(NULL)
# Canvas 3D Pieces
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -40,36 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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 \
nsEventStateManager.cpp \
nsDOMEvent.cpp \
nsDOMDataContainerEvent.cpp \
nsDOMUIEvent.cpp \
nsDOMKeyboardEvent.cpp \
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -41,45 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsClientRect.h \
$(NULL)
CPPSRCS = \
nsClientRect.cpp \
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -41,48 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsHTMLFragmentContentSink.cpp \
nsHTMLDocument.cpp \
nsImageDocument.cpp \
nsMediaDocument.cpp \
nsPluginDocument.cpp \
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -41,28 +41,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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 \
nsMathMLElementFactory.cpp \
$(NULL)
include $(topsrcdir)/config/config.mk
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -40,48 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsMediaStream.h \
nsMediaCache.h \
$(NULL)
CPPSRCS = \
--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@@ -40,48 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsOggDecoder.h \
$(NULL)
CPPSRCS = \
nsChannelReader.cpp \
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -40,48 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
$(NULL)
CPPSRCS = \
nsWaveDecoder.cpp \
$(NULL)
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -41,26 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = content
LIBRARY_NAME = gkconsmil_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- layout \
- widget \
- gfx \
- unicharutil \
- dom \
- js \
- pref \
- $(NULL)
CPPSRCS = \
nsSMILAnimationController.cpp \
nsSMILAnimationFunction.cpp \
nsSMILCompositor.cpp \
nsSMILFloatType.cpp \
nsSMILInstanceTime.cpp \
nsSMILKeySpline.cpp \
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -42,34 +42,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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 \
nsDOMSVGEvent.cpp \
nsSVGAElement.cpp \
nsSVGAngle.cpp \
nsSVGAnimatedLengthList.cpp \
nsSVGAnimatedNumberList.cpp \
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@@ -40,33 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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 \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -41,39 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsXBLPrototypeBinding.cpp \
nsXBLPrototypeResources.cpp \
nsXBLResourceLoader.cpp \
nsXBLDocumentInfo.cpp \
nsXBLContentSink.cpp \
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -41,31 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsXMLCDATASection.cpp \
nsXMLProcessingInstruction.cpp \
nsXMLStylesheetPI.cpp \
$(NULL)
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -41,39 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsXMLFragmentContentSink.cpp \
nsXMLDocument.cpp \
nsXMLPrettyPrinter.cpp \
$(NULL)
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -41,19 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = transformiix
LIBRARY_NAME = txbase_s
LIBXUL_LIBRARY = 1
-REQUIRES = string \
- xpcom \
- $(NULL)
ifndef MOZ_XSLT_STANDALONE
REQUIRES += unicharutil \
dom \
content \
layout \
pref \
widget \
--- a/content/xslt/src/main/Makefile.in
+++ b/content/xslt/src/main/Makefile.in
@@ -44,21 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MOZILLA_INTERNAL_API = 1
SIMPLE_PROGRAMS = transformiix$(BIN_SUFFIX) testXalan$(BIN_SUFFIX) \
txTestExpr$(BIN_SUFFIX)
ifdef MARK_INC
SIMPLE_PROGRAMS += txXSLTMarkDriver$(BIN_SUFFIX)
endif
-REQUIRES = string \
- xpcom \
- expat \
- jprof \
- $(NULL)
CPP_PROG_LINK = 1
TX_LIBS = \
txxslt_s \
txxpath_s \
txxml_s \
txbase_s \
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -41,20 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = transformiix
LIBRARY_NAME = txxml_s
LIBXUL_LIBRARY = 1
-REQUIRES = \
- string \
- xpcom \
- $(NULL)
ifndef MOZ_XSLT_STANDALONE
REQUIRES += \
js \
xpconnect \
dom \
content \
layout \
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -41,19 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = transformiix
LIBRARY_NAME = txxpath_s
LIBXUL_LIBRARY = 1
-REQUIRES = string \
- xpcom \
- $(NULL)
ifndef MOZ_XSLT_STANDALONE
REQUIRES += dom \
content \
widget \
xpconnect \
js \
unicharutil \
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -41,20 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = transformiix
LIBRARY_NAME = txxslt_s
LIBXUL_LIBRARY = 1
-REQUIRES = \
- string \
- xpcom \
- $(NULL)
ifndef MOZ_XSLT_STANDALONE
REQUIRES += \
dom \
content \
widget \
necko \
unicharutil \
--- a/content/xtf/src/Makefile.in
+++ b/content/xtf/src/Makefile.in
@@ -40,31 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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 \
nsXTFElementWrapper.cpp \
nsXTFInterfaceAggregator.cpp \
nsXTFService.cpp \
nsXTFWeakTearoff.cpp \
$(NULL)
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@@ -44,38 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = xul
ifdef MOZ_XUL
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 += \
nsXULElement.cpp \
nsXULPopupListener.cpp \
$(NULL)
endif
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@@ -41,43 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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
ifdef MOZ_XUL
CPPSRCS += \
nsXULCommandDispatcher.cpp \
nsXULContentSink.cpp \
nsXULDocument.cpp \
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@@ -41,36 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsContentTestNode.cpp \
nsInstantiationNode.cpp \
nsTreeRows.cpp \
nsRDFConInstanceTestNode.cpp \
nsRDFConMemberTestNode.cpp \
--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = mork
LIBRARY_NAME = mork
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsMorkModule
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- $(NULL)
CPPSRCS = nsMorkFactory.cpp
EXPORTS = \
nsMorkCID.h \
nsIMdbFactoryFactory.h \
$(NULL)
--- a/db/mork/src/Makefile.in
+++ b/db/mork/src/Makefile.in
@@ -39,18 +39,16 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = mork
LIBRARY_NAME = msgmork_s
-REQUIRES = xpcom \
- $(NULL)
FORCE_STATIC_LIB=1
LIBXUL_LIBRARY = 1
CPPSRCS = \
orkinHeap.cpp \
morkArray.cpp \
morkAtom.cpp \
morkAtomMap.cpp \
--- a/db/morkreader/Makefile.in
+++ b/db/morkreader/Makefile.in
@@ -48,18 +48,14 @@ DIRS = external
endif
MODULE = morkreader
LIBRARY_NAME = morkreader_s
LIBXUL_LIBRARY = 1
FORCE_STATIC_LIB = 1
EXPORT_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- necko \
- $(NULL)
EXPORTS = nsMorkReader.h
CPPSRCS = nsMorkReader.cpp
include $(topsrcdir)/config/rules.mk
--- a/db/morkreader/external/Makefile.in
+++ b/db/morkreader/external/Makefile.in
@@ -44,20 +44,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = morkreader
LIBRARY_NAME = morkreader_external_s
MOZILLA_INTERNAL_API = 1
FORCE_STATIC_LIB = 1
-REQUIRES = xpcom \
- string \
- necko \
- $(NULL)
CPPSRCS = nsMorkReader.cpp
include $(topsrcdir)/config/rules.mk
nsMorkReader.cpp: $(srcdir)/../nsMorkReader.cpp
$(INSTALL) $^ .
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -46,52 +46,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = docshell
ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
XPIDL_MODULE = docshell_base
endif
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 \
$(NULL)
XPIDLSRCS = \
nsCDefaultURIFixup.idl \
nsIDocShell.idl \
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -47,42 +47,16 @@ MODULE_NAME = docshell_provider
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = docshell
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 \
$(NULL)
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
EXTRA_DSO_LIBS = gkgfx
endif
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@@ -43,30 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = shistory
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 \
nsSHistory.cpp \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@@ -41,27 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = dom
LIBRARY_NAME = jsdomevents_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- js \
- caps \
- xpconnect \
- content \
- widget \
- gfx \
- layout \
- pref \
- $(NULL)
CPPSRCS = \
nsJSEventListener.cpp \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -43,31 +43,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = dom
LIBRARY_NAME = jsdomgeolocation_s
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 \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@@ -41,27 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = dom
LIBRARY_NAME = json_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- content \
- js \
- layout \
- necko \
- pref \
- uconv \
- widget \
- xpconnect \
- $(NULL)
CPPSRCS = \
nsJSON.cpp \
$(NULL)
FORCE_STATIC_LIB = 1
LOCAL_INCLUDES = \
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -44,31 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = jsurl
LIBRARY_NAME = jsurl_s
FORCE_STATIC_LIB = 1
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)
CPPSRCS = nsJSProtocolHandler.cpp
EXPORTS = $(srcdir)/nsJSProtocolHandler.h
--- a/dom/src/offline/Makefile.in
+++ b/dom/src/offline/Makefile.in
@@ -41,33 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -41,32 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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
endif
CPPSRCS = \
nsDOMStorage.cpp \
$(NULL)
--- a/dom/src/threads/Makefile.in
+++ b/dom/src/threads/Makefile.in
@@ -43,34 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = dom
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 \
nsDOMWorker.cpp \
nsDOMWorkerEvents.cpp \
nsDOMWorkerLocation.cpp \
nsDOMWorkerMessageHandler.cpp \
nsDOMWorkerNavigator.cpp \
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -44,38 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = editor
LIBRARY_NAME = composer
EXPORT_LIBRARY = 1
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 \
nsComposerController.cpp \
nsComposerCommands.cpp \
nsComposerDocumentCommands.cpp \
nsComposerRegistration.cpp \
nsEditingSession.cpp \
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@@ -45,35 +45,16 @@ include $(DEPTH)/config/autoconf.mk
ifdef ENABLE_TESTS
DIRS += tests
endif
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
CPPSRCS = \
nsEditor.cpp \
nsEditorCommands.cpp \
nsEditorController.cpp \
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@@ -45,35 +45,16 @@ include $(DEPTH)/config/autoconf.mk
ifdef ENABLE_TESTS
DIRS += tests
endif
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:
CPPSRCS = \
nsEditProperty.cpp \
nsHTMLAbsPosition.cpp \
nsHTMLAnonymousUtils.cpp \
nsHTMLDataTransfer.cpp \
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@@ -45,33 +45,16 @@ include $(DEPTH)/config/autoconf.mk
ifdef ENABLE_TESTS
DIRS += tests
endif
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 \
nsPlaintextEditor.cpp \
nsTextEditUtils.cpp \
nsTextEditRules.cpp \
nsEditorEventListeners.cpp \
nsInternetCiter.cpp \
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -44,19 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = txmgr
LIBRARY_NAME = txmgr
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsTransactionManagerModule
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- $(NULL)
CPPSRCS = \
nsTransactionItem.cpp \
nsTransactionList.cpp \
nsTransactionManager.cpp \
nsTransactionManagerFactory.cpp \
nsTransactionStack.cpp \
$(NULL)
--- a/editor/txmgr/tests/Makefile.in
+++ b/editor/txmgr/tests/Makefile.in
@@ -38,13 +38,12 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-REQUIRES = txmgr xpcom
CPP_UNIT_TESTS = TestTXMgr.cpp
include $(topsrcdir)/config/rules.mk
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@@ -43,26 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = txtsvc
LIBRARY_NAME = txtsvc_s
FORCE_STATIC_LIB = 1
MODULE_NAME = nsTextServicesModule
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- editor \
- gfx \
- layout \
- content \
- dom \
- widget \
- lwbrk \
- $(NULL)
CPPSRCS = \
nsFilteredContentIterator.cpp \
nsTextServicesDocument.cpp \
nsTSDNotifier.cpp \
$(NULL)
--- a/embedding/base/Makefile.in
+++ b/embedding/base/Makefile.in
@@ -44,20 +44,16 @@ VPATH = @srcdir@
DIRS = standalone
MODULE = embed_base
LIBRARY_NAME = embed_base_s
XPIDL_MODULE = embed_base
include $(DEPTH)/config/autoconf.mk
-REQUIRES = xpcom \
- intl \
- embedcomponents \
- $(NULL)
DEFINES += -DMOZILLA_STRICT_API
SDK_HEADERS = \
nsEmbedAPI.h \
nsEmbedCID.h \
$(NULL)
--- a/embedding/base/standalone/Makefile.in
+++ b/embedding/base/standalone/Makefile.in
@@ -42,20 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
MODULE = embed_base
LIBRARY_NAME = embed_base_standalone
XPIDL_MODULE = embed_base
include $(DEPTH)/config/autoconf.mk
-REQUIRES = xpcom \
- intl \
- embedcomponents \
- $(NULL)
DEFINES += -DMOZILLA_STRICT_API -DXPCOM_GLUE
SDK_LIBRARY = \
$(LIB_PREFIX)embed_base_standalone.$(LIB_SUFFIX) \
$(NULL)
include $(srcdir)/../objs.mk
--- a/embedding/browser/activex/src/common/Makefile.in
+++ b/embedding/browser/activex/src/common/Makefile.in
@@ -42,27 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
IEHtmlElement.cpp \
IEHtmlElementCollection.cpp \
ControlSite.cpp \
ControlSiteIPFrame.cpp \
ControlEventSink.cpp \
--- a/embedding/browser/activex/src/control/Makefile.in
+++ b/embedding/browser/activex/src/control/Makefile.in
@@ -43,45 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = mozctl
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 \
MozillaControl.cpp \
MozillaBrowser.cpp \
WebBrowserContainer.cpp \
IEHtmlDocument.cpp \
DropTarget.cpp \
--- a/embedding/browser/activex/src/plugin/Makefile.in
+++ b/embedding/browser/activex/src/plugin/Makefile.in
@@ -56,34 +56,16 @@ ifdef MOZ_FLASH_ACTIVEX_PATCH
RESFILE = MozActiveX-flash.res
else
RESFILE = MozActiveX.res
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 += \
caps \
string \
$(NULL)
endif
XPIFILE = mozactivex.xpi
--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@@ -46,30 +46,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = webbrwsr
LIBRARY_NAME = webbrwsr
IS_COMPONENT = 1
MODULE_NAME = Browser_Embedding_Module
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
endif
CPPSRCS = \
nsWebBrowserModule.cpp \
$(NULL)
--- a/embedding/browser/gtk/src/Makefile.in
+++ b/embedding/browser/gtk/src/Makefile.in
@@ -44,33 +44,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = gtkembedmoz
LIBRARY_NAME = gtkembedmoz
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
endif
CPPSRCS = \
gtkmozembed2.cpp \
EmbedPrivate.cpp \
--- a/embedding/browser/gtk/tests/Makefile.in
+++ b/embedding/browser/gtk/tests/Makefile.in
@@ -39,19 +39,16 @@
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = gtkembedmoz
-REQUIRES = xpcom \
- dom \
- $(NULL)
CPPSRCS = \
TestGtkEmbed.cpp \
TestGtkEmbedNotebook.cpp
ifdef MOZ_X11
CPPSRCS += TestGtkEmbedSocket.cpp \
TestGtkEmbedChild.cpp
--- a/embedding/browser/photon/src/Makefile.in
+++ b/embedding/browser/photon/src/Makefile.in
@@ -41,37 +41,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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 \
EmbedPrintListener.cpp \
EmbedWindow.cpp \
EmbedProgress.cpp \
EmbedContentListener.cpp \
EmbedEventListener.cpp \
--- a/embedding/browser/photon/tests/Makefile.in
+++ b/embedding/browser/photon/tests/Makefile.in
@@ -38,40 +38,16 @@
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
LIBS = \
$(MOZ_COMPONENT_LIBS) \
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -44,40 +44,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = webbrwsr
XPIDL_MODULE = webBrowser_core
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
endif
EXPORTS = \
nsCTooltipTextProvider.h \
$(NULL)
--- a/embedding/componentlib/Makefile.in
+++ b/embedding/componentlib/Makefile.in
@@ -37,18 +37,16 @@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-REQUIRES = xpcom \
- $(NULL)
LOCAL_INCLUDES = -I$(srcdir)
include $(topsrcdir)/config/config.mk
_FINAL_COMPONENT_NAMES := $(shell cat $(FINAL_LINK_COMP_NAMES))
_FINAL_COMPONENT_LIBS := $(shell cat $(FINAL_LINK_COMPS))
_FINAL_LINK_LIBS := $(shell cat $(FINAL_LINK_LIBS))
--- a/embedding/components/appstartup/src/Makefile.in
+++ b/embedding/components/appstartup/src/Makefile.in
@@ -41,19 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = embedcomponents
LIBRARY_NAME = appstartupnotifier_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- $(NULL)
CPPSRCS = nsAppStartupNotifier.cpp \
$(NULL)
EXPORTS = \
nsIAppStartupNotifier.h \
$(NULL)
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -51,37 +51,16 @@ IS_COMPONENT = 1
MODULE_NAME = embedcomponents
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
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
SHARED_LIBRARY_LIBS = \
../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \
../appstartup/src/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \
../find/src/$(LIB_PREFIX)find_s.$(LIB_SUFFIX) \
../webbrowserpersist/src/$(LIB_PREFIX)webbrowserpersist_s.$(LIB_SUFFIX) \
--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@@ -38,26 +38,16 @@
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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
CPPSRCS = \
nsBaseCommandController.cpp \
nsCommandGroup.cpp \
nsCommandManager.cpp \
--- a/embedding/components/find/src/Makefile.in
+++ b/embedding/components/find/src/Makefile.in
@@ -41,35 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a
# static lib.
FORCE_STATIC_LIB = 1
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@@ -41,26 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = embedcomponents
LIBRARY_NAME = printingui_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- dom \
- windowwatcher \
- widget \
- gfx \
- layout \
- uriloader \
- webbrwsr \
- $(NULL)
DIRS = printpde
CMMSRCS = nsPrintingPromptServiceX.mm
CPPSRCS = \
nsPrintProgressParams.cpp \
nsPrintProgress.cpp \
--- a/embedding/components/printingui/src/os2/Makefile.in
+++ b/embedding/components/printingui/src/os2/Makefile.in
@@ -41,33 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsPrintProgressParams.cpp \
nsPrintProgress.cpp \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a
--- a/embedding/components/printingui/src/unixshared/Makefile.in
+++ b/embedding/components/printingui/src/unixshared/Makefile.in
@@ -41,26 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = embedcomponents
LIBRARY_NAME = printingui_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- dom \
- windowwatcher \
- widget \
- gfx \
- layout \
- uriloader \
- webbrwsr \
- $(NULL)
CPPSRCS = \
nsPrintingPromptService.cpp \
nsPrintProgressParams.cpp \
nsPrintProgress.cpp \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a
--- a/embedding/components/printingui/src/win/Makefile.in
+++ b/embedding/components/printingui/src/win/Makefile.in
@@ -41,31 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsPrintProgressParams.cpp \
nsPrintProgress.cpp \
nsPrintDialogUtil.cpp \
$(NULL)
--- a/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/embedding/components/webbrowserpersist/src/Makefile.in
@@ -41,33 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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)
# we don't want the shared lib, but we want to force the creation of a
# static lib.
FORCE_STATIC_LIB = 1
--- a/embedding/components/windowwatcher/src/Makefile.in
+++ b/embedding/components/windowwatcher/src/Makefile.in
@@ -41,36 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsWindowWatcher.cpp \
nsAutoWindowStateHelper.cpp \
$(NULL)
ifdef MOZ_XUL
--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@@ -36,33 +36,16 @@ include $(DEPTH)/config/autoconf.mk
XPI_NAME = winembed
PROGRAM = winEmbed$(BIN_SUFFIX)
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 \
WebBrowserChrome.cpp \
WindowCreator.cpp \
$(NULL)
LIBS = \
--- a/extensions/access-builtin/accessproxy/Makefile.in
+++ b/extensions/access-builtin/accessproxy/Makefile.in
@@ -45,29 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = accessproxy
XPIDL_MODULE = accessproxy
LIBRARY_NAME = accessproxy
ifneq ($(OS_ARCH),WINNT)
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
# Don't install. At the moment we only want to build this extension
# for inclusion in 3rd party assistive technology installers,
# not as part of our own installation
NO_INSTALL = 1
--- a/extensions/auth/Makefile.in
+++ b/extensions/auth/Makefile.in
@@ -49,22 +49,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = auth
LIBRARY_NAME = auth
IS_COMPONENT = 1
EXPORT_LIBRARY = 1
MODULE_NAME = nsAuthModule
LIBXUL_LIBRARY = 1
-REQUIRES = \
- xpcom \
- string \
- necko \
- pref \
- $(NULL)
CPPSRCS = \
nsAuthFactory.cpp \
nsHttpNegotiateAuth.cpp \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -45,29 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = cookie
LIBRARY_NAME = cookie
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
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 \
nsPermission.cpp \
nsPermissionManager.cpp \
nsPopupWindowManager.cpp \
nsCookiePromptService.cpp \
nsCookiePermission.cpp \
--- a/extensions/gnomevfs/Makefile.in
+++ b/extensions/gnomevfs/Makefile.in
@@ -42,23 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = nkgnomevfs
LIBRARY_NAME = nkgnomevfs
SHORT_LIBNAME = nkgnomevfs
IS_COMPONENT = 1
-REQUIRES = xpcom \
- string \
- necko \
- intl \
- mimetype \
- pref \
- $(NULL)
CPPSRCS = \
nsGnomeVFSProtocolHandler.cpp \
$(NULL)
LOCAL_INCLUDES = $(MOZ_GNOMEVFS_CFLAGS)
EXTRA_DSO_LDOPTS = \
--- a/extensions/java/xpcom/glue/Makefile.in
+++ b/extensions/java/xpcom/glue/Makefile.in
@@ -52,19 +52,16 @@ endif
ifeq ($(OS_ARCH),Darwin)
DLL_SUFFIX = .jnilib
endif
CPPSRCS = nsJavaXPCOMGlue.cpp
DEFINES += -DXPCOM_GLUE
-REQUIRES += \
- xpcom \
- $(NULL)
LOCAL_INCLUDES = -I$(JAVA_INCLUDE_PATH)
ifeq ($(OS_ARCH),WINNT)
LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/win32
else
ifeq ($(OS_ARCH),OS2)
LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/OS2
--- a/extensions/java/xpcom/src/Makefile.in
+++ b/extensions/java/xpcom/src/Makefile.in
@@ -45,20 +45,16 @@ MODULE = javaxpcom
LIBRARY_NAME = javaxpcom
LIBXUL_LIBRARY = 1
FORCE_STATIC_LIB = 1
ifndef MOZ_ENABLE_LIBXUL
DEFINES += -DIMPL_XREAPI
endif
-REQUIRES = xpcom \
- string \
- xulapp \
- $(NULL)
CPPSRCS = \
nsAppFileLocProviderProxy.cpp \
nsJavaInterfaces.cpp \
nsJavaWrapper.cpp \
nsJavaXPTCStub.cpp \
nsJavaXPTCStubWeakRef.cpp \
nsJavaXPCOMBindingUtils.cpp \
--- a/extensions/java/xpcom/tools/genifaces/Makefile.in
+++ b/extensions/java/xpcom/tools/genifaces/Makefile.in
@@ -39,21 +39,16 @@ DEPTH = ../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = javaxpcom
-REQUIRES = \
- xpcom \
- string \
- necko \
- $(NULL)
CPPSRCS = GenerateJavaInterfaces.cpp
SIMPLE_PROGRAMS = GenerateJavaInterfaces$(BIN_SUFFIX)
LIBS += \
$(LIBS_DIR) \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
--- a/extensions/java/xpcom/tools/xpidl/Makefile.in
+++ b/extensions/java/xpcom/tools/xpidl/Makefile.in
@@ -41,19 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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
CSRCS = \
xpidl.c \
xpidl_idl.c \
xpidl_util.c \
--- a/extensions/jssh/Makefile.in
+++ b/extensions/jssh/Makefile.in
@@ -7,25 +7,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = jssh
XPIDL_MODULE = jssh
LIBRARY_NAME = jssh
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsJSShModule
-REQUIRES = \
- xpcom \
- js \
- xpconnect \
- string \
- necko \
- caps \
- dom \
- $(NULL)
CPPSRCS = \
nsJSShServer.cpp \
nsJSShModule.cpp \
nsJSSh.cpp \
$(NULL)
XPIDLSRCS = nsIJSShServer.idl \
--- a/extensions/layout-debug/src/Makefile.in
+++ b/extensions/layout-debug/src/Makefile.in
@@ -44,32 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = layout_debug
LIBRARY_NAME = gkdebug
EXPORT_LIBRARY = 1
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 \
nsILayoutDebuggingTools.idl \
$(NULL)
EXPORTS = \
nsLayoutDebugCIID.h \
--- a/extensions/metrics/build/Makefile.in
+++ b/extensions/metrics/build/Makefile.in
@@ -44,21 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = metrics
IS_COMPONENT = 1
LIBRARY_NAME = metrics
SHORT_LIBNAME = metrics
XPI_NAME = metrics
-REQUIRES = \
- xpcom \
- necko \
- content \
- $(NULL)
CPPSRCS = \
nsMetricsModule.cpp \
$(NULL)
SHARED_LIBRARY_LIBS = \
../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \
$(NULL)
--- a/extensions/metrics/src/Makefile.in
+++ b/extensions/metrics/src/Makefile.in
@@ -43,36 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = metrics
LIBRARY_NAME = metrics_s
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 \
nssstubs.c \
$(NULL)
CPPSRCS = \
nsLoadCollector.cpp \
--- a/extensions/metrics/test/Makefile.in
+++ b/extensions/metrics/test/Makefile.in
@@ -38,23 +38,16 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = test_metrics
-REQUIRES = \
- xpcom \
- metrics \
- necko \
- dom \
- content \
- $(NULL)
CPPSRCS = \
TestMetricsConfig.cpp \
TestUICommandCollector.cpp \
$(NULL)
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@@ -44,29 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = permissions
LIBRARY_NAME = permissions
SHORT_LIBNAME = perms
EXPORT_LIBRARY = 1
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 \
nsContentBlocker.cpp \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -48,28 +48,16 @@ LIBRARY_NAME = autoconfig
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = autocfg
endif
EXPORT_LIBRARY = 1
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
CPPSRCS = nsReadConfig.cpp \
nsAutoConfig.cpp \
nsConfigFactory.cpp \
nsJSConfigTriggers.cpp \
$(NULL)
--- a/extensions/pref/system-pref/src/Makefile.in
+++ b/extensions/pref/system-pref/src/Makefile.in
@@ -47,21 +47,16 @@ LIBRARY_NAME = system-pref_s
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = syspref
endif
# We want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- embedcomponents \
- pref \
- $(NULL)
ifdef MOZ_ENABLE_GTK2
DIRS = gconf
endif
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(MOZ_COMPONENT_LIBS) \
--- a/extensions/pref/system-pref/src/gconf/Makefile.in
+++ b/extensions/pref/system-pref/src/gconf/Makefile.in
@@ -41,21 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = system-pref
LIBRARY_NAME = system-pref
LIBXUL_LIBRARY = 1
-REQUIRES = pref \
- string \
- xpcom \
- embedcomponents \
- $(NULL)
CPPSRCS = \
nsSystemPrefService.cpp \
nsSystemPrefFactory.cpp \
$(NULL)
SHARED_LIBRARY_LIBS = ../libsystem-pref_s.a
--- a/extensions/spellcheck/hunspell/src/Makefile.in
+++ b/extensions/spellcheck/hunspell/src/Makefile.in
@@ -40,23 +40,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = hunspell
LIBRARY_NAME = hunspell_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- uconv \
- unicharutil \
- spellchecker \
- xulapp \
- $(NULL)
CPPSRCS = mozHunspell.cpp \
mozHunspellDirProvider.cpp \
$(NULL)
ifndef MOZ_NATIVE_HUNSPELL
CPPSRCS += affentry.cpp \
affixmgr.cpp \
--- a/extensions/spellcheck/osxspell/src/Makefile.in
+++ b/extensions/spellcheck/osxspell/src/Makefile.in
@@ -40,18 +40,14 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = hunspell
LIBRARY_NAME = osxspell_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- spellchecker \
- $(NULL)
CMMSRCS = \
mozOSXSpell.mm \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -45,30 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = spellchecker
LIBRARY_NAME = spellchecker
MODULE_NAME = mozSpellCheckerModule
SHORT_LIBNAME = spellchk
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 \
mozSpellChecker.cpp \
mozPersonalDictionary.cpp \
mozEnglishWordUtils.cpp \
mozGenericWordUtils.cpp \
mozSpellI18NManager.cpp \
--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@@ -50,21 +50,16 @@ LIBRARY_NAME = universalchardet
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsUniversalCharDetModule
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = ucdet
endif
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- uconv \
- chardet \
- $(NULL)
CPPSRCS = \
nsUniversalCharDetModule.cpp \
nsUdetXPCOMWrapper.cpp \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)/../base
--- a/extensions/widgetutils/src/Makefile.in
+++ b/extensions/widgetutils/src/Makefile.in
@@ -46,34 +46,16 @@ MODULE = widgetutils
XPI_NAME = widgetutils
LIBRARY_NAME = widgetutils
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = widgetutils
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
EXTRA_DSO_LDOPTS = \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \
$(NULL)
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -61,20 +61,16 @@ MODULE_OPTIMIZE_FLAGS = -xO5
endif
ifeq ($(OS_ARCH),WINNT)
# FIXME: bug 413019
OS_COMPILE_CFLAGS += -GL-
MODULE_OPTIMIZE_FLAGS = -O2
endif
endif
-REQUIRES = $(PNG_REQUIRES) \
- $(ZLIB_REQUIRES) \
- libpixman \
- $(NULL)
CSRCS = \
cairo.c \
cairo-analysis-surface.c \
cairo-arc.c \
cairo-array.c \
cairo-atomic.c \
cairo-bentley-ottmann.c \
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -43,26 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = gfx
LIBRARY_NAME = gkgfx
EXPORT_LIBRARY = 1
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- widget \
- locale \
- view \
- unicharutil \
- thebes \
- js \
- xpconnect \
- $(NULL)
DIRS = thebes
ifdef MOZ_ENABLE_POSTSCRIPT
DIRS += psshared
endif
CPPSRCS = \
--- a/gfx/src/psshared/Makefile.in
+++ b/gfx/src/psshared/Makefile.in
@@ -41,22 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = gfx
LIBRARY_NAME = gfxpsshar
EXPORT_LIBRARY = 1
GRE_MODULE = 1
-REQUIRES = pref \
- string \
- widget \
- xpcom \
- thebes \
- $(NULL)
LIBXUL_LIBRARY = 1
EXPORTS = nsCUPSShim.h \
nsPaperPS.h \
nsPSPrinters.h\
psSharedCore.h \
$(NULL)
--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@@ -48,28 +48,16 @@ ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = gkgfxthb
endif
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
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
endif
CPPSRCS = \
nsThebesDeviceContext.cpp \
nsThebesRegion.cpp \
--- a/gfx/tests/Makefile.in
+++ b/gfx/tests/Makefile.in
@@ -41,20 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = gfx
MOZILLA_INTERNAL_API = 1
-REQUIRES = xpcom \
- string \
- gfx \
- $(NULL)
CPP_UNIT_TESTS = \
TestColorNames.cpp \
TestRect.cpp \
$(NULL)
LIBS = \
$(call EXPAND_LIBNAME_PATH,gkgfx,../src) \
--- a/gfx/thebes/public/Makefile.in
+++ b/gfx/thebes/public/Makefile.in
@@ -3,19 +3,16 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = thebes
-REQUIRES = cairo \
- unicharutil \
- $(NULL)
EXPORTS = gfxASurface.h \
gfxAlphaRecovery.h \
gfxBlur.h \
gfxColor.h \
gfxContext.h \
gfxFont.h \
gfxFontConstants.h \
--- a/gfx/thebes/src/Makefile.in
+++ b/gfx/thebes/src/Makefile.in
@@ -6,26 +6,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = thebes
LIBRARY_NAME = thebes
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
-REQUIRES = \
- cairo \
- string \
- pref \
- xpcom \
- unicharutil \
- uconv \
- $(LCMS_REQUIRES) \
- qcms \
- $(NULL)
CPPSRCS = \
gfxASurface.cpp \
gfxAlphaRecovery.cpp \
gfxBlur.cpp \
gfxContext.cpp \
gfxImageSurface.cpp \
gfxFont.cpp \
--- a/gfx/thebes/test/Makefile.in
+++ b/gfx/thebes/test/Makefile.in
@@ -40,27 +40,16 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
MOZILLA_INTERNAL_API = 1
include $(DEPTH)/config/autoconf.mk
-REQUIRES = \
- xpcom \
- string \
- thebes \
- cairo \
- pref \
- necko \
- unicharutil \
- nspr \
- qcms \
- $(NULL)
# All platforms
CPPSRCS = \
gfxSurfaceRefCountTest.cpp \
gfxFontSelectionTest.cpp \
gfxTextRunPerfTest.cpp \
gfxWordCacheTest.cpp \
$(NULL)
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -44,24 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = i18n
LIBRARY_NAME = i18n
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsI18nModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- unicharutil \
- uconv \
- lwbrk \
- intl \
- locale \
- $(NULL)
CPPSRCS = \
nsI18nModule.cpp \
$(NULL)
# see also intl/locale/src/Makefile.in
ifneq (,$(filter mac os2 windows, $(MOZ_WIDGET_TOOLKIT)))
LOCALE_DIR = $(MOZ_WIDGET_TOOLKIT)
--- a/intl/chardet/src/Makefile.in
+++ b/intl/chardet/src/Makefile.in
@@ -45,28 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = chardet
LIBRARY_NAME = chardet
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
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 \
nsXMLEncodingObserver.cpp \
nsMetaCharsetObserver.cpp \
nsDetectionAdaptor.cpp \
nsDebugDetector.cpp \
nsCyrillicDetector.cpp \
--- a/intl/chardet/tests/Makefile.in
+++ b/intl/chardet/tests/Makefile.in
@@ -37,19 +37,16 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-REQUIRES = xpcom \
- chardet \
- $(NULL)
PROGRAM = DetectCharset$(BIN_SUFFIX)
CPPSRCS = DetectCharset.cpp
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -41,22 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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)
else
ifeq ($(MOZ_WIDGET_TOOLKIT), cocoa)
DIRS = mac
else
DIRS = unix
--- a/intl/locale/src/mac/Makefile.in
+++ b/intl/locale/src/mac/Makefile.in
@@ -42,21 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = locale
LIBRARY_NAME = platlocale_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- unicharutil \
- uconv \
- $(NULL)
CPPSRCS = \
nsCollationMacUC.cpp \
nsDateTimeFormatMac.cpp \
nsMacLocale.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/intl/locale/src/os2/Makefile.in
+++ b/intl/locale/src/os2/Makefile.in
@@ -43,23 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = locale
LIBRARY_NAME = platlocale_s
EXPORT_LIBRARY = 1
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- unicharutil \
- pref \
- uconv \
- intl \
- $(NULL)
CPPSRCS = \
nsOS2Locale.cpp \
nsCollationOS2.cpp \
nsDateTimeFormatOS2.cpp \
$(NULL)
--- a/intl/locale/src/unix/Makefile.in
+++ b/intl/locale/src/unix/Makefile.in
@@ -42,22 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = locale
LIBRARY_NAME = platlocale_s
FORCE_STATIC_LIB= 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- unicharutil \
- pref \
- uconv \
- $(NULL)
CPPSRCS = \
nsCollationUnix.cpp \
nsDateTimeFormatUnix.cpp \
nsPosixLocale.cpp \
$(NULL)
ifdef ENABLE_TESTS
--- a/intl/locale/src/windows/Makefile.in
+++ b/intl/locale/src/windows/Makefile.in
@@ -42,22 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = locale
LIBRARY_NAME = platlocale_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- unicharutil \
- uconv \
- intl \
- $(NULL)
CPPSRCS = \
nsCollationWin.cpp \
nsDateTimeFormatWin.cpp \
nsIWin32LocaleImpl.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@@ -42,20 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = lwbrk
LIBRARY_NAME = lwbrk_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- unicharutil \
- $(NULL)
CPPSRCS = \
nsJISx4501LineBreaker.cpp \
nsSampleWordBreaker.cpp \
nsSemanticUnitScanner.cpp \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
--- a/intl/lwbrk/tests/Makefile.in
+++ b/intl/lwbrk/tests/Makefile.in
@@ -39,19 +39,16 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = TestLineBreak$(BIN_SUFFIX)
-REQUIRES = xpcom \
- string \
- $(NULL)
CPPSRCS = TestLineBreak.cpp
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)
--- a/intl/strres/src/Makefile.in
+++ b/intl/strres/src/Makefile.in
@@ -42,20 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = intl
LIBRARY_NAME = strres_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- necko \
- $(NULL)
CPPSRCS = \
nsStringBundle.cpp \
nsStringBundleTextOverride.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/native/Makefile.in
+++ b/intl/uconv/native/Makefile.in
@@ -43,21 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = ucnative
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
else
CPPSRCS = nsNativeUConvService.cpp
endif
XPIDLSRCS = \
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -49,23 +49,16 @@ IS_COMPONENT = 1
MODULE_NAME = nsUConvModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
# To avoid conflict with OS/2 system uconv.dll
SHORT_LIBNAME = mozuconv
endif
-REQUIRES = xpcom \
- string \
- intl \
- locale \
- unicharutil \
- necko \
- $(NULL)
CPPSRCS = \
nsUConvModule.cpp \
nsCharsetAliasImp.cpp \
nsConverterInputStream.cpp \
nsConverterOutputStream.cpp \
nsTextToSubURI.cpp \
nsGREResProperties.cpp \
--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@@ -42,21 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = ucvcn
LIBRARY_NAME = ucvcn_s
FORCE_STATIC_LIB=1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- unicharutil \
- uconv \
- $(NULL)
CPPSRCS = \
nsGB2312ToUnicodeV2.cpp \
nsUnicodeToGB2312V2.cpp \
nsGBKToUnicode.cpp \
nsUnicodeToGBK.cpp \
nsISO2022CNToUnicode.cpp \
nsUnicodeToISO2022CN.cpp \
--- a/intl/uconv/ucvibm/Makefile.in
+++ b/intl/uconv/ucvibm/Makefile.in
@@ -43,19 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = ucvibm
LIBRARY_NAME = ucvibm_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- uconv \
- $(NULL)
CPPSRCS = \
nsCP850ToUnicode.cpp \
nsCP852ToUnicode.cpp \
nsCP855ToUnicode.cpp \
nsCP857ToUnicode.cpp \
nsCP862ToUnicode.cpp \
nsCP864ToUnicode.cpp \
--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@@ -43,21 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = ucvja
LIBRARY_NAME = ucvja_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- uconv \
- pref \
- $(NULL)
CPPSRCS = \
nsJapaneseToUnicode.cpp \
nsUnicodeToSJIS.cpp \
nsUnicodeToEUCJP.cpp \
nsUnicodeToISO2022JP.cpp \
nsUnicodeToJISx0201.cpp \
$(NULL)
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@@ -42,20 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = ucvko
LIBRARY_NAME = ucvko_s
FORCE_STATIC_LIB=1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- uconv \
- $(NULL)
CPPSRCS = \
nsEUCKRToUnicode.cpp \
nsUnicodeToEUCKR.cpp \
nsISO2022KRToUnicode.cpp \
nsUnicodeToISO2022KR.cpp \
nsCP949ToUnicode.cpp \
nsUnicodeToCP949.cpp \
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@@ -42,20 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = ucvlatin
LIBRARY_NAME = ucvlatin_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- uconv \
- $(NULL)
CPPSRCS = \
nsAsciiToUnicode.cpp \
nsISO88592ToUnicode.cpp \
nsISO88593ToUnicode.cpp \
nsISO88594ToUnicode.cpp \
nsISO88595ToUnicode.cpp \
nsISO88596ToUnicode.cpp \
--- a/intl/uconv/ucvmath/Makefile.in
+++ b/intl/uconv/ucvmath/Makefile.in
@@ -46,20 +46,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = ucvmath
LIBRARY_NAME = ucvmath
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsUCvMathModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- uconv \
- $(NULL)
LOCAL_INCLUDES = -I$(srcdir)/../util
CPPSRCS = \
nsUnicodeToMathematica1.cpp \
nsUnicodeToMathematica2.cpp \
nsUnicodeToMathematica3.cpp \
nsUnicodeToMathematica4.cpp \
--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@@ -42,19 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = ucvtw
LIBRARY_NAME = ucvtw_s
FORCE_STATIC_LIB=1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- uconv \
- $(NULL)
CPPSRCS = \
nsBIG5ToUnicode.cpp \
nsUnicodeToBIG5.cpp \
nsBIG5HKSCSToUnicode.cpp \
nsUnicodeToBIG5HKSCS.cpp \
nsUnicodeToHKSCS.cpp \
$(NULL)
--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@@ -42,19 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = ucvtw2
LIBRARY_NAME = ucvtw2_s
FORCE_STATIC_LIB=1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- uconv \
- $(NULL)
CPPSRCS = \
nsEUCTWToUnicode.cpp \
nsUnicodeToEUCTW.cpp \
$(NULL)
#SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX)
--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = uconv
LIBRARY_NAME = ucvutil_s
EXPORT_LIBRARY = 1
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
MODULE_NAME = nsUCUtil
-REQUIRES = xpcom \
- $(NULL)
CSRCS = \
ugen.c \
uscan.c \
umap.c \
$(NULL)
CPPSRCS = \
--- a/intl/unicharutil/src/Makefile.in
+++ b/intl/unicharutil/src/Makefile.in
@@ -42,21 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = unicharutil
LIBRARY_NAME = ucharucomp_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- uconv \
- intl \
- $(NULL)
CPPSRCS = \
nsCaseConversionImp2.cpp \
nsCategoryImp.cpp \
nsHankakuToZenkaku.cpp \
nsEntityConverter.cpp \
nsSaveAsCharset.cpp \
nsUnicodeNormalizer.cpp \
--- a/intl/unicharutil/tests/Makefile.in
+++ b/intl/unicharutil/tests/Makefile.in
@@ -40,22 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = test_intl_unicharutil
XPCSHELL_TESTS = unit
-REQUIRES = xpcom \
- string \
- unicharutil \
- necko \
- uconv \
- $(NULL)
CPPSRCS = UnicharSelfTest.cpp \
NormalizationTest.cpp \
$(NULL)
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
LIBS = \
--- a/intl/unicharutil/util/Makefile.in
+++ b/intl/unicharutil/util/Makefile.in
@@ -50,19 +50,16 @@ DIRS = internal
include $(srcdir)/objs.mk
MODULE=unicharutil
LIBRARY_NAME=unicharutil_external_s
DIST_INSTALL = 1
SDK_LIBRARY = $(LIBRARY)
-REQUIRES=xpcom \
- string \
- $(NULL)
SDK_HEADERS = \
nsUnicharUtils.h \
$(NULL)
EXPORTS = \
nsCompressedCharMap.h \
nsBidiUtils.h \
--- a/intl/unicharutil/util/internal/Makefile.in
+++ b/intl/unicharutil/util/internal/Makefile.in
@@ -54,20 +54,16 @@ EXPORT_LIBRARY = 1
MOZILLA_INTERNAL_API = 1
include $(srcdir)/../objs.mk
EXTRA_DEPS += $(srcdir)/../objs.mk
LOCAL_INCLUDES += -I$(srcdir)/.. \
-REQUIRES=xpcom \
- string \
- uconv \
- $(NULL)
CPPSRCS = $(INTL_UNICHARUTIL_UTIL_LCPPSRCS)
FORCE_STATIC_LIB = 1
FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -48,17 +48,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = jsdebug
LIBRARY_NAME = jsd
FORCE_SHARED_LIB= 1
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
LIBRARY_NAME = jsd$(MOZ_BITS)$(VERSION_NUMBER)
endif
# REQUIRES = java js
-REQUIRES = js
ifndef JSD_STANDALONE
REQUIRES += \
string \
xpcom \
xpconnect \
widget \
dom \
--- a/js/src/xpconnect/loader/Makefile.in
+++ b/js/src/xpconnect/loader/Makefile.in
@@ -41,23 +41,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = jsloader
LIBRARY_NAME = jsloader_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- xpconnect \
- js \
- caps \
- necko \
- $(NULL)
CPPSRCS = mozJSComponentLoader.cpp mozJSSubScriptLoader.cpp
EXTRA_JS_MODULES = XPCOMUtils.jsm ISO8601DateUtils.jsm
include $(topsrcdir)/config/rules.mk
DEFINES += -DJSFILE -DJS_THREADSAFE
--- a/js/src/xpconnect/sample/Makefile.in
+++ b/js/src/xpconnect/sample/Makefile.in
@@ -44,20 +44,16 @@ VPATH = @srcdir@
MODULE=xpcsample
LIBRARY_NAME = xpcsample
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = xpconnect_sample
MOZILLA_INTERNAL_API = 1
-REQUIRES = XPCOM \
- XPCONNECT \
- JS \
- $(NULL)
XPIDLSRCS = \
xpcsample1.idl \
$(NULL)
CPPSRCS= \
xpcsample1.cpp \
$(NULL)
--- a/js/src/xpconnect/shell/Makefile.in
+++ b/js/src/xpconnect/shell/Makefile.in
@@ -41,22 +41,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcshell
PROGRAM = xpcshell$(BIN_SUFFIX)
-REQUIRES = xpconnect \
- xpcom \
- js \
- caps \
- xulapp \
- $(NULL)
CPPSRCS = xpcshell.cpp
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
CMMSRCS += xpcshellMacUtils.mm
endif
LIBS = \
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -52,35 +52,19 @@ IS_COMPONENT = 1
MODULE_NAME = xpconnect
GRE_MODULE = 1
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
LIBRARY_NAME = xpc$(MOZ_BITS)$(VERSION_NUMBER)
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 = \
nsScriptError.cpp \
nsXPConnect.cpp \
xpccallcontext.cpp \
xpccomponents.cpp \
xpccontext.cpp \
--- a/js/src/xpconnect/tests/Makefile.in
+++ b/js/src/xpconnect/tests/Makefile.in
@@ -41,22 +41,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = TestXPC
SIMPLE_PROGRAMS = TestXPC$(BIN_SUFFIX)
-REQUIRES = xpconnect \
- xpcom \
- string \
- js \
- xpconnect_tests \
- $(NULL)
DIRS = idl mochitest chrome
ifndef MOZ_ENABLE_LIBXUL
DIRS += components
endif
XPCSHELL_TESTS = unit
--- a/js/src/xpconnect/tests/components/Makefile.in
+++ b/js/src/xpconnect/tests/components/Makefile.in
@@ -46,22 +46,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = xpctest
LIBRARY_NAME = xpctest
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = xpconnect_test
MOZILLA_INTERNAL_API = 1
-REQUIRES = xpconnect \
- xpcom \
- string \
- js \
- xpconnect_tests \
- $(NULL)
CPPSRCS = \
xpctest_array.cpp \
xpctest_echo.cpp \
xpctest_child.cpp \
xpctest_noisy.cpp \
xpctest_overloaded.cpp \
xpctest_string.cpp \
--- a/js/src/xpconnect/tools/src/Makefile.in
+++ b/js/src/xpconnect/tools/src/Makefile.in
@@ -42,21 +42,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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
CPPSRCS = \
nsXPCToolsCompiler.cpp \
nsXPCToolsProfiler.cpp \
nsXPCToolsModule.cpp \
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -47,44 +47,16 @@ DIRS += tests
endif
MODULE = layout
XPIDL_MODULE = layout_base
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
endif
XPIDLSRCS = \
nsIStyleSheetService.idl \
$(NULL)
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -58,49 +58,16 @@ MODULE_NAME = nsLayoutModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
ifndef MOZ_ENABLE_LIBXUL
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 \
nsContentDLF.cpp \
nsLayoutStatics.cpp \
$(NULL)
EXPORTS = \
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -47,39 +47,16 @@ DIRS = $(NULL)
ifdef ENABLE_TESTS
DIRS += test
endif
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
endif
EXPORTS = \
nsIListControlFrame.h \
nsIComboboxControlFrame.h \
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -44,43 +44,16 @@ include $(DEPTH)/config/autoconf.mk
ifdef ENABLE_TESTS
DIRS += test
endif
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
endif
EXPORTS = \
nsQueryFrame.h \
nsFrameList.h \
--- a/layout/html/tests/Makefile.in
+++ b/layout/html/tests/Makefile.in
@@ -39,27 +39,16 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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))
CPPSRCS = \
ParseCSS.cpp \
TestCSSPropertyLookup.cpp \
$(NULL)
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -41,29 +41,16 @@ srcdir=@srcdir@
VPATH=@srcdir@
include $(DEPTH)/config/autoconf.mk
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
endif
CPPSRCS= \
inDeepTreeWalker.cpp \
inFlasher.cpp \
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@@ -43,34 +43,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
-I$(srcdir)/../base \
-I$(srcdir)/../generic \
-I$(srcdir)/../tables \
-I$(srcdir)/content/src \
-I$(topsrcdir)/content/base/src \
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@@ -42,37 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = layout
XPIDL_MODULE = layout_printing
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 \
nsIPrintProgressParams.idl \
nsIPrintStatusFeedback.idl \
$(NULL)
CPPSRCS = \
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -46,39 +46,16 @@ DIRS = xbl-marquee
ifdef ENABLE_TESTS
DIRS += test
endif
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 \
nsCSSAnonBoxes.h \
nsCSSKeywordList.h \
nsCSSKeywords.h \
nsCSSPropList.h \
nsCSSProperty.h \
--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/base/src/Makefile.in
@@ -41,35 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsSVGClipPathFrame.cpp \
nsSVGContainerFrame.cpp \
nsSVGEffects.cpp \
nsSVGFilterFrame.cpp \
nsSVGFilterInstance.cpp \
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -41,31 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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
endif
EXPORTS = \
nsITableCellLayout.h \
nsITableLayout.h \
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -41,36 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 += \
cairo \
libpixman \
$(NULL)
endif
--- a/layout/xul/base/src/grid/Makefile.in
+++ b/layout/xul/base/src/grid/Makefile.in
@@ -40,28 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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 \
nsGridRowLayout.cpp \
nsGridRowLeafLayout.cpp \
nsGridRowLeafFrame.cpp \
nsGridRowGroupLayout.cpp \
nsGridRowGroupFrame.cpp \
--- a/layout/xul/base/src/tree/src/Makefile.in
+++ b/layout/xul/base/src/tree/src/Makefile.in
@@ -40,35 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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 \
nsTreeBoxObject.cpp \
nsTreeColFrame.cpp \
nsTreeColumns.cpp \
nsTreeContentView.cpp \
nsTreeImageListener.cpp \
--- a/modules/lcms/src/Makefile.in
+++ b/modules/lcms/src/Makefile.in
@@ -65,18 +65,16 @@ endif
# Disable PGO for this module in non-libxul builds, where it breaks.
ifndef MOZ_ENABLE_LIBXUL
NO_PROFILE_GUIDED_OPTIMIZE = 1
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 \
cmsxform.c cmssamp.c cmscam97.c cmsnamed.c cmsps2.c cmscam02.c \
cmsvirt.c cmscgats.c cmsio0.c cmsprecache.c
LOCAL_INCLUDES += -I../include
--- a/modules/libimg/png/Makefile.in
+++ b/modules/libimg/png/Makefile.in
@@ -51,18 +51,16 @@ LIBXUL_LIBRARY = 1
ifndef GNU_CC
ifeq ($(OS_ARCH),WINNT)
# FIXME: bug 413019
OS_COMPILE_CFLAGS += -GL-
endif
endif
-REQUIRES = $(ZLIB_REQUIRES) \
- $(NULL)
CSRCS = \
png.c \
pngerror.c \
pngget.c \
pngmem.c \
pngset.c \
pngtrans.c \
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -58,25 +58,16 @@ endif
MODULE = jar
LIBRARY_NAME = jar$(VERSION_NUMBER)
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsJarModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- caps \
- mimetype \
- js \
- xpconnect \
- necko \
- $(ZLIB_REQUIRES) \
- $(NULL)
CPPSRCS = $(MODULES_LIBJAR_LCPPSRCS)
XPIDLSRCS = $(MODULES_LIBJAR_LXPIDLSRCS)
EXPORTS = $(MODULES_LIBJAR_LEXPORTS)
include $(topsrcdir)/config/rules.mk
--- a/modules/libjar/zipwriter/src/Makefile.in
+++ b/modules/libjar/zipwriter/src/Makefile.in
@@ -47,23 +47,16 @@ LIBRARY_NAME = zipwriter
ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
SHORT_LIBNAME = zipwrite
endif
MODULE_NAME = ZipWriterModule
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
IS_COMPONENT = 1
-REQUIRES = \
- xpcom \
- string \
- necko \
- jar \
- $(ZLIB_REQUIRES) \
- $(NULL)
CPPSRCS = \
StreamFunctions.cpp \
nsDeflateConverter.cpp \
nsZipHeader.cpp \
nsZipDataStream.cpp \
nsZipWriter.cpp \
ZipWriterModule.cpp \
--- a/modules/libmar/tool/Makefile.in
+++ b/modules/libmar/tool/Makefile.in
@@ -48,17 +48,16 @@ ifeq ($(OS_ARCH),WINNT)
USE_STATIC_LIBS = 1
endif
# The mar executable is output into dist/host/bin since it is something that
# would only be used by our build system and should not itself be included in a
# Mozilla distribution.
HOST_PROGRAM = mar$(HOST_BIN_SUFFIX)
-REQUIRES = libmar
HOST_CSRCS = \
mar.c \
$(NULL)
HOST_LIBS = $(DIST)/host/lib/$(LIB_PREFIX)hostmar.$(LIB_SUFFIX)
ifeq ($(HOST_OS_ARCH),WINNT)
--- a/modules/libpr0n/build/Makefile.in
+++ b/modules/libpr0n/build/Makefile.in
@@ -45,28 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = imglib2
LIBRARY_NAME = imglib2
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
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 \
$(NULL)
LOCAL_INCLUDES = \
-I. \
-I$(srcdir)/../src \
--- a/modules/libpr0n/decoders/bmp/Makefile.in
+++ b/modules/libpr0n/decoders/bmp/Makefile.in
@@ -44,18 +44,12 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imgbmp
LIBRARY_NAME = imgbmp_s
FORCE_STATIC_LIB = 1
MODULE_NAME = nsBMPModule
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- gfx \
- thebes \
- imglib2 \
- $(NULL)
CPPSRCS = nsBMPDecoder.cpp nsICODecoder.cpp
include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/decoders/gif/Makefile.in
+++ b/modules/libpr0n/decoders/gif/Makefile.in
@@ -43,23 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imggif
LIBRARY_NAME = imggif_s
FORCE_STATIC_LIB = 1
MODULE_NAME = nsGIFModule2
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- gfx \
- thebes \
- imglib2 \
- qcms \
- $(NULL)
CPPSRCS = nsGIFDecoder2.cpp
# nsGIFDecoder2.cpp includes imgContainer.h
LOCAL_INCLUDES += -I$(topsrcdir)/modules/libpr0n/src
include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/decoders/icon/Makefile.in
+++ b/modules/libpr0n/decoders/icon/Makefile.in
@@ -73,23 +73,16 @@ endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
PLATFORM = mac
endif
ifeq ($(OS_ARCH),BeOS)
PLATFORM = beos
endif
-REQUIRES = xpcom \
- string \
- gfx \
- thebes \
- imglib2 \
- necko \
- $(NULL)
CPPSRCS = \
nsIconURI.cpp \
nsIconModule.cpp \
nsIconProtocolHandler.cpp \
$(NULL)
ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
--- a/modules/libpr0n/decoders/icon/beos/Makefile.in
+++ b/modules/libpr0n/decoders/icon/beos/Makefile.in
@@ -41,22 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imgicon
LIBRARY_NAME = imgiconbeos_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- necko \
- intl \
- mimetype \
- $(NULL)
CPPSRCS = nsIconChannel.cpp
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/decoders/icon/gtk/Makefile.in
+++ b/modules/libpr0n/decoders/icon/gtk/Makefile.in
@@ -40,22 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imgicon
LIBRARY_NAME = imgicongtk_s
-REQUIRES = xpcom \
- string \
- necko \
- intl \
- mimetype \
- $(NULL)
CPPSRCS = nsIconChannel.cpp
ifdef MOZ_ENABLE_GNOMEUI
LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS)
else
LOCAL_INCLUDES += $(MOZ_GTK2_CFLAGS)
endif
--- a/modules/libpr0n/decoders/icon/mac/Makefile.in
+++ b/modules/libpr0n/decoders/icon/mac/Makefile.in
@@ -41,21 +41,15 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imgicon
LIBRARY_NAME = imgiconmac_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- necko \
- mimetype \
- exthandler \
- $(NULL)
CMMSRCS = nsIconChannelCocoa.mm
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/decoders/icon/os2/Makefile.in
+++ b/modules/libpr0n/decoders/icon/os2/Makefile.in
@@ -41,23 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imgicon
LIBRARY_NAME = imgiconos2_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- necko \
- mimetype \
- exthandler \
- widget \
- $(NULL)
CPPSRCS = nsIconChannel.cpp
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/decoders/icon/qt/Makefile.in
+++ b/modules/libpr0n/decoders/icon/qt/Makefile.in
@@ -40,23 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imgicon
LIBRARY_NAME = imgiconqt_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- necko \
- intl \
- mimetype \
- gtkqticonsconverter \
- $(NULL)
CPPSRCS = nsIconChannel.cpp
LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
# This library is used by other shared libs in a static build
--- a/modules/libpr0n/decoders/icon/win/Makefile.in
+++ b/modules/libpr0n/decoders/icon/win/Makefile.in
@@ -41,22 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imgicon
LIBRARY_NAME = imgiconwin_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- necko \
- mimetype \
- exthandler \
- $(NULL)
CPPSRCS = nsIconChannel.cpp
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/decoders/jpeg/Makefile.in
+++ b/modules/libpr0n/decoders/jpeg/Makefile.in
@@ -43,23 +43,15 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imgjpeg
LIBRARY_NAME = imgjpeg_s
FORCE_STATIC_LIB = 1
MODULE_NAME = nsJPEGDecoderModule
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- gfx \
- thebes \
- imglib2 \
- $(JPEG_REQUIRES) \
- qcms \
- $(NULL)
CPPSRCS = nsJPEGDecoder.cpp
CSRCS = iccjpeg.c
include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/decoders/png/Makefile.in
+++ b/modules/libpr0n/decoders/png/Makefile.in
@@ -45,25 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = imgpng
LIBRARY_NAME = imgpng_s
FORCE_STATIC_LIB = 1
MODULE_NAME = nsPNGDecoderModule
LIBXUL_LIBRARY = 1
EXTRA_DSO_LIBS = gkgfx
-REQUIRES = xpcom \
- string \
- gfx \
- thebes \
- imglib2 \
- $(PNG_REQUIRES) \
- $(ZLIB_REQUIRES) \
- qcms \
- $(NULL)
CPPSRCS = nsPNGDecoder.cpp
ifneq (,$(filter png,$(MOZ_IMG_ENCODERS)))
DEFINES += -DMOZ_PNG_WRITE
endif
ifneq (,$(filter png,$(MOZ_IMG_DECODERS)))
--- a/modules/libpr0n/encoders/jpeg/Makefile.in
+++ b/modules/libpr0n/encoders/jpeg/Makefile.in
@@ -43,19 +43,14 @@ include $(DEPTH)/config/autoconf.mk
MODULE = imgjpege
LIBRARY_NAME = imgjpege_s
FORCE_STATIC_LIB = 1
MODULE_NAME = imgEncoderJPEGModule
LIBXUL_LIBRARY = 1
EXTRA_DSO_LIBS = gkgfx
-REQUIRES = xpcom \
- string \
- imglib2 \
- $(JPEG_REQUIRES) \
- $(NULL)
CPPSRCS = nsJPEGEncoder.cpp
include $(topsrcdir)/config/rules.mk
--- a/modules/libpr0n/encoders/png/Makefile.in
+++ b/modules/libpr0n/encoders/png/Makefile.in
@@ -43,22 +43,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = imgpnge
LIBRARY_NAME = imgpnge_s
FORCE_STATIC_LIB = 1
MODULE_NAME = imgEncoderPNGModule
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
endif
ifneq (,$(filter png,$(MOZ_IMG_DECODERS)))
DEFINES += -DMOZ_PNG_READ
endif
--- a/modules/libpr0n/src/Makefile.in
+++ b/modules/libpr0n/src/Makefile.in
@@ -44,28 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = imglib2
LIBRARY_NAME = imglib2_s
FORCE_STATIC_LIB = 1
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 \
imgFrame.cpp \
imgLoader.cpp \
imgRequest.cpp \
imgRequestProxy.cpp \
imgTools.cpp
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -48,21 +48,16 @@ EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsPrefModule
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
LIBRARY_NAME = xppref$(MOZ_BITS)
endif
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- intl \
- necko \
- $(NULL)
ifndef MOZ_NO_XPCOM_OBSOLETE
REQUIRES += xpcom_obsolete
endif
include $(topsrcdir)/config/config.mk
CPPSRCS = nsPref.cpp \
--- a/modules/libutil/src/Makefile.in
+++ b/modules/libutil/src/Makefile.in
@@ -39,17 +39,15 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = util
LIBRARY_NAME = mozutil_s
-REQUIRES = xpcom \
- $(NULL)
CPPSRCS = stopwatch.cpp
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@@ -46,40 +46,16 @@ MODULE = plugin
XPIDL_MODULE = layout
LIBRARY_NAME = gkplugin
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
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
endif
CPPSRCS = \
nsNPAPIPlugin.cpp \
nsNPAPIPluginInstance.cpp \
--- a/modules/plugin/default/os2/Makefile.in
+++ b/modules/plugin/default/os2/Makefile.in
@@ -42,20 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = plugin
LIBRARY_NAME = npnulos2
RESFILE = npnulos2.res
-REQUIRES = java \
- xpcom \
- pref \
- $(NULL)
CPPSRCS = \
maindll.cpp \
plugin.cpp \
dbg.cpp \
dialogs.cpp \
npshell.cpp \
npos2.cpp \
--- a/modules/plugin/default/unix/Makefile.in
+++ b/modules/plugin/default/unix/Makefile.in
@@ -41,18 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = plugin
LIBRARY_NAME = nullplugin
GRE_MODULE = 1
-REQUIRES = java \
- $(NULL)
CSRCS = \
npshell.c\
nullplugin.c\
npunix.c\
$(NULL)
# plugins should always be shared, even in the "static" build
--- a/modules/plugin/default/windows/Makefile.in
+++ b/modules/plugin/default/windows/Makefile.in
@@ -43,20 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = plugin
LIBRARY_NAME = npnul32
RESFILE = npnul32.res
DEFFILE = $(win_srcdir)/npnul32.def
GRE_MODULE = 1
-REQUIRES = java \
- xpcom \
- pref \
- $(NULL)
CPPSRCS = \
maindll.cpp \
plugin.cpp \
dbg.cpp \
dialogs.cpp \
npshell.cpp \
npwin.cpp \
--- a/modules/plugin/sdk/samples/basic/windows/Makefile.in
+++ b/modules/plugin/sdk/samples/basic/windows/Makefile.in
@@ -42,18 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
XPIDL_MODULE = npbasic
LIBRARY_NAME = npbasic
NO_DIST_INSTALL = 1
-REQUIRES = plugin \
- $(NULL)
CPPSRCS = plugin.cpp
SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
DEFFILE = $(win_srcdir)/basic.def
RESFILE = basic.res
--- a/modules/plugin/sdk/samples/common/Makefile.in
+++ b/modules/plugin/sdk/samples/common/Makefile.in
@@ -41,18 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = plugingate_s
NO_DIST_INSTALL = 1
-REQUIRES = plugin \
- $(NULL)
CPPSRCS = npn_gate.cpp \
npp_gate.cpp \
np_entry.cpp \
$(NULL)
FORCE_STATIC_LIB = 1
--- a/modules/plugin/sdk/samples/npruntime/Makefile.in
+++ b/modules/plugin/sdk/samples/npruntime/Makefile.in
@@ -40,19 +40,16 @@ NO_INSTALL = 1
CPPSRCS = \
np_entry.cpp \
npn_gate.cpp \
npp_gate.cpp \
plugin.cpp \
$(NULL)
-REQUIRES = \
- plugin \
- $(NULL)
LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public \
-I/usr/lib/glib/include
include $(topsrcdir)/config/rules.mk
install-plugin: $(SHARED_LIBRARY)
ifdef SHARED_LIBRARY
--- a/modules/plugin/sdk/samples/unixprinting/Makefile.in
+++ b/modules/plugin/sdk/samples/unixprinting/Makefile.in
@@ -41,18 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = plugin
LIBRARY_NAME = unixprintplugin
GRE_MODULE = 1
-REQUIRES = java \
- $(NULL)
CSRCS = \
npshell.c \
printplugin.c \
npunix.c \
$(NULL)
# plugins should always be shared, even in the "static" build
--- a/modules/plugin/sdk/samples/winless/windows/Makefile.in
+++ b/modules/plugin/sdk/samples/winless/windows/Makefile.in
@@ -42,18 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
XPIDL_MODULE = npwinless
LIBRARY_NAME = npwinless
NO_DIST_INSTALL = 1
-REQUIRES = plugin \
- $(NULL)
CPPSRCS = plugin.cpp
SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
DEFFILE = $(win_srcdir)/npwinless.def
RESFILE = npwinless.res
--- a/modules/plugin/test/testplugin/Makefile.in
+++ b/modules/plugin/test/testplugin/Makefile.in
@@ -41,19 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = nptest
LIBRARY_NAME = nptest
MODULE_NAME = TestPlugin
-REQUIRES = \
- plugin \
- $(NULL)
# Need to custom install plugins
NO_DIST_INSTALL = 1
NO_INSTALL = 1
CPPSRCS = \
nptest.cpp \
nptest_utils.cpp \
--- a/modules/staticmod/Makefile.in
+++ b/modules/staticmod/Makefile.in
@@ -46,17 +46,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = appmeta
IS_COMPONENT = 1
FORCE_SHARED_LIB = 1
CPPSRCS = nsMetaModule.cpp
-REQUIRES = xpcom
include $(topsrcdir)/config/config.mk
FINAL_COMPONENT_LIBS := $(shell cat $(FINAL_LINK_COMPS))
FINAL_LINK_LIBS := $(shell cat $(FINAL_LINK_LIBS))
SHARED_LIBRARY_LIBS = \
$(foreach c,$(FINAL_COMPONENT_LIBS),$(DIST)/lib/components/$(LIB_PREFIX)$(c).$(LIB_SUFFIX)) \
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -42,23 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = neckobase_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- mimetype \
- uconv \
- locale \
- pref \
- $(NULL)
CPPSRCS = \
nsTransportUtils.cpp \
nsAsyncStreamCopier.cpp \
nsAuthInformationHolder.cpp \
nsBaseChannel.cpp \
nsBaseContentStream.cpp \
nsBufferedStreams.cpp \
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -45,27 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = necko
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
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
SHARED_LIBRARY_LIBS = \
../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
../dns/src/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
../socket/base/$(LIB_PREFIX)neckosocket_s.$(LIB_SUFFIX) \
--- a/netwerk/cache/src/Makefile.in
+++ b/netwerk/cache/src/Makefile.in
@@ -43,21 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = nkcache
LIBRARY_NAME = nkcache_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- necko \
- pref \
- $(NULL)
EXPORTS = \
nsCacheService.h \
$(NULL)
CPPSRCS = \
nsCache.cpp \
nsCacheEntry.cpp \
--- a/netwerk/cookie/src/Makefile.in
+++ b/netwerk/cookie/src/Makefile.in
@@ -41,22 +41,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = neckocookie_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = \
- xpcom \
- string \
- pref \
- storage \
- $(NULL)
CPPSRCS = \
nsCookie.cpp \
nsCookieService.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/netwerk/dns/src/Makefile.in
+++ b/netwerk/dns/src/Makefile.in
@@ -42,21 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = neckodns_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- pref \
- unicharutil \
- $(NULL)
CPPSRCS = nsIDNService.cpp \
nsDNSService2.cpp \
nsHostResolver.cpp \
nsEffectiveTLDService.cpp \
$(NULL)
CSRCS = race.c \
--- a/netwerk/mime/src/Makefile.in
+++ b/netwerk/mime/src/Makefile.in
@@ -41,20 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = mimetype
LIBRARY_NAME = nkmime_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- uconv \
- $(NULL)
CPPSRCS = \
nsMIMEHeaderParamImpl.cpp \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a
# static lib.
FORCE_STATIC_LIB = 1
--- a/netwerk/protocol/about/src/Makefile.in
+++ b/netwerk/protocol/about/src/Makefile.in
@@ -41,20 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkabout_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- nkcache \
- $(NULL)
CPPSRCS = \
nsAboutProtocolHandler.cpp \
nsAboutBlank.cpp \
nsAboutBloat.cpp \
nsAboutCache.cpp \
nsAboutCacheEntry.cpp \
$(NULL)
--- a/netwerk/protocol/data/src/Makefile.in
+++ b/netwerk/protocol/data/src/Makefile.in
@@ -41,19 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkdata_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- $(NULL)
CPPSRCS = \
nsDataHandler.cpp \
nsDataChannel.cpp \
$(NULL)
LOCAL_INCLUDES=-I$(srcdir)/../../../base/src
--- a/netwerk/protocol/file/src/Makefile.in
+++ b/netwerk/protocol/file/src/Makefile.in
@@ -41,21 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkfile_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- mimetype \
- uconv \
- $(NULL)
CPPSRCS = \
nsFileProtocolHandler.cpp \
nsFileChannel.cpp \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a
--- a/netwerk/protocol/ftp/src/Makefile.in
+++ b/netwerk/protocol/ftp/src/Makefile.in
@@ -41,24 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkftp_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- mimetype \
- pref \
- intl \
- nkcache \
- uconv \
- $(NULL)
CPPSRCS = \
nsFtpProtocolHandler.cpp \
nsFTPChannel.cpp \
nsFtpConnectionThread.cpp \
nsFtpControlConnection.cpp \
$(NULL)
--- a/netwerk/protocol/gopher/src/Makefile.in
+++ b/netwerk/protocol/gopher/src/Makefile.in
@@ -42,22 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkgopher_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- mimetype \
- intl \
- uconv \
- $(NULL)
CPPSRCS = \
nsGopherHandler.cpp \
nsGopherChannel.cpp \
$(NULL)
LOCAL_INCLUDES=-I$(srcdir)/../../../base/src
--- a/netwerk/protocol/http/src/Makefile.in
+++ b/netwerk/protocol/http/src/Makefile.in
@@ -41,25 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkhttp_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- pref \
- nkcache \
- mimetype \
- intl \
- unicharutil \
- uconv \
- $(NULL)
CPPSRCS = \
nsHttp.cpp \
nsHttpHeaderArray.cpp \
nsHttpConnectionInfo.cpp \
nsHttpConnection.cpp \
nsHttpConnectionMgr.cpp \
nsHttpRequestHead.cpp \
--- a/netwerk/protocol/res/src/Makefile.in
+++ b/netwerk/protocol/res/src/Makefile.in
@@ -41,20 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkres_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- uconv \
- $(NULL)
CPPSRCS = \
nsResProtocolHandler.cpp \
$(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
# we don't want the shared lib, but we want to force the creation of a
--- a/netwerk/protocol/viewsource/src/Makefile.in
+++ b/netwerk/protocol/viewsource/src/Makefile.in
@@ -42,20 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkviewsource_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- mimetype \
- $(NULL)
CPPSRCS = \
nsViewSourceHandler.cpp \
nsViewSourceChannel.cpp \
$(NULL)
LOCAL_INCLUDES=-I$(srcdir)/../../../base/src
--- a/netwerk/socket/base/Makefile.in
+++ b/netwerk/socket/base/Makefile.in
@@ -43,19 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
XPIDL_MODULE = necko_socket
LIBRARY_NAME = neckosocket_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- $(NULL)
CPPSRCS = \
nsSocketProviderService.cpp \
nsSOCKSSocketProvider.cpp \
nsSOCKSIOLayer.cpp \
nsUDPSocketProvider.cpp \
$(NULL)
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@@ -41,26 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkcnvts_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- mimetype \
- locale \
- intl \
- unicharutil \
- pref \
- uconv \
- $(ZLIB_REQUIRES) \
- $(NULL)
CPPSRCS = \
mozTXTToHTMLConv.cpp \
nsUnknownDecoder.cpp \
nsHTTPCompressConv.cpp \
nsTXTToHTMLConv.cpp \
nsDirIndex.cpp \
nsDirIndexParser.cpp \
--- a/netwerk/streamconv/src/Makefile.in
+++ b/netwerk/streamconv/src/Makefile.in
@@ -41,19 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = nkconv_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- $(NULL)
CPPSRCS = \
nsStreamConverterService.cpp \
$(NULL)
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
ifneq (x86_64,$(OS_TEST))
CPPSRCS += \
--- a/netwerk/streamconv/test/Makefile.in
+++ b/netwerk/streamconv/test/Makefile.in
@@ -40,20 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = TestStreamConv
PROGRAM = TestStreamConv$(BIN_SUFFIX)
-REQUIRES = necko \
- xpcom \
- string \
- $(NULL)
CPPSRCS = \
Converters.cpp \
TestStreamConv.cpp \
$(NULL)
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
--- a/netwerk/system/mac/Makefile.in
+++ b/netwerk/system/mac/Makefile.in
@@ -40,18 +40,15 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = neckosystem_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- $(NULL)
FORCE_STATIC_LIB = 1
CMMSRCS += nsNetworkLinkService.mm
include $(topsrcdir)/config/rules.mk
--- a/netwerk/system/win32/Makefile.in
+++ b/netwerk/system/win32/Makefile.in
@@ -40,20 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = neckosystem_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- pref \
- $(NULL)
FORCE_STATIC_LIB = 1
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += nsNotifyAddrListener.cpp
endif
include $(topsrcdir)/config/rules.mk
--- a/netwerk/system/wince/Makefile.in
+++ b/netwerk/system/wince/Makefile.in
@@ -40,20 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = neckosystem_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- pref \
- $(NULL)
FORCE_STATIC_LIB = 1
CPPSRCS += nsNotifyAddrListener.cpp
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@@ -44,21 +44,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = test_necko
DIRS = \
httpserver \
$(NULL)
-REQUIRES = xpcom \
- string \
- necko \
- pref \
- $(NULL)
CPPSRCS = \
TestIncrementalDownload.cpp \
TestStreamLoader.cpp \
PropertiesTest.cpp \
urltest.cpp \
TestCallbacks.cpp \
TestPageLoad.cpp \
--- a/netwerk/wifi/src/Makefile.in
+++ b/netwerk/wifi/src/Makefile.in
@@ -41,22 +41,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = neckowifi_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = \
- xpcom \
- string \
- pref \
- storage \
- $(NULL)
CPPSRCS = nsWifiMonitor.cpp \
nsWifiAccessPoint.cpp \
$(NULL)
ifeq ($(OS_ARCH),Darwin)
CPPSRCS += nsWifiScannerMac.cpp
else
--- a/parser/html/Makefile.in
+++ b/parser/html/Makefile.in
@@ -40,37 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
$(NULL)
CPPSRCS = \
nsHtml5Atoms.cpp \
nsHtml5Parser.cpp \
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -45,35 +45,16 @@ MODULE = htmlparser
LIBRARY_NAME = htmlpars
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsParserModule
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) \
$(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \
$(NULL)
ifdef MOZ_PERF_METRICS
SHARED_LIBRARY_LIBS += $(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
--- a/parser/htmlparser/tests/grabpage/Makefile.in
+++ b/parser/htmlparser/tests/grabpage/Makefile.in
@@ -39,20 +39,16 @@ DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = grabpage$(BIN_SUFFIX)
-REQUIRES = xpcom \
- string \
- necko \
- $(NULL)
CPPSRCS = grabpage.cpp
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)
--- a/parser/htmlparser/tests/html/Makefile.in
+++ b/parser/htmlparser/tests/html/Makefile.in
@@ -39,21 +39,16 @@ DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = TestParser$(BIN_SUFFIX)
-REQUIRES = xpcom \
- string \
- necko \
- content \
- $(NULL)
CPPSRCS = \
TestParser.cpp\
$(NULL)
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \
--- a/parser/htmlparser/tests/logparse/Makefile.in
+++ b/parser/htmlparser/tests/logparse/Makefile.in
@@ -40,22 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = logparse$(BIN_SUFFIX)
MOZILLA_INTERNAL_API = 1
-REQUIRES = \
- xpcom \
- string \
- necko \
- htmlparser \
- $(NULL)
CPPSRCS = \
logparse.cpp\
$(NULL)
LIBS = \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
--- a/parser/htmlparser/tests/outsinks/Makefile.in
+++ b/parser/htmlparser/tests/outsinks/Makefile.in
@@ -40,23 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = TestOutput$(BIN_SUFFIX)
MOZILLA_INTERNAL_API = 1
-REQUIRES = xpcom \
- string \
- htmlparser \
- necko \
- layout \
- content \
- $(NULL)
CPPSRCS = \
Convert.cpp \
$(NULL)
LIBS = \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
--- a/parser/xml/src/Makefile.in
+++ b/parser/xml/src/Makefile.in
@@ -42,25 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xml
LIBRARY_NAME = saxp
MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1
-REQUIRES = \
- necko \
- xpcom \
- string \
- htmlparser \
- content \
- uconv \
- xpconnect \
- $(NULL)
CPPSRCS = \
nsSAXAttributes.cpp \
nsSAXLocator.cpp \
nsSAXXMLReader.cpp \
$(NULL)
EXPORTS = \
--- a/profile/dirserviceprovider/src/Makefile.in
+++ b/profile/dirserviceprovider/src/Makefile.in
@@ -41,18 +41,15 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(srcdir)/objs.mk
MODULE = profdirserviceprovider
LIBRARY_NAME = profdirserviceprovider_s
MOZILLA_INTERNAL_API = 1
-REQUIRES = xpcom \
- string \
- $(NULL)
CPPSRCS = $(MODULES_PROFILEDIRSERVICE_SRC_LCSRCS)
# we don't want the shared lib
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/profile/dirserviceprovider/standalone/Makefile.in
+++ b/profile/dirserviceprovider/standalone/Makefile.in
@@ -39,19 +39,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(srcdir)/../src/objs.mk
MODULE = profdirserviceprovider
LIBRARY_NAME = profdirserviceprovidersa_s
-REQUIRES = xpcom \
- string \
- $(NULL)
CPPSRCS = $(MODULES_PROFILEDIRSERVICE_SRC_LCSRCS)
# we don't want the shared lib
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/rdf/base/src/Makefile.in
+++ b/rdf/base/src/Makefile.in
@@ -41,27 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = rdf
LIBRARY_NAME = rdfbase_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- rdfutil \
- js \
- caps \
- necko \
- content \
- htmlparser \
- xpconnect \
- unicharutil \
- $(NULL)
CPPSRCS = \
rdfTriplesSerializer.cpp \
nsCompositeDataSource.cpp \
nsContainerEnumerator.cpp \
nsDefaultResourceFactory.cpp \
nsInMemoryDataSource.cpp \
nsNameSpaceMap.cpp \
--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@@ -47,22 +47,16 @@ MODULE = rdf
LIBRARY_NAME = rdf
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsRDFModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
EXTRA_DSO_LIBS =
-REQUIRES = xpcom \
- string \
- content \
- htmlparser \
- necko \
- $(NULL)
CPPSRCS = \
nsRDFModule.cpp \
$(NULL)
# XXX Note dependencies on implementation headers for factory functions
SHARED_LIBRARY_LIBS = \
--- a/rdf/datasource/src/Makefile.in
+++ b/rdf/datasource/src/Makefile.in
@@ -41,20 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = rdf
LIBRARY_NAME = rdfdatasource_s
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- necko \
- $(NULL)
CPPSRCS = \
nsLocalStore.cpp \
nsFileSystemDataSource.cpp \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
--- a/rdf/tests/dsds/Makefile.in
+++ b/rdf/tests/dsds/Makefile.in
@@ -40,20 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = rdf
MOZILLA_INTERNAL_API = 1
-REQUIRES = xpcom \
- string \
- necko \
- $(NULL)
LIBRARY_NAME = rdfdsds
IS_COMPONENT = 1
CPPSRCS = \
nsRDFDataSourceDS.cpp \
nsRDFDataSourceFactory.cpp \
--- a/rdf/tests/rdfcat/Makefile.in
+++ b/rdf/tests/rdfcat/Makefile.in
@@ -40,20 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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) \
$(LIBS_DIR) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)
--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@@ -40,21 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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) \
$(LIBS_DIR) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)
--- a/rdf/tests/triplescat/Makefile.in
+++ b/rdf/tests/triplescat/Makefile.in
@@ -41,21 +41,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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) \
$(LIBS_DIR) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)
--- a/rdf/util/src/Makefile.in
+++ b/rdf/util/src/Makefile.in
@@ -51,20 +51,16 @@ DIRS = internal
include $(srcdir)/objs.mk
EXTRA_DEPS += $(srcdir)/objs.mk
MODULE = rdfutil
LIBRARY_NAME = rdfutil_external_s
DIST_INSTALL = 1
-REQUIRES = xpcom \
- string \
- rdf \
- $(NULL)
CPPSRCS = $(RDF_UTIL_SRC_LCPPSRCS)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/rdf/util/src/internal/Makefile.in
+++ b/rdf/util/src/internal/Makefile.in
@@ -49,20 +49,16 @@ include $(DEPTH)/config/autoconf.mk
include $(srcdir)/../objs.mk
EXTRA_DEPS += $(srcdir)/../objs.mk
MODULE = rdfutil
LIBRARY_NAME = rdfutil_s
MOZILLA_INTERNAL_API = 1
-REQUIRES = xpcom \
- string \
- rdf \
- $(NULL)
CPPSRCS = $(RDF_UTIL_SRC_LCPPSRCS)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@@ -55,32 +55,16 @@ LIBXUL_LIBRARY = 1
CPPSRCS = \
nsEntropyCollector.cpp \
nsSecureBrowserUIImpl.cpp \
nsBOOTModule.cpp \
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
INCLUDES += \
-I$(DIST)/public/nss \
$(NULL)
EXTRA_DSO_LDOPTS += \
--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@@ -58,27 +58,16 @@ CPPSRCS = \
nsNSSDialogs.cpp \
nsPKIModule.cpp \
nsPKIParamBlock.cpp \
nsASN1Tree.cpp \
nsNSSDialogHelper.cpp \
nsFormSigningDialog.cpp \
$(NULL)
-REQUIRES = nspr \
- xpcom \
- string \
- dom \
- intl \
- locale \
- windowwatcher \
- necko \
- pipnss \
- layout \
- $(NULL)
INCLUDES += \
-I$(DIST)/public/nss \
$(NULL)
EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -105,37 +105,16 @@ CPPSRCS = \
$(NULL)
ifdef MOZ_XUL
CPPSRCS += nsCertTree.cpp
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)
DEFINES += -DNSS_ENABLE_ECC
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
LOCAL_INCLUDES += $(NSS_CFLAGS)
--- a/storage/build/Makefile.in
+++ b/storage/build/Makefile.in
@@ -47,23 +47,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = storage
LIBRARY_NAME = storagecomps
SHORT_LIBNAME = strgcmps
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = mozStorageModule
LIBXUL_LIBRARY = 1
-REQUIRES = \
- sqlite3 \
- xpcom \
- string \
- js \
- xpconnect \
- $(NULL)
EXPORTS = mozStorageCID.h
CPPSRCS = mozStorageModule.cpp
LOCAL_INCLUDES = \
$(SQLITE_CFLAGS) \
-I$(srcdir)/../src
--- a/storage/src/Makefile.in
+++ b/storage/src/Makefile.in
@@ -48,23 +48,16 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1
MODULE = storage
LIBRARY_NAME = storage_s
MODULE_NAME = mozStorageModule
FORCE_STATIC_LIB = 1
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- sqlite3 \
- js \
- xpconnect \
- necko \
- $(NULL)
EXPORTS_NAMESPACES = mozilla/storage
EXPORTS_mozilla/storage = \
Variant.h \
Variant_inl.h \
$(NULL)
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@@ -61,21 +61,16 @@ ifneq ($(OS_ARCH), WINNT)
ifneq ($(OS_ARCH), WINCE)
CPP_UNIT_TESTS += \
test_deadlock_detector.cpp \
$(NULL)
endif
endif
endif
-REQUIRES = \
- xpcom \
- string \
- storage \
- $(NULL)
LOCAL_INCLUDES = \
-I$(srcdir)/../src \
$(NULL)
LIBS = \
$(LIBS_DIR) \
$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
--- a/testing/mochitest/ssltunnel/Makefile.in
+++ b/testing/mochitest/ssltunnel/Makefile.in
@@ -45,20 +45,16 @@ include $(DEPTH)/config/autoconf.mk
PROGRAM = ssltunnel$(BIN_SUFFIX)
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
LOCAL_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS)
LIBS = \
$(NSPR_LIBS) \
$(NSS_LIBS) \
--- a/toolkit/components/alerts/src/Makefile.in
+++ b/toolkit/components/alerts/src/Makefile.in
@@ -43,23 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = alerts
LIBRARY_NAME = alerts_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- windowwatcher \
- dom \
- widget \
- gfx \
- $(NULL)
CPPSRCS = \
nsAlertsService.cpp \
$(NULL)
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/alerts/src/mac/Makefile.in
+++ b/toolkit/components/alerts/src/mac/Makefile.in
@@ -41,27 +41,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = alerts
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 \
mozGrowlDelegate.mm \
nsAlertsImageLoadListener.mm \
nsNotificationsList.mm \
$(NULL)
--- a/toolkit/components/autocomplete/src/Makefile.in
+++ b/toolkit/components/autocomplete/src/Makefile.in
@@ -46,24 +46,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = autocomplete
MODULE_NAME = tkAutoCompleteModule
LIBRARY_NAME = tkautocomplete
SHORT_LIBNAME = tkautoc
IS_COMPONENT = 1
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- dom \
- layout \
- unicharutil \
- toolkitcomps \
- necko \
- $(NULL)
CPPSRCS = nsAutoCompleteController.cpp \
nsAutoCompleteSimpleResult.cpp \
$(NULL)
EXTRA_DSO_LDOPTS += \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -50,45 +50,16 @@ IS_COMPONENT = 1
MODULE_NAME = nsToolkitCompsModule
LIBXUL_LIBRARY = 1
ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2))
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
endif
EXPORTS = nsToolkitCompsCID.h
CPPSRCS = nsToolkitCompsModule.cpp
--- a/toolkit/components/commandlines/src/Makefile.in
+++ b/toolkit/components/commandlines/src/Makefile.in
@@ -48,23 +48,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = toolkitcomps
LIBRARY_NAME = commandlines
SHORT_LIBNAME = cmdlines
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = CommandLineModule
LIBXUL_LIBRARY = 1
-REQUIRES = \
- xpcom \
- string \
- necko \
- unicharutil \
- dom \
- $(NULL)
CPPSRCS = \
nsCommandLine.cpp \
$(NULL)
EXTRA_DSO_LDOPTS += \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
--- a/toolkit/components/downloads/src/Makefile.in
+++ b/toolkit/components/downloads/src/Makefile.in
@@ -44,37 +44,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = downloads
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 \
$(NULL)
ifndef GNU_CXX
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += nsDownloadScanner.cpp
--- a/toolkit/components/feeds/src/Makefile.in
+++ b/toolkit/components/feeds/src/Makefile.in
@@ -43,25 +43,15 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = feeds
LIBRARY_NAME = feed_s
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)
EXTRA_COMPONENTS = FeedProcessor.js
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/filepicker/src/Makefile.in
+++ b/toolkit/components/filepicker/src/Makefile.in
@@ -47,24 +47,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = filepicker
LIBRARY_NAME = fileview
SHORT_LIBNAME = fileview
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsFileViewModule
LIBXUL_LIBRARY = 1
-REQUIRES = \
- xpcom \
- layout \
- dom \
- string \
- locale \
- autocomplete \
- $(NULL)
CPPSRCS = \
nsFileView.cpp \
$(NULL)
EXTRA_COMPONENTS = nsFilePicker.js
GARBAGE += nsFilePicker.js
--- a/toolkit/components/parentalcontrols/src/Makefile.in
+++ b/toolkit/components/parentalcontrols/src/Makefile.in
@@ -44,20 +44,14 @@ VPATH = $(srcdir)
include $(DEPTH)/config/autoconf.mk
MODULE = parentalcontrols
LIBRARY_NAME = parentalcontrols_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- pref \
- gfx \
- widget \
- $(NULL)
CPPSRCS = \
nsParentalControlsServiceWin.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/places/src/Makefile.in
+++ b/toolkit/components/places/src/Makefile.in
@@ -48,37 +48,16 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1
MODULE = places
LIBRARY_NAME = places
LIBXUL_LIBRARY = 1
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 \
nsAnnotationService.cpp \
nsFaviconService.cpp \
nsNavHistory.cpp \
nsNavHistoryExpire.cpp \
nsNavHistoryQuery.cpp \
--- a/toolkit/components/remote/Makefile.in
+++ b/toolkit/components/remote/Makefile.in
@@ -46,31 +46,16 @@ MODULE = toolkitcomps
XPIDL_MODULE = toolkitremote
LIBRARY_NAME = remoteservice
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = RemoteServiceModule
LIBXUL_LIBRARY = 1
-REQUIRES = \
- xpcom \
- string \
- appcomps \
- toolkitcomps \
- appshell \
- layout \
- xulapp \
- widget \
- gfx \
- dom \
- content \
- layout \
- docshell \
- $(NULL)
XPIDLSRCS = nsIRemoteService.idl
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
CPPSRCS += nsGTKRemoteService.cpp
endif
ifeq (photon,$(MOZ_WIDGET_TOOLKIT))
--- a/toolkit/components/satchel/src/Makefile.in
+++ b/toolkit/components/satchel/src/Makefile.in
@@ -49,35 +49,16 @@ MODULE_NAME = satchel
IS_COMPONENT = 1
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
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 \
$(NULL)
LOCAL_INCLUDES = \
-I$(srcdir)/../../build \
$(NULL)
--- a/toolkit/components/startup/src/Makefile.in
+++ b/toolkit/components/startup/src/Makefile.in
@@ -41,32 +41,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = toolkitcomps
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 \
$(NULL)
ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += nsUserInfoOS2.cpp
else
--- a/toolkit/components/typeaheadfind/src/Makefile.in
+++ b/toolkit/components/typeaheadfind/src/Makefile.in
@@ -42,37 +42,15 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = fastfind
LIBRARY_NAME = fastfind_s
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 \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/url-classifier/src/Makefile.in
+++ b/toolkit/components/url-classifier/src/Makefile.in
@@ -7,26 +7,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = url-classifier
LIBRARY_NAME = urlclassifier_s
XPIDL_MODULE = url-classifier
LIBXUL_LIBRARY = 1
FORCE_STATIC_LIB = 1
-REQUIRES = docshell \
- necko \
- storage \
- string \
- uriloader \
- xpcom \
- pipnss \
- sqlite3 \
- $(ZLIB_REQUIRES) \
- $(NULL)
CPPSRCS = \
nsUrlClassifierDBService.cpp \
nsUrlClassifierStreamUpdater.cpp \
nsUrlClassifierUtils.cpp \
nsUrlClassifierHashCompleter.cpp \
$(NULL)
--- a/toolkit/components/url-classifier/tests/Makefile.in
+++ b/toolkit/components/url-classifier/tests/Makefile.in
@@ -43,22 +43,16 @@ VPATH = @srcdir@
relativesrcdir = toolkit/components/url-classifier/tests
include $(DEPTH)/config/autoconf.mk
MODULE = test_url-classifier
MOZILLA_INTERNAL_API = 1
-REQUIRES = \
- string \
- url-classifier \
- xpcom \
- necko \
- $(NULL)
# mochitest tests
DIRS += mochitest \
$(NULL)
# xpcshell tests
XPCSHELL_TESTS=unit
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -40,20 +40,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = crashreporter
LIBXUL_LIBRARY = 1
LIBRARY_NAME = exception_handler_s
-REQUIRES = \
- xpcom \
- string \
- $(NULL)
DIRS = \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
DIRS += \
google-breakpad/src/common/windows \
google-breakpad/src/client/windows/handler \
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -41,18 +41,16 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = crashreporter$(BIN_SUFFIX)
DIST_PROGRAM = crashreporter$(BIN_SUFFIX)
-REQUIRES = \
- $(NULL)
LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src
CPPSRCS = crashreporter.cpp
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += crashreporter_win.cpp
LIBS += \
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -58,22 +58,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
# "libxul.dylib"
LIBRARY_NAME=XUL
# Setting MAKE_FRAMEWORK makes DLL_PREFIX and DLL_SUFFIX be ignored when
# setting SHARED_LIBRARY; we need to leave DLL_PREFIX and DLL_SUFFIX
# as-is so that dependencies of the form -ltracemalloc still work.
MAKE_FRAMEWORK=1
endif
-REQUIRES = \
- xpcom \
- string \
- $(ZLIB_REQUIRES) \
- xulapp \
- $(NULL)
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
CPPSRCS += dlldeps-xul.cpp
endif
ifeq ($(OS_ARCH),WINCE)
CPPSRCS += dlldeps-xul.cpp
endif
--- a/toolkit/mozapps/update/src/updater/Makefile.in
+++ b/toolkit/mozapps/update/src/updater/Makefile.in
@@ -48,20 +48,16 @@ CPPSRCS = \
updater.cpp \
bspatch.cpp \
archivereader.cpp \
readstrings.cpp \
$(NULL)
PROGRAM = updater$(BIN_SUFFIX)
-REQUIRES = \
- libmar \
- $(BZ2_REQUIRES) \
- $(NULL)
LIBS += \
$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
$(BZ2_LIBS) \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
USE_STATIC_LIBS = 1
--- a/toolkit/profile/src/Makefile.in
+++ b/toolkit/profile/src/Makefile.in
@@ -42,20 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xulapp
LIBRARY_NAME = profile_s
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = \
- xpcom \
- string \
- $(NULL)
LOCAL_INCLUDES = \
-I$(srcdir)/../../xre \
-I$(topsrcdir)/profile/dirserviceprovider/src \
$(NULL)
CPPSRCS = \
nsProfileLock.cpp \
--- a/toolkit/system/dbus/Makefile.in
+++ b/toolkit/system/dbus/Makefile.in
@@ -43,21 +43,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = dbus
LIBRARY_NAME = dbusservice
GRE_MODULE = 1
#EXPORT_LIBRARY = 1
IS_COMPONENT = 1
FORCE_SHARED_LIB = 1
-REQUIRES = xpcom \
- string \
- necko \
- embedcomponents \
- $(NULL)
EXTRA_DSO_LDOPTS = \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \
$(MOZ_DBUS_GLIB_LIBS) \
$(NULL)
CPPSRCS = \
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@@ -42,28 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = mozgnome
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 \
nsGnomeVFSService.cpp \
nsGnomeModule.cpp \
$(NULL)
ifdef MOZ_ENABLE_LIBNOTIFY
--- a/toolkit/system/osxproxy/Makefile.in
+++ b/toolkit/system/osxproxy/Makefile.in
@@ -47,21 +47,16 @@ MODULE = osxproxy
LIBRARY_NAME = osxproxy
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsOSXProxyModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = \
- xpcom \
- string \
- necko \
- $(NULL)
FRAMEWORKS += \
-framework SystemConfiguration \
-framework Cocoa \
$(NULL)
OS_LIBS += $(FRAMEWORKS)
--- a/toolkit/system/unixproxy/Makefile.in
+++ b/toolkit/system/unixproxy/Makefile.in
@@ -46,22 +46,16 @@ MODULE = unixproxy
LIBRARY_NAME = unixproxy
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsUnixProxyModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = \
- xpcom \
- string \
- necko \
- mozgnome \
- $(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
CPPSRCS = \
nsUnixSystemProxySettings.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/toolkit/system/windowsproxy/Makefile.in
+++ b/toolkit/system/windowsproxy/Makefile.in
@@ -47,21 +47,16 @@ MODULE = windowsproxy
LIBRARY_NAME = windowsproxy
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWindowsProxyModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = \
- necko \
- string \
- xpcom \
- $(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
CPPSRCS = \
nsWindowsSystemProxySettings.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -42,41 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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
endif
ifdef NS_TRACE_MALLOC
REQUIRES += tracemalloc
endif
--- a/toolkit/xre/test/win/Makefile.in
+++ b/toolkit/xre/test/win/Makefile.in
@@ -38,19 +38,16 @@ DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = test_xulapp
-REQUIRES = \
- string \
- $(NULL)
CPPSRCS = \
TestXREMakeCommandLineWin.cpp \
$(NULL)
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32)
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
--- a/tools/codesighs/Makefile.in
+++ b/tools/codesighs/Makefile.in
@@ -38,17 +38,16 @@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-REQUIRES = $(NULL)
CSRCS += \
codesighs.c \
maptsvdifftool.c \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
CSRCS += \
--- a/tools/jprof/stub/Makefile.in
+++ b/tools/jprof/stub/Makefile.in
@@ -53,13 +53,12 @@ CPPSRCS = \
$(NULL)
EXPORTS = \
jprof.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-REQUIRES = xpcom
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_JPROF_API
--- a/tools/leaky/Makefile.in
+++ b/tools/leaky/Makefile.in
@@ -51,17 +51,16 @@ CPPSRCS = \
bfd.cpp \
coff.cpp \
dict.cpp \
elf.cpp \
leaky.cpp \
strset.cpp \
$(NULL)
-REQUIRES = xpcom
LIBS = \
-lbfd \
-liberty \
$(NULL)
RESOURCES = \
leaky.css \
--- a/tools/testy/Makefile.in
+++ b/tools/testy/Makefile.in
@@ -4,18 +4,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
LIBRARY_NAME = tstysupt
include $(DEPTH)/config/autoconf.mk
MODULE = testy
-REQUIRES = \
- $(NULL)
TESTCPPSRCS = Testy.cpp
CPPSRCS = \
TestySupport.cpp \
$(TESTCPPSRCS) \
$(NULL)
--- a/tools/testy/sample/Makefile.in
+++ b/tools/testy/sample/Makefile.in
@@ -3,18 +3,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
LIBRARY_NAME = SimpleTest
include $(DEPTH)/config/autoconf.mk
MODULE = testy
-REQUIRES = \
- $(NULL)
LOCAL_INCLUDES = \
-I$(srcdir)/.. \
$(NULL)
CPPSRCS = \
SimpleTest.cpp \
$(NULL)
--- a/tools/trace-malloc/Makefile.in
+++ b/tools/trace-malloc/Makefile.in
@@ -37,20 +37,16 @@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-REQUIRES = xpcom \
- string \
- tracemalloc \
- $(NULL)
SIMPLECSRCS += \
bloatblame.c \
leakstats.c \
tmstats.c \
$(NULL)
# Set CPP_PROG_LINK manually since we're using SIMPLECPPSRCS rather than
--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@@ -46,17 +46,16 @@ MODULE = tracemalloc
LIBRARY_NAME = tracemalloc
EXPORT_LIBRARY = 1
DEFFILE = $(win_srcdir)/tm.def
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom
CSRCS = \
nsTraceMalloc.c \
$(NULL)
CPPSRCS = \
nsTypeInfo.cpp \
$(NULL)
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@@ -42,34 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = uriloader
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 \
nsDocLoader.cpp \
$(NULL)
SDK_XPIDLSRCS = \
nsIURIContentListener.idl \
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -66,32 +66,16 @@ endif
endif
endif
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
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
REQUIRES += windowwatcher \
$(NULL)
--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@@ -40,29 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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 \
nsOfflineCacheUpdate.cpp \
$(NULL)
XPIDLSRCS = \
nsIPrefetchService.idl \
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@@ -44,28 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = view
LIBRARY_NAME = gkview_s
FORCE_STATIC_LIB = 1
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
CPPSRCS = \
nsView.cpp \
nsScrollPortView.cpp \
nsViewManager.cpp \
$(NULL)
--- a/widget/src/beos/Makefile.in
+++ b/widget/src/beos/Makefile.in
@@ -45,35 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = widget
LIBRARY_NAME = widget_beos
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
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 \
nsBidiKeyboard.cpp \
nsClipboard.cpp \
nsDragService.cpp \
nsFilePicker.cpp \
nsLookAndFeel.cpp \
--- a/widget/src/build/Makefile.in
+++ b/widget/src/build/Makefile.in
@@ -45,27 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = widget
LIBRARY_NAME = gkwidget
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
RESFILE = widget.res
MODULE_NAME = nsWidgetModule
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- string \
- necko \
- uconv \
- gfx \
- dom \
- timer \
- accessibility \
- thebes \
- cairo \
- $(NULL)
CPPSRCS = nsWinWidgetFactory.cpp
EXTRA_DSO_LIBS = gkgfx \
thebes \
$(NULL)
LOCAL_INCLUDES = \
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -46,37 +46,16 @@ MODULE = widget
LIBRARY_NAME = widget_mac
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWidgetMacModule
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
endif
EXPORTS = \
mozView.h \
nsChangeObserver.h \
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -47,35 +47,16 @@ LIBRARY_NAME = widget_gtk2
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWidgetGtk2Module
GRE_MODULE = 1
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
endif
CSRCS = \
mozcontainer.c \
keysym2ucs.c \
--- a/widget/src/gtkxtbin/Makefile.in
+++ b/widget/src/gtkxtbin/Makefile.in
@@ -53,17 +53,16 @@ ifdef MOZ_ENABLE_GTK2
CSRCS = \
gtk2xtbin.c \
$(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS) $(XLIBS)
endif
EXPORTS = gtk2xtbin.h
-REQUIRES = xpcom
include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_GTK2
CFLAGS += $(MOZ_GTK2_CFLAGS)
endif
DEFINES += -D_IMPL_GTKXTBIN_API -DUSE_XIM
--- a/widget/src/os2/Makefile.in
+++ b/widget/src/os2/Makefile.in
@@ -46,34 +46,16 @@ MODULE = widget
LIBRARY_NAME = wdgtos2
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
RESFILE = widget.res
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
endif
CPPSRCS = \
nsAppShell.cpp \
nsBidiKeyboard.cpp \
--- a/widget/src/photon/Makefile.in
+++ b/widget/src/photon/Makefile.in
@@ -44,32 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = widget
LIBRARY_NAME = widget_photon
EXPORT_LIBRARY = 1
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 \
nsAppShell.cpp \
nsClipboard.cpp \
nsLookAndFeel.cpp \
nsToolkit.cpp \
nsWidget.cpp \
--- a/widget/src/qt/Makefile.in
+++ b/widget/src/qt/Makefile.in
@@ -46,34 +46,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = widget
LIBRARY_NAME = widget_qt
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
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 \
moc_nsAppShell.cpp \
$(NULL)
CSRCS = \
--- a/widget/src/windows/Makefile.in
+++ b/widget/src/windows/Makefile.in
@@ -41,43 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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 \
nsWindowGfx.cpp \
nsWindowDbg.cpp \
nsAppShell.cpp \
nsToolkit.cpp \
nsFilePicker.cpp \
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -41,34 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
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
CPPSRCS = \
nsBaseAppShell.cpp \
nsBaseWidget.cpp \
nsTransferable.cpp \
nsHTMLFormatConverter.cpp \
--- a/widget/src/xremoteclient/Makefile.in
+++ b/widget/src/xremoteclient/Makefile.in
@@ -45,19 +45,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xremoteclient
LIBRARY_NAME = xremote_client_s
FORCE_STATIC_LIB = 1
-REQUIRES = \
- xpcom \
- $(NULL)
ifdef MOZ_ENABLE_PHOTON
CPPSRCS += PhRemoteClient.cpp
else
CPPSRCS += XRemoteClient.cpp
endif
EXTRA_DSO_LDOPTS = \
--- a/xpcom/analysis/Makefile.in
+++ b/xpcom/analysis/Makefile.in
@@ -2,20 +2,16 @@ DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MOZILLA_INTERNAL_API = 1
-REQUIRES = \
- string \
- xpcom \
- $(NULL)
include $(topsrcdir)/config/rules.mk
DUMP_CLASSES = \
nsAString_internal \
nsACString_internal \
$(NULL)
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -43,18 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
XPIDL_MODULE = xpcom_base
LIBRARY_NAME = xpcombase_s
GRE_MODULE = 1
MOZILLA_INTERNAL_API =1
-REQUIRES = string \
- $(NULL)
CPPSRCS = \
nsAllocator.cpp \
nsVersionComparatorImpl.cpp \
nsConsoleMessage.cpp \
nsConsoleService.cpp \
nsDebugImpl.cpp \
nsErrorService.cpp \
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -58,18 +58,16 @@ LIBXUL_LIBRARY = 1
# This is only a static library in libxul builds
ifdef MOZ_ENABLE_LIBXUL
EXPORT_LIBRARY = 1
endif
GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1
-REQUIRES = string \
- $(NULL)
ifdef NS_TRACE_MALLOC
REQUIRES += tracemalloc
endif
CSRCS = \
$(XPCOM_GLUE_SRC_LCSRCS) \
$(NULL)
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -43,18 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
XPIDL_MODULE = xpcom_components
LIBRARY_NAME = xpcomcomponents_s
GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1
-REQUIRES = string \
- $(NULL)
CPPSRCS = \
nsCategoryManager.cpp \
nsComponentManager.cpp \
nsNativeComponentLoader.cpp \
nsStaticComponentLoader.cpp \
nsServiceManagerObsolete.cpp \
$(NULL)
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -43,19 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
XPIDL_MODULE = xpcom_ds
LIBRARY_NAME = xpcomds_s
GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1
-REQUIRES = \
- string \
- $(NULL)
CPPSRCS = \
TimeStamp.cpp \
nsArray.cpp \
nsAtomTable.cpp \
nsAtomService.cpp \
nsByteBuffer.cpp \
nsCheapSets.cpp \
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -46,19 +46,16 @@ include $(srcdir)/objs.mk
EXTRA_DEPS += $(srcdir)/objs.mk
DIRS = standalone
MODULE = xpcom
LIBRARY_NAME = xpcomglue_s
DIST_INSTALL = 1
-REQUIRES = \
- string \
- $(NULL)
ifdef NS_TRACE_MALLOC
REQUIRES += tracemalloc
endif
LOCAL_INCLUDES = \
-I$(srcdir)/../build \
$(NULL)
--- a/xpcom/glue/standalone/Makefile.in
+++ b/xpcom/glue/standalone/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
include $(srcdir)/../objs.mk
EXTRA_DEPS += $(srcdir)/../objs.mk
MODULE = xpcom
LIBRARY_NAME = xpcomglue
DIST_INSTALL = 1
-REQUIRES = string \
- $(NULL)
LOCAL_INCLUDES = \
-I$(srcdir)/../../build \
$(NULL)
ifeq (Darwin,$(OS_ARCH))
LINKSRC = nsGlueLinkingOSX.cpp
endif
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -42,18 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
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
ifneq ($(OS_ARCH), Darwin)
MODULE_OPTIMIZE_FLAGS = -Os -fno-strict-aliasing $(MOZ_OPTIMIZE_SIZE_TWEAK)
endif
endif
--- a/xpcom/obsolete/Makefile.in
+++ b/xpcom/obsolete/Makefile.in
@@ -48,19 +48,16 @@ ifneq (,$(filter-out WINNT WINCE,$(OS_AR
SHORT_LIBNAME = xpcomct
endif
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
DIRS = component
-REQUIRES = xpcom \
- string \
- $(NULL)
CPPSRCS = \
nsFileSpec.cpp \
nsFileStream.cpp \
nsIFileStream.cpp \
nsFileSpecImpl.cpp \
$(NULL)
--- a/xpcom/obsolete/component/Makefile.in
+++ b/xpcom/obsolete/component/Makefile.in
@@ -49,21 +49,16 @@ ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = xpcomctc
endif
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-REQUIRES = xpcom \
- xpcom_obsolete \
- string \
- libreg \
- $(NULL)
CPPSRCS = \
nsXPCOMObsolete.cpp \
nsRegistry.cpp \
$(NULL)
LOCAL_INCLUDES = \
--- a/xpcom/proxy/src/Makefile.in
+++ b/xpcom/proxy/src/Makefile.in
@@ -41,18 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
LIBRARY_NAME = xpcomproxy_s
MOZILLA_INTERNAL_API = 1
-REQUIRES = string \
- $(NULL)
CPPSRCS = \
nsProxyEvent.cpp \
nsProxyEventClass.cpp \
nsProxyEventObject.cpp \
nsProxyObjectManager.cpp \
$(NULL)
--- a/xpcom/proxy/tests/Makefile.in
+++ b/xpcom/proxy/tests/Makefile.in
@@ -39,17 +39,16 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom_tests
XPIDL_MODULE = proxytest
-REQUIRES = xpcom
CPPSRCS = proxytests.cpp \
proxy-create-threadsafety.cpp \
$(NULL)
XPIDLSRCS = nsITestProxy.idl
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
--- a/xpcom/reflect/xptcall/src/Makefile.in
+++ b/xpcom/reflect/xptcall/src/Makefile.in
@@ -43,17 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
LIBRARY_NAME = xptcall
MOZILLA_INTERNAL_API = 1
DIRS = md
-REQUIRES = string
CPPSRCS = xptcall.cpp
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
# Force use of PIC
FORCE_USE_PIC = 1
--- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@@ -45,17 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
LIBRARY_NAME = xptcmd
MOZILLA_INTERNAL_API = 1
CPPSRCS = \
../unix/xptcinvoke_gcc_x86_unix.cpp \
xptcstubs_gcc_x86_os2.cpp \
$(NULL)
-REQUIRES = string
LOCAL_INCLUDES = \
-I$(srcdir)/../unix \
-I$(srcdir)/../../../../xptinfo/src \
$(NULL)
DEFINES += -DMOZ_NEED_LEADING_UNDERSCORE
# Force use of PIC
FORCE_USE_PIC = 1
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -41,17 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
LIBRARY_NAME = xptcmd
MOZILLA_INTERNAL_API = 1
-REQUIRES = string
#
# The default is this buildable, but non-functioning code.
#
CPPSRCS = $(error XPTCall not implemented on this platform!)
# Force use of PIC
FORCE_USE_PIC = 1
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -60,17 +60,16 @@ else
# FIXME: bug 413019
OS_COMPILE_CXXFLAGS += -GL-
CPPSRCS = xptcinvoke.cpp xptcstubs.cpp
endif
-REQUIRES = string
LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src
# Force use of PIC
FORCE_USE_PIC = 1
include $(topsrcdir)/config/config.mk
--- a/xpcom/reflect/xptcall/tests/Makefile.in
+++ b/xpcom/reflect/xptcall/tests/Makefile.in
@@ -39,18 +39,16 @@ DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = TestXPTC
SIMPLE_PROGRAMS = TestXPTCInvoke$(BIN_SUFFIX)
-REQUIRES = xpcom \
- $(NULL)
CPPSRCS = TestXPTCInvoke.cpp
LIBS = \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \
$(NULL)
--- a/xpcom/reflect/xptcall/tests/eVC4/Makefile.in
+++ b/xpcom/reflect/xptcall/tests/eVC4/Makefile.in
@@ -39,17 +39,16 @@ DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = TestXPTC
SIMPLE_PROGRAMS = TestXPTCInvoke$(BIN_SUFFIX)
-REQUIRES = xpcom \
$(NULL)
CPPSRCS = TestXPTCInvoke.cpp
LIBS = \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)
--- a/xpcom/reflect/xptinfo/src/Makefile.in
+++ b/xpcom/reflect/xptinfo/src/Makefile.in
@@ -41,19 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
LIBRARY_NAME = xptinfo
MOZILLA_INTERNAL_API = 1
-REQUIRES = \
- string \
- $(NULL)
CPPSRCS = \
xptiFile.cpp \
xptiInterfaceInfo.cpp \
xptiInterfaceInfoManager.cpp \
xptiManifest.cpp \
xptiMisc.cpp \
xptiTypelibGuts.cpp \
--- a/xpcom/string/src/Makefile.in
+++ b/xpcom/string/src/Makefile.in
@@ -44,18 +44,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = string
LIBRARY_NAME = string_s
MOZILLA_INTERNAL_API = 1
-REQUIRES = xpcom \
- $(NULL)
CPPSRCS = \
nsDependentString.cpp \
nsDependentSubstring.cpp \
nsPrintfCString.cpp \
nsPromiseFlatString.cpp \
nsReadableUtils.cpp \
nsSubstring.cpp \
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -49,18 +49,16 @@ LIBRARY_NAME = xpcom
# want it to find dist/bin and not xpcom/stub so we copy instead of symlinking.
NSDISTMODE = copy
# Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
#EXPORT_LIBRARY = 1
GRE_MODULE = 1
M
