From 667f63d102e827605ce9849f6e52f39413425b40 Mon Sep 17 00:00:00 2001 From: Benjamin Smedberg Date: Thu, 27 Aug 2009 10:48:18 -0700 Subject: [PATCH] Bug 513032 - remove empty conditionals in our makefiles, r=ted --- accessible/src/html/Makefile.in | 2 -- accessible/src/xforms/Makefile.in | 2 -- accessible/src/xul/Makefile.in | 2 -- build/pymake/pymake/parser.py | 6 +++--- build/pymake/pymake/parserdata.py | 9 ++++++++- config/config.mk | 10 +--------- config/rules.mk | 3 +-- content/base/src/Makefile.in | 2 -- content/xslt/src/base/Makefile.in | 2 -- content/xslt/src/xml/Makefile.in | 3 --- content/xslt/src/xpath/Makefile.in | 2 -- content/xslt/src/xslt/Makefile.in | 3 --- dom/src/storage/Makefile.in | 2 -- embedding/browser/activex/src/plugin/Makefile.in | 2 -- embedding/browser/gtk/src/Makefile.in | 2 -- embedding/browser/webBrowser/Makefile.in | 2 -- extensions/build.mk | 4 ++-- gfx/cairo/libpixman/src/Makefile.in | 3 +-- gfx/src/Makefile.in | 2 -- gfx/src/thebes/Makefile.in | 2 -- intl/uconv/src/Makefile.in | 3 +-- js/jsd/Makefile.in | 2 -- js/src/config/config.mk | 10 +--------- js/src/config/rules.mk | 3 +-- layout/base/Makefile.in | 2 -- layout/forms/Makefile.in | 2 -- layout/generic/Makefile.in | 2 -- layout/inspector/src/Makefile.in | 2 -- layout/tables/Makefile.in | 2 -- layout/xul/base/src/Makefile.in | 2 -- media/libtheora/lib/Makefile.in | 3 +-- modules/plugin/base/src/Makefile.in | 2 -- toolkit/components/build/Makefile.in | 2 -- toolkit/themes/faststripe/Makefile.in | 3 --- toolkit/xre/Makefile.in | 6 ------ uriloader/exthandler/Makefile.in | 2 -- widget/src/cocoa/Makefile.in | 2 -- widget/src/gtk2/Makefile.in | 4 ---- xpcom/build/Makefile.in | 2 -- xpcom/glue/Makefile.in | 2 -- xpfe/browser/src/Makefile.in | 2 -- 41 files changed, 20 insertions(+), 105 deletions(-) diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in index 765dad527e32..2b8621cd2cb9 100644 --- a/accessible/src/html/Makefile.in +++ b/accessible/src/html/Makefile.in @@ -48,8 +48,6 @@ LIBRARY_NAME = accessibility_html_s LIBXUL_LIBRARY = 1 -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -endif CPPSRCS = \ nsHTMLAreaAccessible.cpp \ diff --git a/accessible/src/xforms/Makefile.in b/accessible/src/xforms/Makefile.in index 55551d36d149..f0048b854128 100644 --- a/accessible/src/xforms/Makefile.in +++ b/accessible/src/xforms/Makefile.in @@ -48,8 +48,6 @@ LIBRARY_NAME = accessibility_xforms_s LIBXUL_LIBRARY = 1 -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -endif CPPSRCS = \ nsXFormsAccessible.cpp \ diff --git a/accessible/src/xul/Makefile.in b/accessible/src/xul/Makefile.in index 8afa2906cab8..8c1bd7391310 100644 --- a/accessible/src/xul/Makefile.in +++ b/accessible/src/xul/Makefile.in @@ -48,8 +48,6 @@ LIBRARY_NAME = accessibility_xul_s LIBXUL_LIBRARY = 1 -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -endif CPPSRCS = \ nsXULAlertAccessible.cpp \ diff --git a/build/pymake/pymake/parser.py b/build/pymake/pymake/parser.py index 4c9354d64d8e..8e39b18c8718 100644 --- a/build/pymake/pymake/parser.py +++ b/build/pymake/pymake/parser.py @@ -518,7 +518,7 @@ def parsestream(fd, filename): raise SyntaxError("unmatched 'endif' directive", d.getloc(offset)) - condstack.pop() + condstack.pop().endloc = d.getloc(offset) continue if kword == 'else': @@ -529,14 +529,14 @@ def parsestream(fd, filename): kword, offset = d.findtoken(offset, _conditionkeywordstokenlist, True) if kword is None: _ensureend(d, offset, "Unexpected data after 'else' directive.") - condstack[-1].addcondition(d.getloc(offset), parserdata.ElseCondition()) + condstack[-1].addcondition(d.getloc(0), parserdata.ElseCondition()) else: if kword not in _conditionkeywords: raise SyntaxError("Unexpected condition after 'else' directive.", d.getloc(offset)) c = _conditionkeywords[kword](d, offset) - condstack[-1].addcondition(d.getloc(offset), c) + condstack[-1].addcondition(d.getloc(0), c) continue if kword in _conditionkeywords: diff --git a/build/pymake/pymake/parserdata.py b/build/pymake/pymake/parserdata.py index 8b0c34420d1b..158f5d76294e 100644 --- a/build/pymake/pymake/parserdata.py +++ b/build/pymake/pymake/parserdata.py @@ -335,10 +335,11 @@ class ConditionBlock(Statement): self.addcondition(loc, condition) def getloc(self): - return self._groups[0][0].loc + return self.loc def addcondition(self, loc, condition): assert isinstance(condition, Condition) + condition.loc = loc if len(self._groups) and isinstance(self._groups[-1][0], ElseCondition): raise parser.SyntaxError("Multiple else conditions for block starting at %s" % self.loc, loc) @@ -371,6 +372,12 @@ class ConditionBlock(Statement): def __iter__(self): return iter(self._groups) + def __len__(self): + return len(self._groups) + + def __getitem__(self, i): + return self._groups[i] + class Include(Statement): __slots__ = ('exp', 'required') diff --git a/config/config.mk b/config/config.mk index 8f989f297c72..1d8810b443ad 100644 --- a/config/config.mk +++ b/config/config.mk @@ -215,20 +215,12 @@ ifeq ($(first_match), $(MODULE)) _DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS) _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS) else - ifeq ($(first_match), ^$(MODULE)) - # the user specified explicitly that this module - # should not be compiled with -g (nothing to do) - else + ifneq ($(first_match), ^$(MODULE)) ifeq ($(first_match), ALL_MODULES) # the user didn't mention this module explicitly, # but wanted all modules to be compiled with -g _DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS) _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS) - else - ifeq ($(first_match), ^ALL_MODULES) - # the user didn't mention this module explicitly, - # but wanted all modules to be compiled without -g (nothing to do) - endif endif endif endif diff --git a/config/rules.mk b/config/rules.mk index bf7304ae7c8c..b4b1e4236b52 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -1296,8 +1296,7 @@ ifdef EMBED_MANIFEST_AT endif # EMBED_MANIFEST_AT endif # MSVC with manifest tool endif # WINNT && !GCC -ifeq ($(OS_ARCH),Darwin) -else # non-Darwin +ifneq ($(OS_ARCH),Darwin) @rm -f $(SUB_SHLOBJS) endif # Darwin @rm -f foodummyfilefoo $(DELETE_AFTER_LINK) diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index d372fe7b6ac2..56caecf189c8 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -47,8 +47,6 @@ LIBRARY_NAME = gkconbase_s LIBXUL_LIBRARY = 1 -ifdef ACCESSIBILITY -endif EXPORTS = \ nsAtomListUtils.h \ diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in index 643862617005..43b337ed9a2c 100644 --- a/content/xslt/src/base/Makefile.in +++ b/content/xslt/src/base/Makefile.in @@ -47,8 +47,6 @@ LIBRARY_NAME = txbase_s LIBXUL_LIBRARY = 1 -ifndef MOZ_XSLT_STANDALONE -endif CPPSRCS = txDouble.cpp \ txList.cpp \ diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in index 98c8f09350fe..b6e975e5ff6c 100644 --- a/content/xslt/src/xml/Makefile.in +++ b/content/xslt/src/xml/Makefile.in @@ -47,9 +47,6 @@ LIBRARY_NAME = txxml_s LIBXUL_LIBRARY = 1 -ifndef MOZ_XSLT_STANDALONE -else -endif CPPSRCS = \ txXMLUtils.cpp \ diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in index acb13a77fa38..14cfe9910ce6 100644 --- a/content/xslt/src/xpath/Makefile.in +++ b/content/xslt/src/xpath/Makefile.in @@ -47,8 +47,6 @@ LIBRARY_NAME = txxpath_s LIBXUL_LIBRARY = 1 -ifndef MOZ_XSLT_STANDALONE -endif CPPSRCS = \ txBooleanExpr.cpp \ diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in index b406c1e80931..48f54b4b7585 100644 --- a/content/xslt/src/xslt/Makefile.in +++ b/content/xslt/src/xslt/Makefile.in @@ -47,9 +47,6 @@ LIBRARY_NAME = txxslt_s LIBXUL_LIBRARY = 1 -ifndef MOZ_XSLT_STANDALONE -else -endif CPPSRCS = \ txNodeSorter.cpp \ diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index 38792cb87ce4..83b48ebb1470 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -47,8 +47,6 @@ LIBRARY_NAME = jsdomstorage_s LIBXUL_LIBRARY = 1 -ifdef MOZ_STORAGE -endif CPPSRCS = \ nsDOMStorage.cpp \ diff --git a/embedding/browser/activex/src/plugin/Makefile.in b/embedding/browser/activex/src/plugin/Makefile.in index 1316635f0307..804439894b8f 100644 --- a/embedding/browser/activex/src/plugin/Makefile.in +++ b/embedding/browser/activex/src/plugin/Makefile.in @@ -62,8 +62,6 @@ DEFFILE = npmozax.def GRE_MODULE = 1 -ifdef XPC_IDISPATCH_SUPPORT -endif XPIFILE = mozactivex.xpi FORCE_SHARED_LIB = 1 diff --git a/embedding/browser/gtk/src/Makefile.in b/embedding/browser/gtk/src/Makefile.in index e3b0b6a7b86a..d71d0912916e 100644 --- a/embedding/browser/gtk/src/Makefile.in +++ b/embedding/browser/gtk/src/Makefile.in @@ -50,8 +50,6 @@ FORCE_STATIC_LIB = 1 DEFINES += -DIMPL_XREAPI -ifdef ACCESSIBILITY -endif CPPSRCS = \ gtkmozembed2.cpp \ diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in index 6607d556589e..f97d75641fc9 100644 --- a/embedding/browser/webBrowser/Makefile.in +++ b/embedding/browser/webBrowser/Makefile.in @@ -50,8 +50,6 @@ GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -ifdef MOZ_PHOENIX -endif EXPORTS = \ nsCTooltipTextProvider.h \ diff --git a/extensions/build.mk b/extensions/build.mk index 09a23c384821..ca89abb80850 100644 --- a/extensions/build.mk +++ b/extensions/build.mk @@ -36,11 +36,11 @@ # ***** END LICENSE BLOCK ***** ifneq (extensions,$(MOZ_BUILD_APP)) -$(error This file shouldn't be included without --enable-application=extensions +$(error This file shouldn't be included without --enable-application=extensions) endif ifndef MOZ_EXTENSIONS -$(error You forgot to set --enable-extensions +$(error You forgot to set --enable-extensions) endif TIERS += app diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index 150ea7f7e9cd..615465746d8b 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -64,8 +64,7 @@ endif # Build MMX code either with VC or with gcc-on-x86 ifdef _MSC_VER ifeq (86,$(findstring 86,$(OS_TEST))) -ifeq (64,$(findstring 64,$(OS_TEST))) -else +ifneq (64,$(findstring 64,$(OS_TEST))) USE_MMX=1 USE_SSE2=1 MMX_CFLAGS= diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in index fe3535a89995..de8d5ba5aa47 100644 --- a/gfx/src/Makefile.in +++ b/gfx/src/Makefile.in @@ -64,8 +64,6 @@ CPPSRCS = \ nsScriptableRegion.cpp \ $(NULL) -ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT))) -endif EXTRA_DSO_LDOPTS = \ $(MOZ_UNICHARUTIL_LIBS) \ diff --git a/gfx/src/thebes/Makefile.in b/gfx/src/thebes/Makefile.in index bbe595f88da5..affae228b5ed 100644 --- a/gfx/src/thebes/Makefile.in +++ b/gfx/src/thebes/Makefile.in @@ -54,8 +54,6 @@ GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT))) -endif CPPSRCS = \ nsThebesDeviceContext.cpp \ diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in index b6b489aa9ee0..3ea6018b4f07 100644 --- a/intl/uconv/src/Makefile.in +++ b/intl/uconv/src/Makefile.in @@ -69,8 +69,7 @@ CPPSRCS = \ nsScriptableUConv.cpp \ $(NULL) -ifdef MOZ_USE_NATIVE_UCONV -else +ifndef MOZ_USE_NATIVE_UCONV CPPSRCS += \ nsISO88591ToUnicode.cpp \ nsCP1252ToUnicode.cpp \ diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in index 2522bf78e406..e343db44ee17 100644 --- a/js/jsd/Makefile.in +++ b/js/jsd/Makefile.in @@ -54,8 +54,6 @@ endif # REQUIRES = java js -ifndef JSD_STANDALONE -endif EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ diff --git a/js/src/config/config.mk b/js/src/config/config.mk index 8f989f297c72..1d8810b443ad 100644 --- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -215,20 +215,12 @@ ifeq ($(first_match), $(MODULE)) _DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS) _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS) else - ifeq ($(first_match), ^$(MODULE)) - # the user specified explicitly that this module - # should not be compiled with -g (nothing to do) - else + ifneq ($(first_match), ^$(MODULE)) ifeq ($(first_match), ALL_MODULES) # the user didn't mention this module explicitly, # but wanted all modules to be compiled with -g _DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS) _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS) - else - ifeq ($(first_match), ^ALL_MODULES) - # the user didn't mention this module explicitly, - # but wanted all modules to be compiled without -g (nothing to do) - endif endif endif endif diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index bf7304ae7c8c..b4b1e4236b52 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -1296,8 +1296,7 @@ ifdef EMBED_MANIFEST_AT endif # EMBED_MANIFEST_AT endif # MSVC with manifest tool endif # WINNT && !GCC -ifeq ($(OS_ARCH),Darwin) -else # non-Darwin +ifneq ($(OS_ARCH),Darwin) @rm -f $(SUB_SHLOBJS) endif # Darwin @rm -f foodummyfilefoo $(DELETE_AFTER_LINK) diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index a7f6e5a8fde5..5fddcd0ec783 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -53,8 +53,6 @@ LIBRARY_NAME = gkbase_s LIBXUL_LIBRARY = 1 -ifdef ACCESSIBILITY -endif XPIDLSRCS = \ nsIStyleSheetService.idl \ diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index 006d2594508c..e7b4cf91b772 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -53,8 +53,6 @@ LIBRARY_NAME = gkforms_s LIBXUL_LIBRARY = 1 -ifdef ACCESSIBILITY -endif EXPORTS = \ nsIListControlFrame.h \ diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index 1a8d2c097525..e4ef005aa91b 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -50,8 +50,6 @@ LIBRARY_NAME = gkgeneric_s LIBXUL_LIBRARY = 1 -ifdef ACCESSIBILITY -endif EXPORTS = \ nsQueryFrame.h \ diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in index 15bc766cd30c..2115da389caf 100644 --- a/layout/inspector/src/Makefile.in +++ b/layout/inspector/src/Makefile.in @@ -47,8 +47,6 @@ LIBRARY_NAME = inspector_s LIBXUL_LIBRARY = 1 -ifdef ACCESSIBILITY -endif CPPSRCS= \ inDeepTreeWalker.cpp \ diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in index f6bad49b1f16..e5fc8f5d1682 100644 --- a/layout/tables/Makefile.in +++ b/layout/tables/Makefile.in @@ -47,8 +47,6 @@ LIBRARY_NAME = gktable_s LIBXUL_LIBRARY = 1 -ifdef ACCESSIBILITY -endif EXPORTS = \ nsITableCellLayout.h \ diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index 4db5563ed58e..4424bc4bff77 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -47,8 +47,6 @@ LIBRARY_NAME = gkxulbase_s LIBXUL_LIBRARY = 1 -ifdef MOZ_ENABLE_CANVAS -endif ifdef MOZ_XUL PARALLEL_DIRS = tree/public tree/src grid diff --git a/media/libtheora/lib/Makefile.in b/media/libtheora/lib/Makefile.in index f494eb740ee7..a68a4d00c1bc 100644 --- a/media/libtheora/lib/Makefile.in +++ b/media/libtheora/lib/Makefile.in @@ -76,8 +76,7 @@ CSRCS = \ ifeq ($(findstring 86,$(OS_TEST)), 86) ifeq ($(OS_ARCH),WINNT) -ifeq (64,$(findstring 64,$(OS_TEST))) -else +ifneq (64,$(findstring 64,$(OS_TEST))) VPATH += $(srcdir)/dec/x86_vc CSRCS += \ diff --git a/modules/plugin/base/src/Makefile.in b/modules/plugin/base/src/Makefile.in index a296d09417a4..6e58c3cceec4 100644 --- a/modules/plugin/base/src/Makefile.in +++ b/modules/plugin/base/src/Makefile.in @@ -52,8 +52,6 @@ GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) -endif CPPSRCS = \ nsNPAPIPlugin.cpp \ diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in index 17b5b1ae3274..1dcb2064bb1b 100644 --- a/toolkit/components/build/Makefile.in +++ b/toolkit/components/build/Makefile.in @@ -56,8 +56,6 @@ DEFINES += -DALERTS_SERVICE endif -ifdef ALERTS_SERVICE -endif EXPORTS = nsToolkitCompsCID.h diff --git a/toolkit/themes/faststripe/Makefile.in b/toolkit/themes/faststripe/Makefile.in index 38940b6d0aa5..b47d69c1d74d 100644 --- a/toolkit/themes/faststripe/Makefile.in +++ b/toolkit/themes/faststripe/Makefile.in @@ -46,8 +46,5 @@ include $(DEPTH)/config/autoconf.mk DIRS = global #DIRS += mozapps -ifdef MOZ_HELP_VIEWER -#DIRS += help -endif include $(topsrcdir)/config/rules.mk diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 30f6358ee209..8a4dc37487ea 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -48,14 +48,8 @@ LIBRARY_NAME = xulapp_s LIBXUL_LIBRARY = 1 -ifdef MOZ_JPROF -endif -ifdef NS_TRACE_MALLOC -endif -ifdef MOZ_CRASHREPORTER -endif FORCE_STATIC_LIB = 1 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index ffd243d1e1ac..05667cb91754 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -72,8 +72,6 @@ MODULE = exthandler LIBRARY_NAME = exthandler_s LIBXUL_LIBRARY = 1 -ifdef MOZ_PHOENIX -endif ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) diff --git a/widget/src/cocoa/Makefile.in b/widget/src/cocoa/Makefile.in index 096cf4236351..d3ed2842daeb 100644 --- a/widget/src/cocoa/Makefile.in +++ b/widget/src/cocoa/Makefile.in @@ -52,8 +52,6 @@ GRE_MODULE = 1 LIBXUL_LIBRARY = 1 -ifdef ACCESSIBILITY -endif EXPORTS = \ mozView.h \ diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in index 67f1ac66ac17..9f885785522a 100644 --- a/widget/src/gtk2/Makefile.in +++ b/widget/src/gtk2/Makefile.in @@ -53,8 +53,6 @@ LIBXUL_LIBRARY = 1 NATIVE_THEME_SUPPORT = 1 -ifdef MOZ_X11 -endif CSRCS = \ mozcontainer.c \ @@ -107,8 +105,6 @@ CPPSRCS += nsClipboard.cpp \ endif # build our subdirs, too -ifdef ACCESSIBILITY -endif SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 1177cf3e06ad..be3ee322e2e2 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -64,8 +64,6 @@ GRE_MODULE = 1 MOZILLA_INTERNAL_API = 1 -ifdef NS_TRACE_MALLOC -endif CSRCS = \ $(XPCOM_GLUE_SRC_LCSRCS) \ diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in index ba3ef610a458..aba0211be525 100644 --- a/xpcom/glue/Makefile.in +++ b/xpcom/glue/Makefile.in @@ -52,8 +52,6 @@ LIBRARY_NAME = xpcomglue_s DIST_INSTALL = 1 -ifdef NS_TRACE_MALLOC -endif LOCAL_INCLUDES = \ -I$(srcdir)/../build \ diff --git a/xpfe/browser/src/Makefile.in b/xpfe/browser/src/Makefile.in index 1db4c0bf1633..2f1387b8d785 100644 --- a/xpfe/browser/src/Makefile.in +++ b/xpfe/browser/src/Makefile.in @@ -48,8 +48,6 @@ FORCE_STATIC_LIB = 1 LIBXUL_LIBRARY = 1 MODULE_NAME = nsBrowserModule -ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER)) -endif CPPSRCS = \ nsBrowserInstance.cpp \