--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -43,18 +43,16 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = accessibility
 LIBRARY_NAME = accessibility_html_s
 LIBXUL_LIBRARY = 1
 
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-endif
 
 CPPSRCS = \
   nsHTMLAreaAccessible.cpp \
   nsHTMLFormControlAccessible.cpp \
   nsHTMLImageAccessible.cpp \
   nsHTMLLinkAccessible.cpp \
   nsHTMLSelectAccessible.cpp \
   nsHTMLTableAccessible.cpp \

--- a/accessible/src/xforms/Makefile.in
+++ b/accessible/src/xforms/Makefile.in
@@ -43,18 +43,16 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = accessibility
 LIBRARY_NAME = accessibility_xforms_s
 LIBXUL_LIBRARY = 1
 
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-endif
 
 CPPSRCS = \
   nsXFormsAccessible.cpp \
   nsXFormsFormControlsAccessible.cpp \
   nsXFormsWidgetsAccessible.cpp \
   $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.

--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -43,18 +43,16 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = accessibility
 LIBRARY_NAME = accessibility_xul_s
 LIBXUL_LIBRARY = 1
 
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-endif
 
 CPPSRCS = \
   nsXULAlertAccessible.cpp \
   nsXULColorPickerAccessible.cpp \
   nsXULFormControlAccessible.cpp \
   nsXULMenuAccessible.cpp \
   nsXULSelectAccessible.cpp \
   nsXULSliderAccessible.cpp \

--- a/build/pymake/pymake/parser.py
+++ b/build/pymake/pymake/parser.py
@@ -513,35 +513,35 @@ def parsestream(fd, filename):
 
             kword, offset = d.findtoken(offset, _directivestokenlist, True)
             if kword == 'endif':
                 _ensureend(d, offset, "Unexpected data after 'endif' directive")
                 if len(condstack) == 1:
                     raise SyntaxError("unmatched 'endif' directive",
                                       d.getloc(offset))
 
-                condstack.pop()
+                condstack.pop().endloc = d.getloc(offset)
                 continue
             
             if kword == 'else':
                 if len(condstack) == 1:
                     raise SyntaxError("unmatched 'else' directive",
                                       d.getloc(offset))
 
                 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:
                 c = _conditionkeywords[kword](d, offset)
                 cb = parserdata.ConditionBlock(d.getloc(0), c)
                 condstack[-1].append(cb)
                 condstack.append(cb)
                 continue

--- a/build/pymake/pymake/parserdata.py
+++ b/build/pymake/pymake/parserdata.py
@@ -330,20 +330,21 @@ class ConditionBlock(Statement):
     __slots__ = ('loc', '_groups')
 
     def __init__(self, loc, condition):
         self.loc = loc
         self._groups = []
         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)
 
         self._groups.append((condition, StatementList()))
 
     def append(self, statement):
         self._groups[-1][1].append(statement)
@@ -366,16 +367,22 @@ class ConditionBlock(Statement):
             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)
 
+    def __len__(self):
+        return len(self._groups)
+
+    def __getitem__(self, i):
+        return self._groups[i]
+
 class Include(Statement):
     __slots__ = ('exp', 'required')
 
     def __init__(self, exp, required):
         assert isinstance(exp, (data.Expansion, data.StringExpansion))
         self.exp = exp
         self.required = required
 

--- a/config/config.mk
+++ b/config/config.mk
@@ -210,30 +210,22 @@ endif
 first_match:=$(firstword $(filter $(pattern), $(MOZ_DBGRINFO_MODULES)))
 
 ifeq ($(first_match), $(MODULE))
   # the user specified explicitly that 
   # this module should be compiled with -g
   _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
 
 
 # append debug flags 
 # (these might have been above when processing MOZ_DBGRINFO_MODULES)
 OS_CFLAGS += $(_DEBUG_CFLAGS)

--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1291,18 +1291,17 @@ ifdef MSMANIFEST_TOOL
 ifdef EMBED_MANIFEST_AT
 	@if test -f $@.manifest; then \
 		mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \
 		rm -f $@.manifest; \
 	fi
 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)
 	chmod +x $@
 ifdef ENABLE_STRIP
 	$(STRIP) $@
 endif
 ifdef MOZ_POST_DSO_LIB_COMMAND

