--- a/calendar/base/Makefile.in
+++ b/calendar/base/Makefile.in
@@ -48,17 +48,17 @@ MODULE = calbase
MODULE_NAME = calBaseModule
DIRS = public src modules build
# Select a theme from which to pull our skin goodness
# OS X: pinstripe
# Others: winstripe
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
THEME = pinstripe
else
THEME = winstripe
endif
WINDOW_ICONS = calendar-alarm-dialog \
calendar-event-dialog \
--- a/calendar/installer/Makefile.in
+++ b/calendar/installer/Makefile.in
@@ -86,17 +86,17 @@ endif
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = packages-static
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
MOZ_PKG_MAC_DSSTORE=branding/dsstore
MOZ_PKG_MAC_BACKGROUND=branding/background.png
MOZ_PKG_MAC_ICON=branding/disk.icns
endif
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
ifeq (WINNT,$(OS_ARCH))
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -95,17 +95,17 @@ DIRS = ../libical \
components \
locales \
$(NULL)
# Select a theme from which to pull our skin goodness
# OS X: pinstripe
# Others: winstripe
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
THEME=pinstripe
else
THEME=winstripe
endif
DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
-DAB_CD=$(AB_CD) \
-DFIREFOX_VERSION=$(FIREFOX_VERSION) \
--- a/calendar/resources/Makefile.in
+++ b/calendar/resources/Makefile.in
@@ -44,17 +44,17 @@ EXTRA_COMPONENTS = \
$(NULL)
include $(DEPTH)/config/autoconf.mk
# Select a theme from which to pull our skin goodness
# OS X: pinstripe
# Others: winstripe
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
THEME = pinstripe
else
THEME = winstripe
endif
DEFINES += -DTHEME=$(THEME)
ifdef MOZ_UPDATER
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -104,24 +104,24 @@ LOCAL_INCLUDES += -I$(MOZILLA_SRCDIR)/to
ifdef BUILD_STATIC_LIBS
ifdef _MSC_VER
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DEPTH)/staticlib
else
STATIC_COMPONENTS_LINKER_PATH = -L$(DEPTH)/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 -framework CoreAudio -framework AudioToolbox -framework AudioUnit $(TK_LIBS)
endif
endif
ifdef MOZ_ENABLE_LIBXUL
APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS)
@@ -183,17 +183,17 @@ CPPSRCS += $(STATIC_CPPSRCS)
EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIBS)
REQUIRES += $(STATIC_REQUIRES)
EXTRA_LIBS += $(STATIC_EXTRA_LIBS)
ifndef MOZILLA_1_9_1_BRANCH
ifndef MOZILLA_1_9_2_BRANCH
# OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
OS_LIBS += -framework OpenGL
endif
endif # MOZILLA_1_9_2_BRANCH
endif # MOZILLA_1_9_1_BRANCH
endif # BUILD_STATIC_LIBS
@@ -241,17 +241,17 @@ DEFINES += -DMOZILLA_OFFICIAL
endif
DEFINES += -DSUNBIRD_ICO=\"$(DIST)/branding/sunbird.ico\"
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 += -framework QuickTime -framework IOKit
endif
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
LIBS += -lphexlib
endif
@@ -298,17 +298,17 @@ libs::
install::
$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default
endif
libs::
touch $(DIST)/bin/.autoreg
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
APP_NAME = $(MOZ_APP_DISPLAYNAME)
ifdef MOZ_DEBUG
APP_NAME := $(APP_NAME)Debug
endif
MAC_CREATOR_CODE = MOZc
--- a/calendar/sunbird/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+++ b/calendar/sunbird/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
@@ -45,17 +45,17 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
DEFINES += -DSUNBIRD_VERSION=$(SUNBIRD_VERSION)
# Select a theme from which to pull our skin goodness
# OS X: pinstripe
# Others: winstripe
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
THEME = pinstripe
else
THEME = winstripe
endif
FILES := \
install.rdf \
$(srcdir)/chrome.manifest \
--- a/calendar/sunbird/base/Makefile.in
+++ b/calendar/sunbird/base/Makefile.in
@@ -43,17 +43,17 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
# Select a theme from which to pull our skin goodness
# OS X: pinstripe
# Others: winstripe
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
THEME = pinstripe
else
THEME = winstripe
endif
DEFINES += \
-DAPP_VERSION="$(APP_VERSION)" \
-DTHEME=$(THEME) \
--- a/calendar/sunbird/branding/nightly/Makefile.in
+++ b/calendar/sunbird/branding/nightly/Makefile.in
@@ -59,17 +59,17 @@ ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi
cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
cp $(srcdir)/license.txt $(DIST)/branding/license.txt
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
cp $(srcdir)/sunbird.icns $(DIST)/branding/sunbird.icns
cp $(srcdir)/sb_ICS.icns $(DIST)/branding/sb_ICS.icns
cp $(srcdir)/background.png $(DIST)/branding/background.png
cp $(srcdir)/dsstore $(DIST)/branding/dsstore
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(srcdir)/mozicon128.png $(DIST)/branding/default128.png
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -100,24 +100,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)
@@ -184,17 +184,17 @@ DEFINES += $(STATIC_DEFINES)
CPPSRCS += $(STATIC_CPPSRCS)
EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIBS)
REQUIRES += $(STATIC_REQUIRES)
EXTRA_LIBS += $(STATIC_EXTRA_LIBS)
ifndef MOZILLA_1_9_2_BRANCH
# OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
OS_LIBS += -framework OpenGL
endif
endif # MOZILLA_1_9_2_BRANCH
endif # BUILD_STATIC_LIBS
ifeq ($(OS_ARCH),WINNT)
@@ -242,17 +242,17 @@ ifdef BUILD_STATIC_LIBS
include $(topsrcdir)/config/static-rules.mk
DEFINES += -DIMPL_XREAPI
endif
APP_UA_NAME = $(shell echo $(MOZ_APP_DISPLAYNAME) | sed -e's/[^A-Za-z]//g')
DEFINES += -DAPP_VERSION="$(MOZ_APP_VERSION)" -DAPP_UA_NAME="$(APP_UA_NAME)"
-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)
#
@@ -334,17 +334,17 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
LIBS += -lphexlib
endif
libs:: $(srcdir)/profile/prefs.js
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
AB := $(firstword $(subst -, ,$(AB_CD)))
APP_NAME = $(MOZ_APP_DISPLAYNAME)
ifdef MOZ_DEBUG
APP_NAME := $(APP_NAME)Debug
endif
--- a/mail/base/Makefile.in
+++ b/mail/base/Makefile.in
@@ -45,17 +45,21 @@ include $(DEPTH)/config/autoconf.mk
DIRS = modules
PRE_RELEASE_SUFFIX := $(shell $(PYTHON) $(topsrcdir)/mozilla/config/printprereleasesuffix.py \
$(MOZ_APP_VERSION))
DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
-ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
+ifdef MOZILLA_OFFICIAL
+DEFINES += -DOFFICIAL_BUILD=1
+endif
+
+ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DHAVE_SHELL_SERVICE=1
endif
ifdef MOZ_UPDATER
DEFINES += -DMOZ_UPDATER=1
endif
ifdef ENABLE_TESTS
--- a/mail/branding/nightly/Makefile.in
+++ b/mail/branding/nightly/Makefile.in
@@ -56,17 +56,17 @@ export::
$(NSINSTALL) -D $(DIST)/branding
ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/thunderbird.ico $(DIST)/branding/thunderbird.ico
cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi
cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
cp $(srcdir)/background.png $(DIST)/branding/background.png
cp $(srcdir)/dsstore $(DIST)/branding/dsstore
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
cp $(srcdir)/thunderbird.icns $(DIST)/branding/thunderbird.icns
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(srcdir)/mailicon16.png $(DIST)/branding/default16.png
cp $(srcdir)/mailicon22.png $(DIST)/branding/default22.png
--- a/mail/branding/unofficial/Makefile.in
+++ b/mail/branding/unofficial/Makefile.in
@@ -56,17 +56,17 @@ export::
$(NSINSTALL) -D $(DIST)/branding
ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/thunderbird.ico $(DIST)/branding/thunderbird.ico
cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi
cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
cp $(srcdir)/background.png $(DIST)/branding/background.png
cp $(srcdir)/dsstore $(DIST)/branding/dsstore
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
cp $(srcdir)/thunderbird.icns $(DIST)/branding/thunderbird.icns
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(srcdir)/mailicon16.png $(DIST)/branding/default16.png
cp $(srcdir)/mailicon22.png $(DIST)/branding/default22.png
--- a/mail/components/Makefile.in
+++ b/mail/components/Makefile.in
@@ -41,17 +41,17 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# Only Mac and Windows have search integration components, but we include at
# least one module from search/ on all platforms
DIRS = compose preferences addrbook migration activity search
-ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
DIRS += shell
endif
ifdef MOZ_SAFE_BROWSING
DIRS += phishing
endif
ifndef MOZILLA_1_9_2_BRANCH
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -97,17 +97,17 @@ LOCAL_INCLUDES += \
$(NULL)
endif
endif
SHARED_LIBRARY_LIBS = \
../migration/src/$(LIB_PREFIX)profilemigration_s.$(LIB_SUFFIX) \
$(NULL)
-ifneq (,$(filter windows mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
SHARED_LIBRARY_LIBS += ../shell/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
endif
ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
ifndef MOZ_DISABLE_VISTA_SDK_REQUIREMENTS
SHARED_LIBRARY_LIBS += ../search/$(LIB_PREFIX)winsearch_s.$(LIB_SUFFIX)
endif
endif
@@ -129,15 +129,15 @@ EXTRA_DSO_LDOPTS += \
$(LIBXUL_DIST)/../modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
endif
# Mac: Need to link to CoreFoundation for Mac shell service
# GTK2: Need to link with glib for GNOME shell service
-ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
--- a/mail/components/migration/src/Makefile.in
+++ b/mail/components/migration/src/Makefile.in
@@ -47,17 +47,17 @@ ifeq ($(OS_ARCH),WINNT)
CPPSRCS += \
nsProfileMigratorBase.cpp \
nsOEProfileMigrator.cpp \
nsOutlookProfileMigrator.cpp \
nsEudoraProfileMigrator.cpp \
$(NULL)
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += \
nsProfileMigratorBase.cpp \
nsEudoraProfileMigrator.cpp \
$(NULL)
endif
FORCE_STATIC_LIB = 1
--- a/mail/components/preferences/Makefile.in
+++ b/mail/components/preferences/Makefile.in
@@ -39,15 +39,15 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
-ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DHAVE_SHELL_SERVICE=1
endif
ifdef MOZ_UPDATER
DEFINES += -DMOZ_UPDATER=1
endif
--- a/mail/components/search/Makefile.in
+++ b/mail/components/search/Makefile.in
@@ -42,28 +42,28 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# Include SearchIntegration.js on all platforms
EXTRA_PP_JS_MODULES = \
SearchIntegration.js \
$(NULL)
-ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DIRS += mdimporter
endif
ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
ifndef MOZ_DISABLE_VISTA_SDK_REQUIREMENTS
DIRS += wsenable
endif
endif
# If on Mac, build Spotlight integration
-ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_PP_JS_MODULES += \
SpotlightIntegration.js \
$(NULL)
endif
# If on Windows, build Windows Search integration
ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
ifndef MOZ_DISABLE_VISTA_SDK_REQUIREMENTS
--- a/mail/components/shell/Makefile.in
+++ b/mail/components/shell/Makefile.in
@@ -76,17 +76,17 @@ REQUIRES = \
ifeq ($(OS_ARCH),WINNT)
CPPSRCS = nsMailWinIntegration.cpp
endif
ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
CPPSRCS = nsMailGNOMEIntegration.cpp
endif
-ifeq (,$(filter-out mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS = nsMailMacIntegration.cpp
endif
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
JS_SET_MAIL_COMPONENT = nsSetDefaultMail.js
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -73,17 +73,17 @@ endif
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = package-manifest
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
MOZ_PKG_MAC_DSSTORE=branding/dsstore
MOZ_PKG_MAC_BACKGROUND=branding/background.png
MOZ_PKG_MAC_ICON=branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
endif
# You do *NOT* want to set MAIL_PKG_SHARED: shared builds are slower at
# everything except being rebuilt. It only exists so we can package builds
--- a/mail/jquery/Makefile.in
+++ b/mail/jquery/Makefile.in
@@ -49,17 +49,17 @@ PRE_RELEASE_SUFFIX := $(shell $(PYTHON)
DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
ifdef MOZILLA_OFFICIAL
DEFINES += -DOFFICIAL_BUILD=1
endif
-ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DHAVE_SHELL_SERVICE=1
endif
ifdef MOZ_UPDATER
DEFINES += -DMOZ_UPDATER=1
endif
include $(topsrcdir)/config/rules.mk
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -111,17 +111,17 @@ libs-%:
$(NSINSTALL) -D $(DIST)/install
@$(MAKE) -C ../../mozilla/toolkit/locales libs-$* BOTH_MANIFESTS=1
@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
@$(MAKE) -C ../../mozilla/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
@$(MAKE) tests AB_CD=$*
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
-ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
endif
PACKAGER_NO_LIBS = 1
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
@@ -156,27 +156,27 @@ repackage-win32-installer: $(WIN32_INSTA
ifeq (WINNT,$(OS_ARCH))
repackage-win32-installer-%: $(WIN32_INSTALLER_IN) libs-%
@$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN=$(WIN32_INSTALLER_IN)
else
repackage-win32-installer-%: ;
endif
-ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/MacOS
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
@@ -205,32 +205,32 @@ ifeq (WINNT,$(OS_ARCH))
$(NSINSTALL) -D $(STAGEDIST)/uninstall
cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall
endif
# copy xpi-stage over, but not install.rdf and chrome.manifest,
# those are just for language packs
cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
tar --exclude=install.rdf --exclude=chrome.manifest $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - )
ifneq (en,$(AB))
-ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj
endif
endif
$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
cd $(DIST)/l10n-stage; \
$(MAKE_PACKAGE)
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-%
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@@ -126,11 +126,11 @@ LOCAL_INCLUDES += -I$(srcdir) \
$(NULL)
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,shell32)
endif
-ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
OS_LIBS += -framework Carbon
endif
--- a/mailnews/base/ispdata/Makefile.in
+++ b/mailnews/base/ispdata/Makefile.in
@@ -52,17 +52,17 @@ ifdef MOZ_THUNDERBIRD
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXPORT_RESOURCE_FILES += movemail.rdf
endif
else
EXPORT_RESOURCE_FILES += movemail.rdf
endif
endif
-ifeq (,$(filter-out mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXPORT_RESOURCE_FILES += dotmac.rdf
endif
include $(topsrcdir)/config/rules.mk
GARBAGE += $(addprefix $(EXPORT_DIR)/, $(EXPORT_RESOURCE_FILES))
ifneq ($(EXPORT_RESOURCE_FILES),$(NULL))
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -132,17 +132,17 @@ CPPSRCS = \
nsSpamSettings.cpp \
nsCidProtocolHandler.cpp \
nsMsgContentPolicy.cpp \
nsMsgTagService.cpp\
nsMsgFolderNotificationService.cpp\
nsMailDirProvider.cpp\
$(NULL)
-ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CMMSRCS = nsMessengerOSXIntegration.mm
endif
ifeq ($(OS_ARCH),WINNT)
REQUIRES += appcomps \
profile \
$(NULL)
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -151,17 +151,17 @@ EXTRA_DSO_LDOPTS = \
$(ZLIB_LIBS) \
$(XPCOM_GLUE_LDOPTS) \
$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
$(NSPR_LIBS) \
$(NULL)
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \
-framework Cocoa \
$(NULL)
endif
LOCAL_INCLUDES = -I$(srcdir) \
-I$(srcdir)/../base/src \
--- a/mailnews/compose/build/Makefile.in
+++ b/mailnews/compose/build/Makefile.in
@@ -99,14 +99,14 @@ EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(XPCOM_GLUE_LDOPTS) \
$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
$(NSPR_LIBS) \
$(NULL)
endif
-ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif
include $(topsrcdir)/config/rules.mk
--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@@ -120,17 +120,17 @@ CPPSRCS = \
nsURLFetcher.cpp \
nsSmtpServer.cpp \
$(NULL)
EXPORTS = \
nsComposeStrings.h \
$(NULL)
-ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += nsMsgAppleDoubleEncode.cpp \
nsMsgAppleEncode.cpp \
$(NULL)
endif
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
--- a/mailnews/import/Makefile.in
+++ b/mailnews/import/Makefile.in
@@ -41,17 +41,17 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = import
PARALLEL_DIRS = public src text/src comm4x/public comm4x/src
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
PARALLEL_DIRS += eudora/src applemail/src
endif
ifeq ($(OS_ARCH),WINNT)
PARALLEL_DIRS += eudora/src
ifndef GNU_CC
PARALLEL_DIRS += oexpress outlook/src
endif
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -55,17 +55,17 @@ MODULE_NAME = nsImportServiceModule
REQUIRES = xpcom \
string \
uconv \
intl \
impComm4xMail \
$(NULL)
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
REQUIRES += impEudra impapplemail
endif
ifeq ($(OS_ARCH),WINNT)
REQUIRES += impEudra
ifndef GNU_CC
@@ -78,17 +78,17 @@ endif
CPPSRCS = nsImportModule.cpp
SHARED_LIBRARY_LIBS = \
../src/$(LIB_PREFIX)import_s.$(LIB_SUFFIX) \
../text/src/$(LIB_PREFIX)imptext_s.$(LIB_SUFFIX) \
../comm4x/src/$(LIB_PREFIX)imp4mail_s.$(LIB_SUFFIX) \
$(NULL)
-ifneq (,$(filter mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
SHARED_LIBRARY_LIBS += ../eudora/src/$(LIB_PREFIX)impEudra_s.$(LIB_SUFFIX)
SHARED_LIBRARY_LIBS += ../applemail/src/$(LIB_PREFIX)applmail_s.$(LIB_SUFFIX)
endif
ifeq ($(OS_ARCH),WINNT)
SHARED_LIBRARY_LIBS += ../eudora/src/$(LIB_PREFIX)impEudra_s.$(LIB_SUFFIX)
ifndef GNU_CC
@@ -98,17 +98,17 @@ endif
endif
LOCAL_INCLUDES += -I$(srcdir)/../src \
-I$(srcdir)/../comm4x/src \
-I$(srcdir)/../text/src \
$(NULL)
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
LOCAL_INCLUDES += -I$(srcdir)/../eudora/src \
-I$(srcdir)/../applemail/src \
$(NULL)
endif
ifeq ($(OS_ARCH),WINNT)
LOCAL_INCLUDES += -I$(srcdir)/../eudora/src
ifndef GNU_CC
@@ -142,20 +142,21 @@ EXTRA_DSO_LDOPTS = \
$(EXTRA_DSO_LIBS) \
$(XPCOM_GLUE_LDOPTS) \
$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
$(MOZDEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(NSPR_LIBS) \
$(NULL)
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += -framework Cocoa \
- $(TK_LIBS) \
- $(NULL)
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+EXTRA_DSO_LDOPTS += \
+ -framework Cocoa \
+ $(TK_LIBS) \
+ $(NULL)
endif
ifeq ($(OS_ARCH),AIX)
ifdef MOZILLA_INTERNAL_API
EXTRA_DSO_LDOPTS += \
$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(NULL)
else
--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@@ -79,16 +79,16 @@ CPPSRCS = \
nsEudoraAddress.cpp \
nsEudoraFilters.cpp \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += nsEudoraWin32.cpp
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += nsEudoraMac.cpp
endif
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
--- a/other-licenses/branding/sunbird/Makefile.in
+++ b/other-licenses/branding/sunbird/Makefile.in
@@ -57,17 +57,17 @@ ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi
cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
cp $(srcdir)/license.txt $(DIST)/branding/license.txt
cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp
cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
cp $(srcdir)/sunbird.icns $(DIST)/branding/sunbird.icns
cp $(srcdir)/sb_ICS.icns $(DIST)/branding/sb_ICS.icns
cp $(srcdir)/document.icns $(DIST)/branding/document.icns
cp $(srcdir)/dsstore $(DIST)/branding/dsstore
cp $(srcdir)/background.png $(DIST)/branding/background.png
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
cp $(srcdir)/license.r $(DIST)/branding/license.r
endif
--- a/other-licenses/branding/thunderbird/Makefile.in
+++ b/other-licenses/branding/thunderbird/Makefile.in
@@ -23,17 +23,17 @@ export::
# Export items into the branding directory first
ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/thunderbird.ico $(DIST)/branding/thunderbird.ico
cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi
cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp
cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
endif
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
cp $(srcdir)/background.png $(DIST)/branding/background.png
cp $(srcdir)/dsstore $(DIST)/branding/dsstore
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
cp $(srcdir)/thunderbird.icns $(DIST)/branding/thunderbird.icns
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
cp $(srcdir)/mailicon16.png $(DIST)/branding/default16.png
cp $(srcdir)/mailicon22.png $(DIST)/branding/default22.png