Additional followup to bug 398573 - remove REQUIRES from the tree even when they are in makefile conditional blocks

--HG-- extra : rebase_source : cc65c34a414e6c67a5651fc9cf0b6bd709ebcdbd
2009-08-27 08:53:13 -07:00 · 2009-08-27 08:53:13 -07:00 · 36bc86429d
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1


 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-REQUIRES += editor
 endif

 CPPSRCS = \
--- a/accessible/src/xforms/Makefile.in
+++ b/accessible/src/xforms/Makefile.in
@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1


 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-REQUIRES += editor
 endif

 CPPSRCS = \
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1


 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-REQUIRES += editor
 endif

 CPPSRCS = \
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@ -92,10 +92,6 @@ else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif

-REQUIRES = \
-	xpcom \
-	string \
-	$(NULL)

 CPPSRCS = nsBrowserApp.cpp

--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@ -58,7 +58,6 @@ EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_D
 # migration requires mozreg, which doesn't build on WINCE; only include
 # it on non-CE
 ifndef WINCE
-REQUIRES += migration
 LOCAL_INCLUDES += -I$(srcdir)/../migration/src
 SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX)
 EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@ -52,9 +52,6 @@ endif

 ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
 CPPSRCS = nsWindowsShellService.cpp
-REQUIRES	+= \
-		browsercomps \
-		$(NULL)
 else
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS = nsMacShellService.cpp
--- a/build/pymake/pymake/parserdata.py
+++ b/build/pymake/pymake/parserdata.py
@ -493,4 +493,5 @@ def iterstatements(stmts):
    for s in stmts:
        yield s
        if isinstance(s, ConditionBlock):
-            for c, ss in iterstatements(s): yield ss
+            for c, sl in iterstatements(s):
+                for s2 in sl: yield s2
--- a/build/wince/shunt/Makefile.in
+++ b/build/wince/shunt/Makefile.in
@ -72,7 +72,6 @@ EXPORTS_mozce_shunt = \
 DIRS += include/sys

 ifdef MOZ_MEMORY
-REQUIRES = jemalloc 
 CFLAGS += -DMOZ_MEMORY
 CXXFLAGS += -DMOZ_MEMORY
 EXPORTS_mozce_shunt += $(topsrcdir)/memory/jemalloc/jemalloc.h
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -48,7 +48,6 @@ LIBXUL_LIBRARY	= 1


 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif

 EXPORTS		= \
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@ -48,18 +48,6 @@ LIBXUL_LIBRARY = 1


 ifndef MOZ_XSLT_STANDALONE
-REQUIRES	+= unicharutil \
-		  dom \
-		  content \
-		  layout \
-		  pref \
-		  widget \
-		  necko \
-		  caps \
-		  xpconnect \
-		  js \
-		  htmlparser \
-		  $(NULL)
 endif

 CPPSRCS	= txDouble.cpp \
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@ -48,21 +48,7 @@ LIBXUL_LIBRARY = 1


 ifndef MOZ_XSLT_STANDALONE
-REQUIRES += \
-		  js \
-		  xpconnect \
-		  dom \
-		  content \
-		  layout \
-		  pref \
-		  widget \
-		  unicharutil \
-		  necko \
-		  htmlparser \
-		  caps \
-		  $(NULL)
 else
-REQUIRES += expat
 endif

 CPPSRCS	= \
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@ -48,17 +48,6 @@ LIBXUL_LIBRARY = 1


 ifndef MOZ_XSLT_STANDALONE
-REQUIRES +=	  dom \
-		  content \
-		  widget \
-		  xpconnect \
-		  js \
-		  unicharutil \
-		  layout \
-		  necko \
-		  htmlparser \
-		  pref \
-		  $(NULL)
 endif

 CPPSRCS = \
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@ -48,31 +48,7 @@ LIBXUL_LIBRARY = 1


 ifndef MOZ_XSLT_STANDALONE
-REQUIRES += \
-		  dom \
-		  content \
-		  widget \
-		  necko \
-		  unicharutil \
-		  xpconnect \
-		  js \
-		  htmlparser \
-		  webshell \
-		  docshell \
-		  layout \
-		  uconv \
-		  caps \
-		  windowwatcher \
-		  mimetype \
-		  intl \
-		  locale \
-		  htmlparser \
-		  pref \
-		  $(NULL)
 else
