Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 495228 - Remove checks for mac MOZ_WIDGET_TOOLKIT, r=ted

Browse Source
This commit is contained in:
Phil Ringnalda 2009-09-18 19:59:53 -07:00
parent 8490d39416
commit 6fce97e58d
59 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/app/Makefile.in
View File

@ -105,14 +105,14 @@ STATIC_COMPONENTS_LINKER_PATH = -L$(DEPTH)/staticlib
endif
LIBS += $(DEPTH)/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 := $(TK_LIBS)
endif
@ -308,7 +308,7 @@ libs:: $(srcdir)/profile/prefs.js
libs:: $(srcdir)/blocklist.xml
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
APP_NAME = $(MOZ_APP_DISPLAYNAME)

4
browser/base/Makefile.in
View File

@ -68,7 +68,7 @@ DEFINES += \
-DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" \
$(NULL)
ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DHAVE_SHELL_SERVICE=1
endif
@ -76,7 +76,7 @@ ifdef MOZ_UPDATER
DEFINES += -DMOZ_UPDATER=1
endif
ifneq (,$(filter windows mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
ifneq ($(OS_ARCH),WINCE)
DEFINES += -DCONTEXT_COPY_IMAGE_CONTENTS=1
endif

2
browser/base/content/test/Makefile.in
View File

@ -140,7 +140,7 @@ _BROWSER_FILES = \
browser_relatedTabs.js \
$(NULL)
ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
_BROWSER_FILES += browser_bug462289.js
else
_BROWSER_FILES += browser_customize.js

4
browser/components/build/Makefile.in
View File

@ -49,7 +49,7 @@ SHARED_LIBRARY_LIBS = \
../about/$(LIB_PREFIX)browserabout_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/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
endif
@ -72,7 +72,7 @@ EXTRA_DSO_LDOPTS += \
# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
# 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)

2
browser/components/migration/src/Makefile.in
View File

@ -72,7 +72,7 @@ CPPSRCS += nsIEProfileMigrator.cpp \
$(NULL)
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += nsSafariProfileMigrator.cpp \
nsMacIEProfileMigrator.cpp \
nsOmniWebProfileMigrator.cpp \

2
browser/components/preferences/Makefile.in
View File

@ -54,7 +54,7 @@ DEFINES += \
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
$(NULL)
ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DHAVE_SHELL_SERVICE=1
endif

2
browser/components/safebrowsing/content/test/Makefile.in
View File

@ -47,7 +47,7 @@ include $(topsrcdir)/config/rules.mk
# The browser chrome test for bug 415846 doesn't run on Mac because of its
# bizarre special-and-unique snowflake of a help menu.
ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT)))
_NON_MAC_BROWSER_TESTS = browser_bug415846.js
endif

2
browser/components/shell/public/Makefile.in
View File

@ -51,7 +51,7 @@ ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
XPIDLSRCS += nsIWindowsShellService.idl
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
XPIDLSRCS += nsIMacShellService.idl
endif

2
browser/components/shell/src/Makefile.in
View File

@ -53,7 +53,7 @@ endif
ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
CPPSRCS = nsWindowsShellService.cpp
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS = nsMacShellService.cpp
else
ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)

2
browser/installer/Makefile.in
View File

@ -103,7 +103,7 @@ $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
GARBAGE += $(MOZ_PKG_MANIFEST)
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

2
browser/themes/Makefile.in
View File

@ -50,7 +50,7 @@ include $(DEPTH)/config/autoconf.mk
# MacOS X Pinstripe
#
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DIRS = pinstripe
else
DIRS = winstripe

2
chrome/src/Makefile.in
View File

@ -66,7 +66,7 @@ ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif

2
config/static-rules.mk
View File

@ -20,6 +20,6 @@ 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

2
configure.in
View File

@ -7358,7 +7358,7 @@ if test "$MOZ_TREE_CAIRO"; then
if test "$MOZ_WIDGET_TOOLKIT" = "qt"; then
QPAINTER_SURFACE_FEATURE="#define CAIRO_HAS_QPAINTER_SURFACE 1"
fi
if test "$MOZ_WIDGET_TOOLKIT" = "mac" -o "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
QUARTZ_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_SURFACE 1"
QUARTZ_IMAGE_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_IMAGE_SURFACE 1"
QUARTZ_FONT_FEATURE="#define CAIRO_HAS_QUARTZ_FONT 1"

2
content/canvas/src/Makefile.in
View File

@ -90,7 +90,7 @@ DEFINES += -DUSE_WGL
endif
endif
ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),mac cocoa))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += nsGLPbufferCGL.cpp
DEFINES += -DUSE_CGL
endif

