diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in index d157d8da9e3..ea45ce71c3c 100644 --- a/mozilla/caps/src/Makefile.in +++ b/mozilla/caps/src/Makefile.in @@ -78,3 +78,8 @@ include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../include +# plugin headers pull in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/configure.in b/mozilla/configure.in index 0dee78a5aab..a5f50f84517 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -612,12 +612,9 @@ case "$target" in no_x=yes MACOSX=1 MOZ_WIDGET_TOOLKIT='mac' - LDFLAGS="$LDFLAGS -framework Carbon" DSO_LDOPTS="$DSO_LDOPTS -arch ppc -install_name @executable_path/\$@" - TK_LIBS='/System/Library/Frameworks/Carbon.framework/Carbon' + TK_LIBS='-framework Carbon /System/Library/Frameworks/Carbon.framework/Carbon' TK_CFLAGS="-I/Developer/Headers/FlatCarbon -F/System/Library/Frameworks" - CFLAGS="$CFLAGS $TK_CFLAGS" - CXXFLAGS="$CXXFLAGS $TK_CFLAGS" ;; esac ;; diff --git a/mozilla/docshell/base/Makefile.in b/mozilla/docshell/base/Makefile.in index d77d47b1702..3167ed60c92 100644 --- a/mozilla/docshell/base/Makefile.in +++ b/mozilla/docshell/base/Makefile.in @@ -91,3 +91,9 @@ CPPSRCS = \ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk + +# plugins pull in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index 07f2beb7818..4e90cfb5c4e 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/dom/src/base/Makefile.in @@ -93,3 +93,8 @@ ifdef NS_TRACE_MALLOC DEFINES += -DNS_TRACE_MALLOC endif +# plugins pull in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in index b42f72acb24..8166eb068bb 100644 --- a/mozilla/dom/src/build/Makefile.in +++ b/mozilla/dom/src/build/Makefile.in @@ -69,3 +69,8 @@ include $(topsrcdir)/config/rules.mk CFLAGS += -D_IMPL_NS_DOM INCLUDES += -I$(srcdir)/../base +# plugin headers pull in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in index 594d7ef7a5f..e8d9809c1ab 100644 --- a/mozilla/extensions/wallet/src/Makefile.in +++ b/mozilla/extensions/wallet/src/Makefile.in @@ -78,6 +78,11 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + install:: $(INSTALL) $(DEFAULTS_FILES) $(DIST)/bin/defaults/wallet diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in index e61a1cccc9a..9d1919b3126 100644 --- a/mozilla/htmlparser/src/Makefile.in +++ b/mozilla/htmlparser/src/Makefile.in @@ -97,3 +97,8 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in index 9dde4cc74d6..70ed0a43330 100644 --- a/mozilla/js/src/xpconnect/shell/Makefile.in +++ b/mozilla/js/src/xpconnect/shell/Makefile.in @@ -56,6 +56,11 @@ LIBS = \ include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + DEFINES += -DJS_THREADSAFE ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in index 1119c6146ea..b06854c53df 100644 --- a/mozilla/layout/html/base/src/Makefile.in +++ b/mozilla/layout/html/base/src/Makefile.in @@ -139,6 +139,11 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk +# plugins pull in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + DEFINES += -D_IMPL_NS_HTML INCLUDES += \ diff --git a/mozilla/layout/html/style/src/Makefile.in b/mozilla/layout/html/style/src/Makefile.in index 5e2de8734da..704d7d2da94 100644 --- a/mozilla/layout/html/style/src/Makefile.in +++ b/mozilla/layout/html/style/src/Makefile.in @@ -89,3 +89,9 @@ INCLUDES += \ -I$(srcdir)/../../../svg/content/src \ -I$(srcdir)/../../../svg/base/src endif + +# plugin headers pull in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/lib/mac/MoreFiles/Makefile.in b/mozilla/lib/mac/MoreFiles/Makefile.in index 78fbb2aff19..bf436dac7bd 100644 --- a/mozilla/lib/mac/MoreFiles/Makefile.in +++ b/mozilla/lib/mac/MoreFiles/Makefile.in @@ -56,10 +56,11 @@ EXPORTS += \ OptimizationEnd.h \ $(NULL) -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) - # 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 + +CFLAGS += $(TK_CFLAGS) + diff --git a/mozilla/mailnews/addrbook/src/Makefile.in b/mozilla/mailnews/addrbook/src/Makefile.in index 0a861d49b0a..1870f42eb26 100644 --- a/mozilla/mailnews/addrbook/src/Makefile.in +++ b/mozilla/mailnews/addrbook/src/Makefile.in @@ -140,3 +140,8 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/mailnews/base/search/src/Makefile.in b/mozilla/mailnews/base/search/src/Makefile.in index b9ae0c0ec62..901405beb16 100644 --- a/mozilla/mailnews/base/search/src/Makefile.in +++ b/mozilla/mailnews/base/search/src/Makefile.in @@ -77,3 +77,7 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/mailnews/base/util/Makefile.in b/mozilla/mailnews/base/util/Makefile.in index 6af010b45dc..7262ee04524 100644 --- a/mozilla/mailnews/base/util/Makefile.in +++ b/mozilla/mailnews/base/util/Makefile.in @@ -114,3 +114,8 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/mailnews/compose/src/Makefile.in b/mozilla/mailnews/compose/src/Makefile.in index 77685b80438..dd957560908 100644 --- a/mozilla/mailnews/compose/src/Makefile.in +++ b/mozilla/mailnews/compose/src/Makefile.in @@ -136,3 +136,8 @@ ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/mailnews/imap/src/Makefile.in b/mozilla/mailnews/imap/src/Makefile.in index e4092572c2c..c984991ba8b 100644 --- a/mozilla/mailnews/imap/src/Makefile.in +++ b/mozilla/mailnews/imap/src/Makefile.in @@ -100,3 +100,8 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/mailnews/mime/emitters/src/Makefile.in b/mozilla/mailnews/mime/emitters/src/Makefile.in index 00c8660e13d..cafe9e46737 100644 --- a/mozilla/mailnews/mime/emitters/src/Makefile.in +++ b/mozilla/mailnews/mime/emitters/src/Makefile.in @@ -76,3 +76,8 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/mailnews/mime/src/Makefile.in b/mozilla/mailnews/mime/src/Makefile.in index b1174e70f05..503b623453c 100644 --- a/mozilla/mailnews/mime/src/Makefile.in +++ b/mozilla/mailnews/mime/src/Makefile.in @@ -125,3 +125,8 @@ ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/mailnews/news/src/Makefile.in b/mozilla/mailnews/news/src/Makefile.in index f9027be12e1..8cd605a763c 100644 --- a/mozilla/mailnews/news/src/Makefile.in +++ b/mozilla/mailnews/news/src/Makefile.in @@ -95,3 +95,8 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/modules/libreg/src/Makefile.in b/mozilla/modules/libreg/src/Makefile.in index f49a7b716de..763cb061351 100644 --- a/mozilla/modules/libreg/src/Makefile.in +++ b/mozilla/modules/libreg/src/Makefile.in @@ -31,7 +31,7 @@ MODULE = libreg LIBRARY_NAME = mozreg_s # MacOSX requires the MoreFiles module -ifeq ($(OS_ARCH),Darwin) +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) REQUIRES = macmorefiles endif @@ -57,6 +57,11 @@ DEFINES += -DUSE_BUFFERED_REGISTRY_IO include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CFLAGS += $(TK_CFLAGS) +endif + R_%.o: %.c ifeq ($(MOZ_OS2_TOOLS),VACPP) $(CC) -Fo$@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $< diff --git a/mozilla/modules/libreg/standalone/Makefile.in b/mozilla/modules/libreg/standalone/Makefile.in index 99b1b2e6a4f..03a697dc599 100644 --- a/mozilla/modules/libreg/standalone/Makefile.in +++ b/mozilla/modules/libreg/standalone/Makefile.in @@ -32,7 +32,7 @@ MODULE = libreg LIBRARY_NAME = mozregsa_s # MacOSX requires the MoreFiles module -ifeq ($(OS_ARCH),Darwin) +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) REQUIRES = macmorefiles endif @@ -48,6 +48,11 @@ DEFINES += -DSTANDALONE_REGISTRY LOCAL_INCLUDES = -I$(srcdir)/../src +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CFLAGS += $(TK_CFLAGS) +endif + export:: $(MODULES_LIBREG_SRC_CSRCS) $(INSTALL) $^ . diff --git a/mozilla/modules/oji/src/Makefile.in b/mozilla/modules/oji/src/Makefile.in index 2f7a4edd1a4..b04e4de04b0 100644 --- a/mozilla/modules/oji/src/Makefile.in +++ b/mozilla/modules/oji/src/Makefile.in @@ -88,3 +88,8 @@ include $(topsrcdir)/config/rules.mk CFLAGS += -DJSJDLL=\"$(JSJDLL)\" +# plugin headers pull in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index bb93559cfe6..42a4ef58c25 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -110,3 +110,8 @@ CXXFLAGS += $(MOZ_QT_CFLAGS) CFLAGS += $(MOZ_QT_CFLAGS) endif #MOZ_ENABLE_QT +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + + diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in index e61a1cccc9a..9d1919b3126 100644 --- a/mozilla/parser/htmlparser/src/Makefile.in +++ b/mozilla/parser/htmlparser/src/Makefile.in @@ -97,3 +97,8 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/profile/pref-migrator/src/Makefile.in b/mozilla/profile/pref-migrator/src/Makefile.in index 1c0970a4034..713d65c50fc 100644 --- a/mozilla/profile/pref-migrator/src/Makefile.in +++ b/mozilla/profile/pref-migrator/src/Makefile.in @@ -68,4 +68,8 @@ ifeq ($(MOZ_OS2_TOOLS),EMX) CXXFLAGS := $(filter-out -g,$(CXXFLAGS)) endif +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif diff --git a/mozilla/profile/src/Makefile.in b/mozilla/profile/src/Makefile.in index 3f5e23fb48d..a2a881eaba2 100644 --- a/mozilla/profile/src/Makefile.in +++ b/mozilla/profile/src/Makefile.in @@ -64,3 +64,8 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/rdf/chrome/src/Makefile.in b/mozilla/rdf/chrome/src/Makefile.in index b1d1f33b74a..a4f739e3024 100644 --- a/mozilla/rdf/chrome/src/Makefile.in +++ b/mozilla/rdf/chrome/src/Makefile.in @@ -60,3 +60,8 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/rdf/datasource/src/Makefile.in b/mozilla/rdf/datasource/src/Makefile.in index dd6a07d2823..682db680cc3 100644 --- a/mozilla/rdf/datasource/src/Makefile.in +++ b/mozilla/rdf/datasource/src/Makefile.in @@ -47,3 +47,8 @@ include $(topsrcdir)/config/rules.mk # a first-class XPCOM interface. INCLUDES += -I$(srcdir)/../../base/src +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/uriloader/exthandler/Makefile.in b/mozilla/uriloader/exthandler/Makefile.in index 0488258c3f3..c9bb0d84e85 100644 --- a/mozilla/uriloader/exthandler/Makefile.in +++ b/mozilla/uriloader/exthandler/Makefile.in @@ -79,3 +79,8 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk +# plugin headers pull in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/widget/timer/src/mac/Makefile.in b/mozilla/widget/timer/src/mac/Makefile.in index ebf91bfd200..0bdcf46da8f 100644 --- a/mozilla/widget/timer/src/mac/Makefile.in +++ b/mozilla/widget/timer/src/mac/Makefile.in @@ -45,6 +45,7 @@ GARBAGE += $(GFX_LCPPSRCS) include $(topsrcdir)/config/rules.mk +CXXFLAGS += $(TK_CFLAGS) DEFINES += -D_IMPL_NS_TIMER EXTRA_DSO_LDOPTS+= \ $(MOZ_COMPONENT_LIBS) \ diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in index 43dbe79685d..028dc901579 100644 --- a/mozilla/xpcom/build/Makefile.in +++ b/mozilla/xpcom/build/Makefile.in @@ -104,6 +104,11 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +EXTRA_DSO_LDOPTS += $(TK_LIBS) +endif + ifeq ($(OS_ARCH),BeOS) EXTRA_DSO_LDOPTS += -lbe endif diff --git a/mozilla/xpcom/io/Makefile.in b/mozilla/xpcom/io/Makefile.in index f76b9bac403..eb7477104d3 100644 --- a/mozilla/xpcom/io/Makefile.in +++ b/mozilla/xpcom/io/Makefile.in @@ -140,3 +140,7 @@ ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/xpcom/proxy/tests/Makefile.in b/mozilla/xpcom/proxy/tests/Makefile.in index a2bc00b939a..a82e7fa8480 100644 --- a/mozilla/xpcom/proxy/tests/Makefile.in +++ b/mozilla/xpcom/proxy/tests/Makefile.in @@ -43,3 +43,7 @@ LIBS = \ include $(topsrcdir)/config/rules.mk +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in index 3cca8b6344c..750b16ad2cb 100644 --- a/mozilla/xpcom/tests/Makefile.in +++ b/mozilla/xpcom/tests/Makefile.in @@ -78,6 +78,10 @@ ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2) LIBS += -lpcap endif +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + include $(topsrcdir)/config/rules.mk DEFINES += -DUSE_NSREG diff --git a/mozilla/xpcom/threads/Makefile.in b/mozilla/xpcom/threads/Makefile.in index 438a71f1f6d..26470c42a45 100644 --- a/mozilla/xpcom/threads/Makefile.in +++ b/mozilla/xpcom/threads/Makefile.in @@ -74,3 +74,8 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CFLAGS += $(TK_CFLAGS) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in index eda01205dfb..1ce9901a243 100644 --- a/mozilla/xpfe/appshell/src/Makefile.in +++ b/mozilla/xpfe/appshell/src/Makefile.in @@ -89,3 +89,7 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/xpfe/components/bookmarks/src/Makefile.in b/mozilla/xpfe/components/bookmarks/src/Makefile.in index a9e39c066b7..ce87cc43555 100644 --- a/mozilla/xpfe/components/bookmarks/src/Makefile.in +++ b/mozilla/xpfe/components/bookmarks/src/Makefile.in @@ -51,3 +51,7 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/xpinstall/cleanup/Makefile.in b/mozilla/xpinstall/cleanup/Makefile.in index f1020673d4b..6f317ae8b0a 100644 --- a/mozilla/xpinstall/cleanup/Makefile.in +++ b/mozilla/xpinstall/cleanup/Makefile.in @@ -53,11 +53,13 @@ LIBS = \ -lmozregsa_s \ $(NULL) -ifeq ($(OS_ARCH),Darwin) -LIBS += -lmacmorefiles_s -endif - DEFINES += -DSTANDALONE_REGISTRY include $(topsrcdir)/config/rules.mk +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +LIBS += -lmacmorefiles_s +LDFLAGS += $(TK_LIBS) +endif + + diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in index 44749427f36..2515b0abcb6 100644 --- a/mozilla/xpinstall/src/Makefile.in +++ b/mozilla/xpinstall/src/Makefile.in @@ -107,3 +107,8 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif + diff --git a/mozilla/xpinstall/stub/Makefile.in b/mozilla/xpinstall/stub/Makefile.in index bbd803555a8..d3e118a171b 100644 --- a/mozilla/xpinstall/stub/Makefile.in +++ b/mozilla/xpinstall/stub/Makefile.in @@ -55,3 +55,8 @@ EXTRA_DSO_LDOPTS= \ include $(topsrcdir)/config/rules.mk +# xpcom/io pulls in osx toolkit headers +ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +CXXFLAGS += $(TK_CFLAGS) +endif +