-REQUIRES += \
-		  expat \
-		  $(NULL)
 endif

 CPPSRCS = \
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@ -48,7 +48,6 @@ LIBXUL_LIBRARY = 1


 ifdef MOZ_STORAGE
-REQUIRES += storage
 endif

 CPPSRCS =                  \
--- a/embedding/browser/activex/src/plugin/Makefile.in
+++ b/embedding/browser/activex/src/plugin/Makefile.in
@ -63,10 +63,6 @@ GRE_MODULE	= 1


 ifdef XPC_IDISPATCH_SUPPORT
-REQUIRES += \
-	caps \
-	string \
-	$(NULL)
 endif
 XPIFILE         = mozactivex.xpi

--- a/embedding/browser/gtk/src/Makefile.in
+++ b/embedding/browser/gtk/src/Makefile.in
@ -51,7 +51,6 @@ DEFINES += -DIMPL_XREAPI


 ifdef ACCESSIBILITY
-REQUIRES        += accessibility
 endif

 CPPSRCS		= \
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@ -51,7 +51,6 @@ LIBXUL_LIBRARY	= 1


 ifdef MOZ_PHOENIX
-REQUIRES	+= toolkitcomps
 endif

 EXPORTS         = \
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@ -63,7 +63,6 @@ CPPSRCS          = nsReadConfig.cpp    \
                   $(NULL)

 ifdef MOZ_LDAP_XPCOM
-REQUIRES         += mozldap 
 DEFINES          += -DMOZ_LDAP_XPCOM
 CPPSRCS          += nsLDAPSyncQuery.cpp
 endif
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -65,7 +65,6 @@ CPPSRCS = \
        $(NULL)

 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-REQUIRES += uconv
 endif

 EXTRA_DSO_LDOPTS = \
--- a/gfx/src/thebes/Makefile.in
+++ b/gfx/src/thebes/Makefile.in
@ -55,7 +55,6 @@ LIBXUL_LIBRARY = 1


 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-REQUIRES += uconv
 endif

 CPPSRCS		= \
@ -83,10 +82,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 CPPSRCS		+= nsSystemFontsWin.cpp \
 		   $(NULL)

-REQUIRES	+= \
-		cairo \
-		qcms \
-		$(NULL)

 _OS_LIBS	= usp10
 OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
--- a/gfx/thebes/src/Makefile.in
+++ b/gfx/thebes/src/Makefile.in
@ -79,7 +79,6 @@ CPPSRCS	+=	gfxOS2Fonts.cpp \
 		gfxFontconfigUtils.cpp \
 		$(NULL)
 CPPSRCS +=	gfxPDFSurface.cpp
-REQUIRES += uconv locale
 endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@ -94,7 +93,6 @@ ifdef MOZ_X11
 CPPSRCS += gfxXlibSurface.cpp
 endif

-REQUIRES += locale
 CPPSRCS +=  gfxPlatformGtk.cpp gfxGdkNativeRenderer.cpp
 CPPSRCS +=	gfxPDFSurface.cpp gfxPSSurface.cpp
 CPPSRCS +=	gfxFontconfigUtils.cpp
@ -116,7 +114,6 @@ CPPSRCS += gfxDirectFBSurface.cpp
 endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-REQUIRES += locale
 CPPSRCS += gfxQtPlatform.cpp gfxQPainterSurface.cpp
 CPPSRCS += gfxXlibSurface.cpp gfxQtNativeRenderer.cpp
 CPPSRCS +=	gfxFT2Fonts.cpp
@ -127,7 +124,6 @@ EXTRA_DSO_LDOPTS += $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(CAIRO_FT_LIBS)
 endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-REQUIRES += locale
 CPPSRCS	+= 	gfxBeOSSurface.cpp gfxBeOSPlatform.cpp
 CPPSRCS +=	gfxPangoFonts.cpp 
 #CPPSRCS +=	gfxPDFSurface.cpp
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@ -70,7 +70,6 @@ CPPSRCS		= \
 		$(NULL)

 ifdef MOZ_USE_NATIVE_UCONV
-REQUIRES	+= ucnative
 else
 CPPSRCS         += \
 		nsISO88591ToUnicode.cpp \
--- a/intl/uconv/tests/Makefile.in
+++ b/intl/uconv/tests/Makefile.in
@ -48,12 +48,6 @@ XPCSHELL_TESTS	= unit
 ifndef MOZ_ENABLE_LIBXUL
 MOZILLA_INTERNAL_API = 1