2
content/xbl/builtin/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
DIRS = win
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DIRS = mac
else
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)

2
docshell/build/Makefile.in
View File

@ -96,7 +96,7 @@ LOCAL_INCLUDES = \
-I$(topsrcdir)/uriloader/exthandler \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
LOCAL_INCLUDES += -I$(topsrcdir)/uriloader/exthandler/mac
EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \

2
embedding/browser/build/Makefile.in
View File

@ -71,7 +71,7 @@ EXTRA_DSO_LDOPTS= \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifeq (mac,$(MOZ_WIDGET_TOOLKIT))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif

4
embedding/components/build/Makefile.in
View File

@ -95,7 +95,7 @@ OS_LIBS += $(call EXPAND_LIBNAME,winspool comdlg32)
endif
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/mac
endif
@ -109,7 +109,7 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_JS_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \
$(NULL)

2
embedding/components/printingui/src/Makefile.in
View File

@ -54,7 +54,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
PLATFORM_DIR = win
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
PLATFORM_DIR = mac
endif

2
embedding/config/Makefile.in
View File

@ -43,7 +43,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
BASEBROWSER = basebrowser-mac-macho
CLIENTMANIFEST = client-mac-macho
_PLATFORM = unix

2
extensions/java/xpcom/glue/Makefile.in
View File

@ -81,7 +81,7 @@ EXTRA_DSO_LDOPTS = \
$(NULL)
# Need to link with CoreFoundation on Mac
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif

2
extensions/pref/autoconfig/src/Makefile.in
View File

@ -78,7 +78,7 @@ AUTOCFG_JS_EXPORTS = \
$(srcdir)/prefcalls.js \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
AUTOCFG_JS_EXPORTS += $(srcdir)/mac/platform.js
else
ifeq ($(MOZ_WIDGET_TOOLKIT), windows)

2
gfx/cairo/cairo/src/Makefile.in
View File

@ -182,7 +182,7 @@ CSRCS += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS)
EXPORTS_cairo += $(PDF_EXPORTS)
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CSRCS += cairo-quartz-surface.c cairo-quartz-image-surface.c cairo-quartz-font.c
EXPORTS_cairo += cairo-quartz.h cairo-quartz-image.h
endif

2
gfx/thebes/public/Makefile.in
View File

@ -92,7 +92,7 @@ EXPORTS += gfxPangoFonts.h
EXPORTS += gfxPDFSurface.h
endif
ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),mac cocoa))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXPORTS += gfxPlatformMac.h \
gfxQuartzSurface.h \
gfxQuartzImageSurface.h \

4
intl/build/Makefile.in
View File