--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -42,18 +42,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconbase_s
 LIBXUL_LIBRARY	= 1
 
 
-ifdef ACCESSIBILITY
-endif
 
 EXPORTS		= \
 		nsAtomListUtils.h \
 		nsAttrName.h \
 		nsContentList.h \
 		nsGkAtomList.h \
 		nsGkAtoms.h \
 		nsNodeInfoManager.h \

--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -42,18 +42,16 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
 LIBRARY_NAME = txbase_s
 LIBXUL_LIBRARY = 1
 
 
-ifndef MOZ_XSLT_STANDALONE
-endif
 
 CPPSRCS	= txDouble.cpp \
 	txList.cpp \
 	txExpandedNameMap.cpp \
 	txNamespaceMap.cpp \
 	txURIUtils.cpp
 
 ifdef MOZ_XSLT_STANDALONE

--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -42,19 +42,16 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
 LIBRARY_NAME = txxml_s
 LIBXUL_LIBRARY = 1
 
 
-ifndef MOZ_XSLT_STANDALONE
-else
-endif
 
 CPPSRCS	= \
 	txXMLUtils.cpp \
 	txXMLParser.cpp \
 	$(NULL)
 
 ifdef MOZ_XSLT_STANDALONE
 CPPSRCS += \

--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -42,18 +42,16 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
 LIBRARY_NAME = txxpath_s
 LIBXUL_LIBRARY = 1
 
 
-ifndef MOZ_XSLT_STANDALONE
-endif
 
 CPPSRCS = \
         txBooleanExpr.cpp \
         txBooleanResult.cpp \
         txCoreFunctionCall.cpp \
         txExpr.cpp \
         txExprLexer.cpp \
         txExprParser.cpp \

--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -42,19 +42,16 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
 LIBRARY_NAME = txxslt_s
 LIBXUL_LIBRARY = 1
 
 
-ifndef MOZ_XSLT_STANDALONE
-else
-endif
 
 CPPSRCS = \
         txNodeSorter.cpp \
         txXPathResultComparator.cpp \
         txBufferingHandler.cpp \
         txExecutionState.cpp \
         txEXSLTFunctions.cpp \
         txInstructions.cpp \

--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -42,18 +42,16 @@ VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE         = dom
 LIBRARY_NAME   = jsdomstorage_s
 LIBXUL_LIBRARY = 1
 
 
-ifdef MOZ_STORAGE
-endif
 
 CPPSRCS =                  \
        nsDOMStorage.cpp    \
        $(NULL)
 
 ifdef MOZ_STORAGE
 CPPSRCS += nsDOMStorageDBWrapper.cpp nsDOMStoragePersistentDB.cpp nsDOMStorageMemoryDB.cpp
 endif

--- a/embedding/browser/activex/src/plugin/Makefile.in
+++ b/embedding/browser/activex/src/plugin/Makefile.in
@@ -57,18 +57,16 @@ RESFILE         = MozActiveX-flash.res
 else
 RESFILE         = MozActiveX.res
 endif
 
 DEFFILE         = npmozax.def
 GRE_MODULE	= 1
 
 
-ifdef XPC_IDISPATCH_SUPPORT
-endif
 XPIFILE         = mozactivex.xpi
 
 FORCE_SHARED_LIB = 1
 NO_DIST_INSTALL	= 1
 NO_INSTALL = 1
 
 # Path to the Mozilla ActiveX common dir (some files are copied from there)
 AXCOMMONSRC=$(srcdir)/../common

--- a/embedding/browser/gtk/src/Makefile.in
+++ b/embedding/browser/gtk/src/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= gtkembedmoz
 LIBRARY_NAME	= gtkembedmoz
 LIBXUL_LIBRARY	= 1
 FORCE_STATIC_LIB = 1
 DEFINES += -DIMPL_XREAPI
 
 
-ifdef ACCESSIBILITY
-endif
 
 CPPSRCS		= \
 		gtkmozembed2.cpp \
 		EmbedPrivate.cpp \
 		EmbedWindow.cpp \
 		EmbedProgress.cpp \
 		EmbedContentListener.cpp \
 		EmbedEventListener.cpp \