-REQUIRES	= \
-		string \
-		xpcom \
-		uconv \
-		locale \
-		$(NULL)

 CPPSRCS		= \
 		TestUConv.cpp \
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@ -55,13 +55,6 @@ endif
 # REQUIRES	= java js

 ifndef JSD_STANDALONE
-REQUIRES += \
-		  string \
-		  xpcom \
-		  xpconnect \
-		  widget \
-		  dom \
-		  $(NULL)
 endif

 EXTRA_DSO_LDOPTS += \
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@ -159,7 +159,6 @@ endif # ENABLE_JIT

 ifdef MOZ_XPCTOOLS
 DEFINES         +=  -DXPC_TOOLS_SUPPORT
-REQUIRES	+= xpctools
 endif

 ifdef XPC_IDISPATCH_SUPPORT
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@ -54,7 +54,6 @@ LIBXUL_LIBRARY	= 1


 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif

 XPIDLSRCS	= \
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@ -160,9 +160,6 @@ ifndef MOZ_NO_INSPECTOR_APIS
 LOCAL_INCLUDES  += \
      -I$(srcdir)/../inspector/src \
      $(NULL)
-REQUIRES += \
-      inspector \
-      $(NULL)
 SHARED_LIBRARY_LIBS += ../inspector/src/$(LIB_PREFIX)inspector_s.$(LIB_SUFFIX)
 else
 DEFINES += -DMOZ_NO_INSPECTOR_APIS
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@ -54,7 +54,6 @@ LIBXUL_LIBRARY	= 1


 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif

 EXPORTS		= \
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@ -51,7 +51,6 @@ LIBXUL_LIBRARY	= 1


 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif

 EXPORTS		= \
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@ -48,7 +48,6 @@ LIBXUL_LIBRARY = 1


 ifdef ACCESSIBILITY
-REQUIRES        += accessibility
 endif

 CPPSRCS= \
@ -61,9 +60,6 @@ CPPSRCS= \
 	$(NULL)

 ifdef MOZ_XUL
-REQUIRES += \
-  xul \
-  $(NULL)
 CPPSRCS += \
  inDOMView.cpp \
  $(NULL)
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@ -48,7 +48,6 @@ LIBXUL_LIBRARY	= 1


 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif

 EXPORTS		= \
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -48,10 +48,6 @@ LIBXUL_LIBRARY	= 1


 ifdef MOZ_ENABLE_CANVAS
-REQUIRES        += \
-                cairo \
-                libpixman \
-                $(NULL)
 endif

 ifdef MOZ_XUL
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@ -55,7 +55,6 @@ LIBXUL_LIBRARY = 1


 ifndef MOZ_NO_XPCOM_OBSOLETE
-REQUIRES	+= xpcom_obsolete
 endif

 include $(topsrcdir)/config/config.mk
--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@ -53,7 +53,6 @@ LIBXUL_LIBRARY = 1


 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-REQUIRES	+= gtkxtbin
 endif

 CPPSRCS		= \
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@ -123,7 +123,6 @@ endif


 ifdef MOZ_STORAGE
-REQUIRES += storage
 DEFINES += -DNECKO_OFFLINE_CACHE
 endif

--- a/netwerk/cache/src/Makefile.in
+++ b/netwerk/cache/src/Makefile.in
@ -80,7 +80,6 @@ CPPSRCS += \
 	nsDiskCacheDeviceSQL.cpp \
 	$(NULL)

-REQUIRES += storage
 DEFINES += -DNECKO_OFFLINE_CACHE
 endif

--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@ -57,7 +57,6 @@ endif


 ifdef ALERTS_SERVICE
-REQUIRES	+= alerts
 endif

 EXPORTS = nsToolkitCompsCID.h
@ -109,7 +108,6 @@ endif
 ifdef MOZ_URL_CLASSIFIER
 SHARED_LIBRARY_LIBS += ../url-classifier/src/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX)
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
-REQUIRES += url-classifier
 endif

 ifdef MOZ_FEEDS
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@ -127,10 +127,6 @@ EXTRA_DEPS += \
 	$(topsrcdir)/intl/unicharutil/util/objs.mk \
 	$(NULL)

-REQUIRES += \
-	uconv \
-	unicharutil \
-	$(NULL)

 CPPSRCS += \
 	$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
