Bug 509533 - Remove obsolete "MOZ_WIDGET_TOOLKIT =/!= mac" checks, in comm-central; (Av1) /suite/*/Makefile.in

r+a-seamonkey2.0=kairo

suite/app/Makefile.in

@@ -90,14 +90,14 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(MOZDEPTH)/staticlib
 endif
 LIBS += $(MOZDEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 else
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 LIBS += $(DIST)/bin/XUL
 else
 EXTRA_DSO_LIBS += xul
 endif
 endif
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 TK_LIBS := -framework Cocoa $(TK_LIBS)
 ifdef BUILD_STATIC_LIBS
 TK_LIBS := -framework SystemConfiguration $(TK_LIBS)
@@ -211,7 +211,7 @@ ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-rules.mk
 endif
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifdef BUILD_STATIC_LIBS
 LIBS	+= -lcups
 endif
@@ -281,7 +281,7 @@ endif
 libs:: blocklist.xml
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 # copy .dmg contents into obj dir branding
 export::

suite/browser/test/Makefile.in

@@ -63,7 +63,7 @@ _BROWSER_FILES = browser_bug413915.js \
                  browser_scope.js \
     $(NULL)
 
-ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 _BROWSER_FILES += browser_bug462289.js
 endif
 

suite/build/Makefile.in

@@ -120,11 +120,10 @@ endif
 endif
 
 # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += \
 	$(TK_LIBS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-

suite/common/Makefile.in

@@ -65,6 +65,6 @@ CHROME_DEPS += $(abs_srcdir)/app-license.html
 DEFINES += -DAPP_EULA_BLOCK=$(abs_srcdir)/app-license.html
 
 # once we support the shell service, define this for supported platforms
-#ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
+#ifneq (,$(filter windows gtk2 cocoa,$(MOZ_WIDGET_TOOLKIT)))
 #DEFINES += -DHAVE_SHELL_SERVICE=1
 #endif

suite/locales/Makefile.in

@@ -281,7 +281,7 @@ $(STAGEDIST): AB_CD:=en-US
 $(STAGEDIST): UNPACKAGE=$(ZIP_IN)
 $(STAGEDIST): $(ZIP_IN)
 # only mac needs to remove the parent of STAGEDIST...
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	if test -d $(DIST)/l10n-stage; then \
 	  $(RM) -r -v $(DIST)/l10n-stage; \
 	fi
@@ -343,7 +343,7 @@ ifdef MOZ_MAKE_COMPLETE_MAR
 endif
 # packaging done, undo l10n stuff
 ifneq (en,$(AB))
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj
 endif
 endif