--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= webbrwsr
 XPIDL_MODULE	= webBrowser_core
 LIBRARY_NAME	= nsWebBrowser_s
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 
-ifdef MOZ_PHOENIX
-endif
 
 EXPORTS         = \
                 nsCTooltipTextProvider.h \
                 $(NULL)
 
 SDK_XPIDLSRCS   = \
 		nsIContextMenuListener.idl  \
 		nsIEmbeddingSiteWindow.idl  \

--- a/extensions/build.mk
+++ b/extensions/build.mk
@@ -31,21 +31,21 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** 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
 tier_app_dirs += extensions
 
 installer:
 	@echo Check each extension for an installer.
 	@exit 1

--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -59,18 +59,17 @@ ifeq ($(OS_ARCH),WINNT)
 OS_COMPILE_CFLAGS += -GL-
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
 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=
 endif
 endif
 ifeq (arm,$(findstring arm,$(OS_TEST)))
 USE_ARM_SIMD_MSVC=1
 endif

--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -59,18 +59,16 @@ CPPSRCS = \
         nsColor.cpp \
         nsFont.cpp \
         nsRect.cpp \
         nsRegion.cpp \
         nsTransform2D.cpp \
         nsScriptableRegion.cpp \
         $(NULL)
 
-ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-endif
 
 EXTRA_DSO_LDOPTS = \
         $(MOZ_UNICHARUTIL_LIBS) \
         $(MOZ_COMPONENT_LIBS) \
         $(MOZ_JS_LIBS) \
         $(NULL)
 
 ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))

--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@@ -49,18 +49,16 @@ SHORT_LIBNAME = gkgfxthb
 endif
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsGfxModule
 GRE_MODULE = 1
 LIBXUL_LIBRARY = 1
 
 
-ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-endif
 
 CPPSRCS		= \
 		nsThebesDeviceContext.cpp \
 		nsThebesRegion.cpp \
 		nsThebesGfxFactory.cpp \
 		nsThebesRenderingContext.cpp \
 		nsThebesFontMetrics.cpp \
 		nsThebesFontEnumerator.cpp \

--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -64,18 +64,17 @@ CPPSRCS		= \
 		nsGREResProperties.cpp \
 		nsCharsetConverterManager.cpp \
 		nsUTF8ConverterService.cpp \
 		nsUTF8ToUnicode.cpp \
 		nsUnicodeToUTF8.cpp \
 		nsScriptableUConv.cpp \
 		$(NULL)
 
-ifdef MOZ_USE_NATIVE_UCONV
-else
+ifndef MOZ_USE_NATIVE_UCONV
 CPPSRCS         += \
 		nsISO88591ToUnicode.cpp \
 		nsCP1252ToUnicode.cpp \
 		nsMacRomanToUnicode.cpp \
 		nsUnicodeToISO88591.cpp \
 		nsUnicodeToCP1252.cpp \
 		nsUnicodeToMacRoman.cpp \
 		$(NULL)

--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -49,18 +49,16 @@ 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
 
-ifndef JSD_STANDALONE
-endif
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
 EXPORTS		= jsdebug.h
 
 ifdef JS_THREADSAFE

--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -210,30 +210,22 @@ endif
 first_match:=$(firstword $(filter $(pattern), $(MOZ_DBGRINFO_MODULES)))
 
 ifeq ($(first_match), $(MODULE))
   # the user specified explicitly that 
   # this module should be compiled with -g
   _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
 
 
 # append debug flags 
 # (these might have been above when processing MOZ_DBGRINFO_MODULES)
 OS_CFLAGS += $(_DEBUG_CFLAGS)

--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1291,18 +1291,17 @@ ifdef MSMANIFEST_TOOL
 ifdef EMBED_MANIFEST_AT
 	@if test -f $@.manifest; then \
 		mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \
 		rm -f $@.manifest; \
 	fi
 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)
 	chmod +x $@
 ifdef ENABLE_STRIP
 	$(STRIP) $@
 endif
 ifdef MOZ_POST_DSO_LIB_COMMAND

--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -48,18 +48,16 @@ endif
 
 MODULE		= layout
 XPIDL_MODULE	= layout_base
 GRE_MODULE	= 1
 LIBRARY_NAME	= gkbase_s
 LIBXUL_LIBRARY	= 1
 
 
