Bug 509533 - Remove obsolete "MOZ_WIDGET_TOOLKIT =/!= mac" checks, in comm-central; (Bv1) *.mk.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sun, 31 Jan 2010 21:10:21 +0100
changeset 4784 5da147bf90bdfac4430fcfbe0c50d602b18b6a17
parent 4783 ef2929b58c249dbde5dffbccea07647e2fa74609
child 4785 7486acf567e0cf0c3113e0b9421074d98ade1276
push idunknown
push userunknown
push dateunknown
bugs509533
Bug 509533 - Remove obsolete "MOZ_WIDGET_TOOLKIT =/!= mac" checks, in comm-central; (Bv1) *.mk. r=Callek.
config/static-rules.mk
mail/build.mk
--- a/config/static-rules.mk
+++ b/config/static-rules.mk
@@ -15,11 +15,11 @@ nsStaticComponents.cpp: $(MOZILLA_SRCDIR
 	> $(_TARGET)
 
 GARBAGE += nsStaticComponents.cpp
 
 ifeq ($(OS_ARCH),IRIX)
 LDFLAGS	+= -Wl,-LD_LAYOUT:lgot_buffer=80
 endif
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 LIBS	+= -framework QuickTime -framework IOKit -lcrypto
 endif
--- a/mail/build.mk
+++ b/mail/build.mk
@@ -101,17 +101,17 @@ upload::
 ifdef ENABLE_TESTS
 # Additional mailnews targets to call automated test suites
 include $(topsrcdir)/mailnews/testsuite-targets.mk
 
 # Instructions below this line are for mail/ specific tests.
 
 MOZMILLDIR=$(DEPTH)/mozilla/_tests/mozmill
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 # Mac options
 APP_NAME = $(MOZ_APP_DISPLAYNAME)
 ifdef MOZ_DEBUG
 APP_NAME := $(APP_NAME)Debug
 endif
 PROGRAM_LOCATION = ../../../$(DIST)/$(APP_NAME).app/Contents/MacOS/
 PROGRAM = $(PROGRAM_LOCATION)thunderbird-bin$(BIN_SUFFIX)
 else