Bug 509533 - Remove obsolete "MOZ_WIDGET_TOOLKIT =/!= mac" checks, in comm-central; (Av1) /suite/*/Makefile.in
authorSerge Gautherie <sgautherie.bz@free.fr>
Wed, 23 Sep 2009 00:13:59 +0200
changeset 3887 522b6f6cdcd24919ac9cbca1f37e88b82c08f802
parent 3886 f761db8a2b2eec41f4990f31feebd9e77b06c25b
child 3888 b48f9f075fe89274f14fce6df0ca42c3b2d78177
push id3037
push usersgautherie.bz@free.fr
push dateTue, 22 Sep 2009 22:18:07 +0000
treeherdercomm-central@b48f9f075fe8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs509533
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
suite/browser/test/Makefile.in
suite/build/Makefile.in
suite/common/Makefile.in
suite/locales/Makefile.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -85,24 +85,24 @@ LOCAL_INCLUDES += -I$(MOZILLA_SRCDIR)/to
 ifdef BUILD_STATIC_LIBS
 ifdef _MSC_VER
 STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(MOZDEPTH)/staticlib
 else
 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)
 endif
 endif
 
 ifdef MOZ_ENABLE_LIBXUL
 APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS)
@@ -206,17 +206,17 @@ include $(topsrcdir)/config/rules.mk
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DMOZILLA_OFFICIAL
 endif
 
 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
 LIBS	+= -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 #
@@ -276,17 +276,17 @@ ifeq ($(OS_ARCH),WINNT)
 else
 	$(INSTALL) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/
 endif
 	touch $(DIST)/bin/.autoreg
 
 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::
 ifndef MOZ_BRANDING_DIRECTORY
 	$(NSINSTALL) -D $(DIST)/branding
 	cp $(topsrcdir)/suite/branding/package/mac/dsstore $(DIST)/branding/dsstore
 	cp $(topsrcdir)/suite/branding/package/mac/background.png $(DIST)/branding/background.png
 	cp $(topsrcdir)/suite/branding/package/mac/disk.icns $(DIST)/branding/disk.icns
--- a/suite/browser/test/Makefile.in
+++ b/suite/browser/test/Makefile.in
@@ -58,17 +58,17 @@ include $(topsrcdir)/config/rules.mk
                  browser_pluginnotification.js \
                  plugin_unknown.html \
                  plugin_test.html \
                  plugin_both.html \
                  plugin_both2.html \
                  browser_scope.js \
     $(NULL)
 
-ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 _BROWSER_FILES += browser_bug462289.js
 endif
 
 libs:: $(addprefix mochitest/, $(_TEST_FILES))
 	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
 libs:: $(addprefix browser/, $(_BROWSER_FILES))
 	$(INSTALL) $(foreach f,$^,"$f") $(MOZDEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -115,16 +115,15 @@ ifeq ($(OS_ARCH),WINNT)
 SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
 ifeq (,$(MOZ_ENABLE_LIBXUL)$(MOZILLA_1_9_1_BRANCH))
 EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)thebes.$(LIB_SUFFIX)
 endif
 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
-
--- a/suite/common/Makefile.in
+++ b/suite/common/Makefile.in
@@ -60,11 +60,11 @@ CHROME_DEPS += $(abs_srcdir)/app-license
 
 # DEFINES for preprocessing
 # Use suite/common/app-license.html as input when generating 
 # chrome://content/communicator/license.html to override 
 # chrome://global/content/license.html (about:license)
 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
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -276,17 +276,17 @@ PKG_DMG_SOURCE = $(MOZ_PKG_APPNAME)
 else
 STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)
 endif
 
 $(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
 else
 # ... and windows doesn't like removing STAGEDIST itself, remove all children
 	if test -d $(DIST)/l10n-stage; then \
 	  find $(STAGEDIST) -maxdepth 1 -print0 | xargs -0 $(RM) -r ; \
 	fi
@@ -338,17 +338,17 @@ endif
 ifdef MOZ_MAKE_COMPLETE_MAR
 	$(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \
 	  MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \
 	  PACKAGE_BASE_DIR="$(_ABS_DIST)/l10n-stage" \
 	  DIST="$(_ABS_DIST)"
 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
 	$(MAKE) clobber-zip AB_CD=$(AB_CD)
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 	mv -f "$(DIST)/l10n-stage/$(PACKAGE)" "$(DIST)/$(PACKAGE)"
 
 repackage-zip-%: $(ZIP_IN) $(STAGEDIST) libs-%