-ifdef ACCESSIBILITY
-endif
 
 XPIDLSRCS	= \
 		nsIStyleSheetService.idl	\
 		$(NULL)
 
 EXPORTS		= \
 		nsBidi.h \
 		nsBidiPresUtils.h \

--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -48,18 +48,16 @@ ifdef ENABLE_TESTS
 DIRS		+= test
 endif
 
 MODULE		= layout
 LIBRARY_NAME	= gkforms_s
 LIBXUL_LIBRARY	= 1
 
 
-ifdef ACCESSIBILITY
-endif
 
 EXPORTS		= \
 		nsIListControlFrame.h \
 		nsIComboboxControlFrame.h \
 		nsIFormControlFrame.h \
 		nsIRadioControlFrame.h \
 		nsICheckboxControlFrame.h \
 		nsISelectControlFrame.h \

--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -45,18 +45,16 @@ ifdef ENABLE_TESTS
 DIRS		+= test
 endif
 
 MODULE		= layout
 LIBRARY_NAME	= gkgeneric_s
 LIBXUL_LIBRARY	= 1
 
 
-ifdef ACCESSIBILITY
-endif
 
 EXPORTS		= \
 		nsQueryFrame.h \
 		nsFrameList.h \
 		nsHTMLParts.h \
 		nsHTMLReflowMetrics.h \
 		nsHTMLReflowState.h \
 		nsIAnonymousContentCreator.h \

--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -42,18 +42,16 @@ VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = inspector
 LIBRARY_NAME = inspector_s
 LIBXUL_LIBRARY = 1
 
 
-ifdef ACCESSIBILITY
-endif
 
 CPPSRCS= \
   inDeepTreeWalker.cpp \
   inFlasher.cpp \
   inSearchLoop.cpp \
   inCSSValueSearch.cpp \
   inDOMUtils.cpp \
   inLayoutUtils.cpp \

--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -42,18 +42,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
 LIBRARY_NAME	= gktable_s
 LIBXUL_LIBRARY	= 1
 
 
-ifdef ACCESSIBILITY
-endif
 
 EXPORTS		= \
 		nsITableCellLayout.h \
 		nsITableLayout.h \
 		$(NULL)
 
 CPPSRCS		= \
 		BasicTableLayoutStrategy.cpp \

--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -42,18 +42,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout
 LIBRARY_NAME	= gkxulbase_s
 LIBXUL_LIBRARY	= 1
 
 
-ifdef MOZ_ENABLE_CANVAS
-endif
 
 ifdef MOZ_XUL
 PARALLEL_DIRS = tree/public tree/src grid
 endif
 
 CPPSRCS		= \
 		nsScrollBoxFrame.cpp \
 		nsRootBoxFrame.cpp \

--- a/media/libtheora/lib/Makefile.in
+++ b/media/libtheora/lib/Makefile.in
@@ -71,18 +71,17 @@ CSRCS		= \
 		info.c \
 		fragment.c \
 		apiwrapper.c \
 		decode.c \
 		$(NULL)
 
 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		+= \
 		mmxfrag.c \
 		mmxloopfilter.c \
 		x86state.c \
 		mmxstate.c \
 		mmxidct.c \

--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@@ -47,18 +47,16 @@ XPIDL_MODULE	= layout
 LIBRARY_NAME	= gkplugin
 EXPORT_LIBRARY = 1
 IS_COMPONENT    = 1
 MODULE_NAME	= nsPluginModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-endif
 
 CPPSRCS		= \
 		nsNPAPIPlugin.cpp \
 		nsNPAPIPluginInstance.cpp \
 		nsPluginHost.cpp \
 		nsPluginModule.cpp \
 		nsJSNPRuntime.cpp \
 		$(NULL)

--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -51,18 +51,16 @@ MODULE_NAME = nsToolkitCompsModule
 LIBXUL_LIBRARY = 1
 
 ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2))
 ALERTS_SERVICE=1
 DEFINES += -DALERTS_SERVICE
 endif
 
 