--- a/toolkit/mozapps/update/src/updater/Makefile.in
+++ b/toolkit/mozapps/update/src/updater/Makefile.in
@ -74,7 +74,6 @@ else
 RCFLAGS += --include-dir $(srcdir)
 endif

-REQUIRES += string
 endif

 ifeq ($(OS_ARCH),WINCE)
@ -94,7 +93,6 @@ RCINCLUDE = updater_wince.rc
 endif
 DEFINES += -DUNICODE -D_UNICODE -DWINCE_SKIP_SHUNT_INCLUDE
 RCFLAGS += -I$(srcdir)
-REQUIRES += string
 LOCAL_INCLUDES += -I$(topsrcdir)/build/wince/shunt/include \
                  -I$(topsrcdir)/build/wince/shunt
 endif
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@ -67,7 +67,6 @@ CPPSRCS += \
 endif

 ifdef MOZ_ENABLE_LIBNOTIFY
-REQUIRES += thebes
 CPPSRCS += \
 	nsAlertsService.cpp \
 	nsAlertsIconListener.cpp \
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@ -49,15 +49,12 @@ LIBXUL_LIBRARY = 1


 ifdef MOZ_JPROF
-REQUIRES += jprof
 endif

 ifdef NS_TRACE_MALLOC
-REQUIRES += tracemalloc
 endif

 ifdef MOZ_CRASHREPORTER
-REQUIRES += crashreporter
 endif

 FORCE_STATIC_LIB = 1
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@ -73,12 +73,9 @@ LIBRARY_NAME    = exthandler_s
 LIBXUL_LIBRARY  = 1

 ifdef MOZ_PHOENIX
-REQUIRES	+= toolkitcomps
 endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-REQUIRES		+= windowwatcher \
-	             $(NULL)

 CMMSRCS	= nsOSHelperAppService.mm \
 			nsMIMEInfoMac.mm \
@ -111,7 +108,6 @@ endif

 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 OSHELPER  += nsMIMEInfoOS2.cpp
-REQUIRES  += widget
 endif

 EXPORTS = \
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@ -53,7 +53,6 @@ LIBXUL_LIBRARY = 1


 ifdef ACCESSIBILITY
-REQUIRES += accessibility
 endif

 EXPORTS = \
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@ -54,7 +54,6 @@ NATIVE_THEME_SUPPORT = 1


 ifdef MOZ_X11
-REQUIRES += gtkxtbin
 endif

 CSRCS		= \
@ -108,7 +107,6 @@ endif

 # build our subdirs, too
 ifdef ACCESSIBILITY
-REQUIRES	+= accessibility
 endif

 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@ -73,7 +73,6 @@ endif

 ifneq (,$(filter beos qt gtk2 os2 cocoa photon windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseFilePicker.cpp
-REQUIRES += docshell view intl
 endif

 ifneq (,$(filter qt gtk2 windows cocoa,$(MOZ_WIDGET_TOOLKIT)))
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@ -70,7 +70,6 @@ CPPSRCS		= \
 ifdef GC_LEAK_DETECTOR
 CSRCS += nsGarbageCollector.c
 CPPSRCS += nsLeakDetector.cpp
-REQUIRES	+= boehm
 endif

 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@ -65,7 +65,6 @@ MOZILLA_INTERNAL_API = 1


 ifdef NS_TRACE_MALLOC
-REQUIRES += tracemalloc
 endif

 CSRCS		= \
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@ -53,7 +53,6 @@ DIST_INSTALL	= 1


 ifdef NS_TRACE_MALLOC
-REQUIRES += tracemalloc
 endif

 LOCAL_INCLUDES	= \
--- a/xpcom/obsolete/Makefile.in
+++ b/xpcom/obsolete/Makefile.in
@ -62,7 +62,6 @@ CPPSRCS         = \
 		$(NULL)

 ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
-REQUIRES	+= libreg
 ifndef MOZ_ENABLE_LIBXUL
 CPPSRCS		+= dlldeps-obs.cpp
 endif
--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@ -49,7 +49,6 @@ LIBXUL_LIBRARY = 1
 MODULE_NAME	= nsBrowserModule

 ifneq (,$(MOZ_PHOENIX)$(MOZ_XULRUNNER))
-REQUIRES += toolkitcomps
 endif

 CPPSRCS		= \