Additional followup #3 to bug 398573 - remove more REQUIRES by fixing another bug in the script

browser/app/Makefile.in

@@ -178,7 +178,6 @@ EXTRA_DEPS	+= \
 DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
-REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)
 endif
 

browser/components/shell/src/Makefile.in

@@ -58,10 +58,6 @@ CPPSRCS = nsMacShellService.cpp
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 CPPSRCS = nsGNOMEShellService.cpp
-REQUIRES	+= \
-		mozgnome \
-		thebes \
-		$(NULL)
 endif
 endif
 endif

build/pymake/pymake/parserdata.py

@@ -493,5 +493,5 @@ def iterstatements(stmts):
     for s in stmts:
         yield s
         if isinstance(s, ConditionBlock):
-            for c, sl in iterstatements(s):
-                for s2 in sl: yield s2
+            for c, sl in s:
+                for s2 in iterstatements(sl): yield s2

toolkit/components/build/Makefile.in

@@ -89,7 +89,6 @@ SHARED_LIBRARY_LIBS += ../parentalcontrols/src/$(LIB_PREFIX)parentalcontrols_s.$
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../parentalcontrols/src \
 	$(NULL)
-REQUIRES += parentalcontrols
 endif
 endif
 

toolkit/components/downloads/src/Makefile.in

@@ -57,7 +57,6 @@ CPPSRCS   = \
 ifndef GNU_CXX
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += nsDownloadScanner.cpp
-REQUIRES += xulapp
 endif
 endif
 

toolkit/library/Makefile.in

@@ -145,10 +145,6 @@ EXTRA_DEPS += \
 	$(topsrcdir)/rdf/util/src/objs.mk \
 	$(NULL)
 
-REQUIRES += \
-	rdf \
-	rdfutil \
-	$(NULL)
 
 CPPSRCS += \
 	$(RDF_UTIL_SRC_LCPPSRCS) \

widget/tests/Makefile.in

@@ -47,11 +47,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ifdef NS_ENABLE_TSF
 CPP_UNIT_TESTS += TestWinTSF.cpp  \
                   $(NULL)
-REQUIRES += appshell content docshell \
-            dom embed_base gfx layout locale \
-            necko string thebes uriloader view \
-            webbrwsr widget xpcom \
-            $(NULL)
 endif
 endif