-ifdef ALERTS_SERVICE
-endif
 
 EXPORTS = nsToolkitCompsCID.h
 
 CPPSRCS = nsToolkitCompsModule.cpp
 
 include $(topsrcdir)/config/config.mk
 
 LOCAL_INCLUDES = \

--- a/toolkit/themes/faststripe/Makefile.in
+++ b/toolkit/themes/faststripe/Makefile.in
@@ -41,13 +41,10 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = global
 #DIRS += mozapps
 
-ifdef MOZ_HELP_VIEWER
-#DIRS	+= help
-endif
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -43,24 +43,18 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = xulapp
 LIBRARY_NAME = xulapp_s
 LIBXUL_LIBRARY = 1
 
 
-ifdef MOZ_JPROF
-endif
 
-ifdef NS_TRACE_MALLOC
-endif
 
-ifdef MOZ_CRASHREPORTER
-endif
 
 FORCE_STATIC_LIB = 1
 
 XPIDLSRCS = \
 	nsINativeAppSupport.idl \
 	$(NULL)
 
 ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))

--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -67,18 +67,16 @@ endif
 endif
 
 VPATH		:= $(srcdir) $(srcdir)/$(OSDIR)
 
 MODULE = exthandler
 LIBRARY_NAME    = exthandler_s
 LIBXUL_LIBRARY  = 1
 
-ifdef MOZ_PHOENIX
-endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 
 CMMSRCS	= nsOSHelperAppService.mm \
 			nsMIMEInfoMac.mm \
 			nsLocalHandlerAppMac.mm \
 			$(NULL)
 else

--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -47,18 +47,16 @@ LIBRARY_NAME	= widget_mac
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetMacModule
 XPIDL_MODULE	= widget_cocoa
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
-ifdef ACCESSIBILITY
-endif
 
 EXPORTS = \
 		mozView.h \
 		nsChangeObserver.h \
 		$(NULL)
 
 CMMSRCS = \
 		nsBidiKeyboard.mm \

--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -48,18 +48,16 @@ EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsWidgetGtk2Module
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 NATIVE_THEME_SUPPORT = 1
 
 
-ifdef MOZ_X11
-endif
 
 CSRCS		= \
 		mozcontainer.c \
 		keysym2ucs.c \
 		$(NULL)
 
 ifdef ACCESSIBILITY
 CSRCS += maiRedundantObjectFactory.c
@@ -102,18 +100,16 @@ endif
 
 ifdef MOZ_X11
 CPPSRCS += 	nsClipboard.cpp \
 		nsDragService.cpp \
 		$(NULL)
 endif
 
 # build our subdirs, too
-ifdef ACCESSIBILITY
-endif
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_COMPONENT_LIBS) \
 		-lgkgfx \
                 $(MOZ_STARTUP_NOTIFICATION_LIBS) \
 		$(XLDFLAGS) \

--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -59,18 +59,16 @@ LIBXUL_LIBRARY = 1
 ifdef MOZ_ENABLE_LIBXUL
 EXPORT_LIBRARY = 1
 endif
 
 GRE_MODULE	= 1
 MOZILLA_INTERNAL_API = 1
 
 
-ifdef NS_TRACE_MALLOC
-endif
 
 CSRCS		= \
 		$(XPCOM_GLUE_SRC_LCSRCS) \
 		$(NULL)
 
 CPPSRCS		= \
 		$(XPCOM_GLUE_SRC_LCPPSRCS) \
 		$(XPCOM_GLUENS_SRC_LCPPSRCS) \

--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -47,18 +47,16 @@ EXTRA_DEPS += $(srcdir)/objs.mk
 
 DIRS            = standalone
 
 MODULE		= xpcom
 LIBRARY_NAME	= xpcomglue_s
 DIST_INSTALL	= 1
 
 
-ifdef NS_TRACE_MALLOC
-endif
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../build \
 		$(NULL)
 
 CSRCS		= \
 		$(XPCOM_GLUE_SRC_LCSRCS) \
 		$(NULL)  

--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@@ -43,18 +43,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= browser
 LIBRARY_NAME	= mozbrwsr_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 MODULE_NAME	= nsBrowserModule
 
-ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER))
-endif
 
 CPPSRCS		= \
 		nsBrowserInstance.cpp \
 		nsBrowserStatusFilter.cpp \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \