Bug 513032 - remove empty conditionals in our makefiles, r=ted

Author: bsmedberg

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 \

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 \

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 \

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:

build/pymake/pymake/parserdata.py

@@ -335,10 +335,11 @@ def __init__(self, loc, condition):
         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 @@ def dump(self, fd, 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')
 

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

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)

content/base/src/Makefile.in

@@ -47,8 +47,6 @@ LIBRARY_NAME	= gkconbase_s
 LIBXUL_LIBRARY	= 1
 
 
-ifdef ACCESSIBILITY
-endif
 
 EXPORTS		= \
 		nsAtomListUtils.h \

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 \

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 \