@ -55,7 +55,7 @@ CPPSRCS = \
$(NULL)
# see also intl/locale/src/Makefile.in
ifneq (,$(filter mac os2 windows, $(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter os2 windows, $(MOZ_WIDGET_TOOLKIT)))
LOCALE_DIR = $(MOZ_WIDGET_TOOLKIT)
else
ifeq ($(MOZ_WIDGET_TOOLKIT), cocoa)
@ -86,7 +86,7 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \
$(NULL)

2
intl/locale/Makefile.in
View File

@ -49,7 +49,7 @@ DIRS = public idl src
ifdef ENABLE_TESTS
DIRS += tests
ifneq (,$(filter mac cocoa windows, $(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter cocoa windows, $(MOZ_WIDGET_TOOLKIT)))
DIRS += tests_multilocale
endif
endif

2
intl/locale/src/Makefile.in
View File

@ -47,7 +47,7 @@ LIBRARY_NAME = nslocale_s
LIBXUL_LIBRARY = 1
ifneq (,$(filter mac os2 windows, $(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter os2 windows, $(MOZ_WIDGET_TOOLKIT)))
DIRS = $(MOZ_WIDGET_TOOLKIT)
else
ifeq ($(MOZ_WIDGET_TOOLKIT), cocoa)

4
intl/uconv/src/Makefile.in
View File

@ -87,7 +87,7 @@ else
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
CPPSRCS += nsWinCharset.cpp
else
ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += nsMacCharset.cpp
else
ifeq ($(OS_ARCH),BeOS)
@ -108,7 +108,7 @@ EXTRA_DSO_LDOPTS = \
LOCAL_INCLUDES = -I$(srcdir)/../util
ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif

2
js/src/xpconnect/shell/Makefile.in
View File

@ -49,7 +49,7 @@ PROGRAM = xpcshell$(BIN_SUFFIX)
CPPSRCS = xpcshell.cpp
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CMMSRCS += xpcshellMacUtils.mm
endif

2
layout/build/Makefile.in
View File

@ -224,7 +224,7 @@ EXTRA_DSO_LDOPTS += $(MOZ_QT_LIBS) \
$(NULL)
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
OS_LIBS += -framework OpenGL
endif

2
modules/libpr0n/decoders/Makefile.in
View File

@ -58,7 +58,7 @@ endif
ifeq ($(OS_ARCH),BeOS)
DIRS = icon/beos icon
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DIRS = icon/mac icon
endif
endif # icon

4
modules/plugin/base/src/Makefile.in
View File

@ -74,7 +74,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CPPSRCS += nsPluginsDirOS2.cpp
CPPSRCS += nsPluginNativeWindowOS2.cpp
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += nsPluginsDirDarwin.cpp
CPPSRCS += nsPluginNativeWindow.cpp
else
@ -103,7 +103,7 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_JS_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif

2
netwerk/base/src/Makefile.in
View File

@ -101,7 +101,7 @@ else
CPPSRCS += nsAutodialWinCE.cpp
endif
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += nsURLHelperOSX.cpp
else
CPPSRCS += nsURLHelperUnix.cpp

2
netwerk/build/Makefile.in
View File

@ -134,7 +134,7 @@ EXTRA_DSO_LDOPTS = \
$(ZLIB_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += \
-framework SystemConfiguration \
$(TK_LIBS) \

2
netwerk/streamconv/converters/Makefile.in
View File

@ -75,7 +75,7 @@ CPPSRCS += \
$(NULL)
endif
ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += \
nsBinHexDecoder.cpp \
$(NULL)

2
toolkit/components/build/Makefile.in
View File

@ -122,7 +122,7 @@ EXTRA_DSO_LDOPTS += \
$(MOZ_JS_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif

2
toolkit/components/commandlines/src/Makefile.in
View File

@ -63,7 +63,7 @@ EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif

2
toolkit/components/filepicker/Makefile.in
View File

@ -44,7 +44,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_XUL
ifeq (,$(filter qt beos os2 mac photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
ifeq (,$(filter qt beos os2 photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
DIRS = public src
endif
endif

2
toolkit/components/startup/src/Makefile.in
View File

@ -57,7 +57,7 @@ else
ifeq (,$(filter-out WINCE WINNT,$(OS_ARCH)))
CPPSRCS += nsUserInfoWin.cpp
else
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CMMSRCS += nsUserInfoMac.mm
else
CPPSRCS += nsUserInfoUnix.cpp

2
toolkit/content/tests/chrome/Makefile.in
View File

@ -95,7 +95,7 @@ _TEST_FILES = findbar_window.xul \
# test_panel_focus.xul won't work if the Full Keyboard Access preference is set to
# textboxes and lists only, so skip this test on Mac
ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
_TEST_FILES += test_panel_focus.xul \
window_panel_focus.xul
else

2
toolkit/content/tests/widgets/Makefile.in
View File

@ -135,7 +135,7 @@ _TEST_FILES = test_bug360220.xul \
videomask.css \
$(NULL)
ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
_TEST_FILES += test_menubar.xul \
window_menubar.xul
endif

4
toolkit/library/libxul-config.mk
View File

@ -227,7 +227,7 @@ COMPONENT_LIBS += \
endif
endif
ifeq (,$(filter qt beos os2 mac photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
ifeq (,$(filter qt beos os2 photon cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
ifdef MOZ_XUL
ifdef MOZ_XPFE_COMPONENTS
COMPONENT_LIBS += fileview
@ -306,7 +306,7 @@ endif
ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += wdgtos2
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += widget_mac
endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))

2
toolkit/library/libxul-rules.mk
View File

@ -79,7 +79,7 @@ ifneq ($(OS_ARCH),WINCE)
OS_LIBS += $(call EXPAND_LIBNAME,usp10 oleaut32)
endif
endif
ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),mac cocoa))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += -lcups
endif

2
toolkit/locales/Makefile.in
View File

@ -76,7 +76,7 @@ endif
ifdef MOZ_CRASHREPORTER
libs:: crashreporter.ini
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/crashreporter.app/Contents/MacOS
else
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)

8
toolkit/locales/l10n.mk
View File

@ -98,7 +98,7 @@ PACKAGER_NO_LIBS = 1
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
ifneq (,$(filter mac 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)
@ -108,7 +108,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))
$(RM) -r -v $(DIST)/l10n-stage
else
# ... and windows doesn't like removing STAGEDIST itself, remove all children
@ -133,7 +133,7 @@ repackage-zip:
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 mac 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
@ -148,7 +148,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

2
toolkit/mozapps/installer/packager.mk
View File

@ -43,7 +43,7 @@ include $(MOZILLA_DIR)/toolkit/mozapps/installer/package-name.mk
# This is how we create the binary packages we release to the public.
ifndef MOZ_PKG_FORMAT
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
MOZ_PKG_FORMAT = DMG
else
ifeq (,$(filter-out OS2 WINNT WINCE BeOS, $(OS_ARCH)))

4
toolkit/mozapps/update/src/updater/Makefile.in
View File

@ -106,7 +106,7 @@ OS_CXXFLAGS += $(TK_CFLAGS)
OS_LIBS += $(TK_LIBS)
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
HAVE_PROGRESSUI = 1
CMMSRCS += progressui_osx.mm launchchild_osx.mm
OS_LIBS += -framework Cocoa
@ -142,7 +142,7 @@ libs:: updater.png
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
libs::
$(NSINSTALL) -D $(DIST)/bin/updater.app
rsync -a -C --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/bin/updater.app

2
toolkit/profile/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src
# Use Qute for non-Mac non-Phoenix apps
ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifndef MOZ_PHOENIX
DIRS += skin
endif

2
toolkit/themes/Makefile.in
View File

@ -52,7 +52,7 @@ include $(DEPTH)/config/autoconf.mk
# PMStripe overrides (toolkit/themes/pmstripe)
# faststripe Winstripe + faststripe (no native theme components)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DIRS = pinstripe
else

4
tools/trace-malloc/Makefile.in
View File

@ -77,7 +77,7 @@ endif
include $(topsrcdir)/config/config.mk
ifdef MOZ_ENABLE_LIBXUL
ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LIBS = xul
endif
endif
@ -92,7 +92,7 @@ LIBS += \
$(NULL)
ifdef MOZ_ENABLE_LIBXUL
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
LIBS += $(DIST)/bin/XUL
endif
endif

2
tools/update-packaging/Makefile.in
View File

@ -53,7 +53,7 @@ PACKAGE_BASE_DIR = $(DIST)
# Default output location for update archive
STAGE_DIR = $(DIST)/$(PKG_UPDATE_PATH)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
ifdef UNIVERSAL_BINARY
ifneq (,$(filter %/l10n-stage,$(PACKAGE_BASE_DIR)))
PACKAGE_DIR = $(PACKAGE_BASE_DIR)/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app

4
xpcom/base/Makefile.in
View File

@ -66,7 +66,7 @@ CPPSRCS = \
nsMemoryReporterManager.cpp \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += nsMacUtilsImpl.cpp
endif
@ -123,7 +123,7 @@ XPIDLSRCS = \
nsIMemoryReporter.idl \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
XPIDLSRCS += nsIMacUtils.idl
endif

2
xpcom/sample/Makefile.in
View File

@ -95,7 +95,7 @@ EXTRA_DSO_LDOPTS = \
$(NULL)
# Need to link with CoreFoundation on Mac
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \
$(NULL)

2
xpcom/sample/program/Makefile.in
View File

@ -61,7 +61,7 @@ LIBS = \
$(NULL)
# Need to link with CoreFoundation on Mac
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
LIBS += \
$(TK_LIBS) \
$(NULL)

2
xpcom/tools/registry/Makefile.in
View File

@ -58,7 +58,7 @@ LIBS = \
$(NULL)
# Need to link with CoreFoundation on Mac
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
LIBS += \
$(TK_LIBS) \
$(NULL)

4
xulrunner/app/Makefile.in
View File

@ -96,7 +96,7 @@ LOCAL_INCLUDES += \
-I$(topsrcdir)/toolkit/profile/src \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
TK_LIBS := -framework Cocoa $(TK_LIBS)
endif
@ -268,7 +268,7 @@ endif
libs::
touch $(DIST)/bin/.autoreg
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
FRAMEWORK_NAME = XUL
FRAMEWORK_VERSION = $(MOZILLA_VERSION)

2
xulrunner/installer/Makefile.in
View File

@ -53,7 +53,7 @@ NO_PKG_FILES = \
# If we're on mac, we want to make the .pkg first, in the mac/
# directory. Then packager.mk can put it into a DMG
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DIRS += mac
_APPNAME = $(PKG_BASENAME).pkg
PKG_SKIP_STRIP = 1

2
xulrunner/stub/Makefile.in
View File

@ -66,7 +66,7 @@ LIBS = \
$(NULL)
# Need to link with CoreFoundation on Mac
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
LIBS += \
$(TK_LIBS) \
$(NULL)