From be10c3b1a82fdd09dff6a39bc0276839543bc453 Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Sat, 3 Nov 2001 03:29:05 +0000 Subject: [PATCH] Backing out fix for remote mach-o builds as it left mach-o builds fragile. Add TK_CFLAGS back to default CFLAGS/CXXFLAGS. Bug #107696 --- caps/src/Makefile.in | 5 ----- configure.in | 2 ++ content/html/content/src/Makefile.in | 3 --- docshell/base/Makefile.in | 6 ------ dom/src/base/Makefile.in | 5 ----- dom/src/build/Makefile.in | 5 ----- extensions/wallet/src/Makefile.in | 5 ----- htmlparser/src/Makefile.in | 5 ----- js/src/xpconnect/shell/Makefile.in | 5 ----- layout/html/base/src/Makefile.in | 5 ----- layout/html/style/src/Makefile.in | 6 ------ lib/mac/MoreFiles/Makefile.in | 3 --- mailnews/addrbook/src/Makefile.in | 5 ----- mailnews/base/search/src/Makefile.in | 4 ---- mailnews/base/util/Makefile.in | 5 ----- mailnews/compose/src/Makefile.in | 5 ----- mailnews/imap/src/Makefile.in | 5 ----- mailnews/mime/emitters/src/Makefile.in | 5 ----- mailnews/mime/src/Makefile.in | 5 ----- mailnews/news/src/Makefile.in | 5 ----- modules/libreg/src/Makefile.in | 7 +------ modules/libreg/standalone/Makefile.in | 7 +------ modules/oji/src/Makefile.in | 5 ----- modules/plugin/base/src/Makefile.in | 5 ----- parser/htmlparser/src/Makefile.in | 5 ----- profile/pref-migrator/src/Makefile.in | 4 ---- profile/src/Makefile.in | 5 ----- rdf/chrome/src/Makefile.in | 5 ----- rdf/datasource/src/Makefile.in | 5 ----- uriloader/exthandler/Makefile.in | 5 ----- widget/timer/src/mac/Makefile.in | 1 - xpcom/build/Makefile.in | 1 + xpcom/io/Makefile.in | 4 ---- xpcom/proxy/tests/Makefile.in | 4 ---- xpcom/tests/Makefile.in | 4 ---- xpcom/threads/Makefile.in | 5 ----- xpfe/appshell/src/Makefile.in | 4 ---- xpfe/components/bookmarks/src/Makefile.in | 4 ---- xpinstall/src/Makefile.in | 5 ----- xpinstall/stub/Makefile.in | 5 ----- 40 files changed, 5 insertions(+), 179 deletions(-) diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in index ea45ce71c3c3..d157d8da9e38 100644 --- a/caps/src/Makefile.in +++ b/caps/src/Makefile.in @@ -78,8 +78,3 @@ 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/configure.in b/configure.in index 06510d17e5ff..9c292e547efa 100644 --- a/configure.in +++ b/configure.in @@ -615,6 +615,8 @@ case "$target" in DSO_LDOPTS="$DSO_LDOPTS -arch ppc -install_name @executable_path/\$@" 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/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index 497e6b4d9ae5..2a6545a4e60f 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -136,6 +136,3 @@ INCLUDES += \ -I$(srcdir)/../../base/src \ $(NULL) -ifeq ($(MOZ_WIDGET_TOOLKIT),mac) -CXXFLAGS += $(TK_CFLAGS) -endif diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index 3167ed60c925..d77d47b17029 100644 --- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -91,9 +91,3 @@ 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/dom/src/base/Makefile.in b/dom/src/base/Makefile.in index 4e90cfb5c4e7..07f2beb7818a 100644 --- a/dom/src/base/Makefile.in +++ b/dom/src/base/Makefile.in @@ -93,8 +93,3 @@ 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/dom/src/build/Makefile.in b/dom/src/build/Makefile.in index 8166eb068bb3..b42f72acb24b 100644 --- a/dom/src/build/Makefile.in +++ b/dom/src/build/Makefile.in @@ -69,8 +69,3 @@ 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/extensions/wallet/src/Makefile.in b/extensions/wallet/src/Makefile.in index e8d9809c1ab1..594d7ef7a5f1 100644 --- a/extensions/wallet/src/Makefile.in +++ b/extensions/wallet/src/Makefile.in @@ -78,11 +78,6 @@ 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/htmlparser/src/Makefile.in b/htmlparser/src/Makefile.in index 9d1919b3126a..e61a1cccc9af 100644 --- a/htmlparser/src/Makefile.in +++ b/htmlparser/src/Makefile.in @@ -97,8 +97,3 @@ 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/js/src/xpconnect/shell/Makefile.in b/js/src/xpconnect/shell/Makefile.in index 70ed0a43330d..9dde4cc74d66 100644 --- a/js/src/xpconnect/shell/Makefile.in +++ b/js/src/xpconnect/shell/Makefile.in @@ -56,11 +56,6 @@ 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/layout/html/base/src/Makefile.in b/layout/html/base/src/Makefile.in index b06854c53dfe..1119c6146eac 100644 --- a/layout/html/base/src/Makefile.in +++ b/layout/html/base/src/Makefile.in @@ -139,11 +139,6 @@ 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/layout/html/style/src/Makefile.in b/layout/html/style/src/Makefile.in index 704d7d2da948..5e2de8734da2 100644 --- a/layout/html/style/src/Makefile.in +++ b/layout/html/style/src/Makefile.in @@ -89,9 +89,3 @@ 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/lib/mac/MoreFiles/Makefile.in b/lib/mac/MoreFiles/Makefile.in index bf436dac7bd5..e442f0d1b6a8 100644 --- a/lib/mac/MoreFiles/Makefile.in +++ b/lib/mac/MoreFiles/Makefile.in @@ -61,6 +61,3 @@ EXPORTS += \ FORCE_STATIC_LIB=1 include $(topsrcdir)/config/rules.mk - -CFLAGS += $(TK_CFLAGS) - diff --git a/mailnews/addrbook/src/Makefile.in b/mailnews/addrbook/src/Makefile.in index 1870f42eb266..0a861d49b0a2 100644 --- a/mailnews/addrbook/src/Makefile.in +++ b/mailnews/addrbook/src/Makefile.in @@ -140,8 +140,3 @@ 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/mailnews/base/search/src/Makefile.in b/mailnews/base/search/src/Makefile.in index 901405beb161..b9ae0c0ec621 100644 --- a/mailnews/base/search/src/Makefile.in +++ b/mailnews/base/search/src/Makefile.in @@ -77,7 +77,3 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -ifeq ($(MOZ_WIDGET_TOOLKIT),mac) -CXXFLAGS += $(TK_CFLAGS) -endif - diff --git a/mailnews/base/util/Makefile.in b/mailnews/base/util/Makefile.in index 7262ee045247..6af010b45dc5 100644 --- a/mailnews/base/util/Makefile.in +++ b/mailnews/base/util/Makefile.in @@ -114,8 +114,3 @@ 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/mailnews/compose/src/Makefile.in b/mailnews/compose/src/Makefile.in index dd957560908e..77685b804384 100644 --- a/mailnews/compose/src/Makefile.in +++ b/mailnews/compose/src/Makefile.in @@ -136,8 +136,3 @@ 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/mailnews/imap/src/Makefile.in b/mailnews/imap/src/Makefile.in index c984991ba8bc..e4092572c2c6 100644 --- a/mailnews/imap/src/Makefile.in +++ b/mailnews/imap/src/Makefile.in @@ -100,8 +100,3 @@ 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/mailnews/mime/emitters/src/Makefile.in b/mailnews/mime/emitters/src/Makefile.in index cafe9e46737d..00c8660e13de 100644 --- a/mailnews/mime/emitters/src/Makefile.in +++ b/mailnews/mime/emitters/src/Makefile.in @@ -76,8 +76,3 @@ 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/mailnews/mime/src/Makefile.in b/mailnews/mime/src/Makefile.in index 89a44ef7a4ff..22db19e81b5b 100644 --- a/mailnews/mime/src/Makefile.in +++ b/mailnews/mime/src/Makefile.in @@ -140,8 +140,3 @@ 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/mailnews/news/src/Makefile.in b/mailnews/news/src/Makefile.in index 8cd605a763c5..f9027be12e17 100644 --- a/mailnews/news/src/Makefile.in +++ b/mailnews/news/src/Makefile.in @@ -95,8 +95,3 @@ 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/modules/libreg/src/Makefile.in b/modules/libreg/src/Makefile.in index 763cb0613515..f49a7b716de4 100644 --- a/modules/libreg/src/Makefile.in +++ b/modules/libreg/src/Makefile.in @@ -31,7 +31,7 @@ MODULE = libreg LIBRARY_NAME = mozreg_s # MacOSX requires the MoreFiles module -ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +ifeq ($(OS_ARCH),Darwin) REQUIRES = macmorefiles endif @@ -57,11 +57,6 @@ 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/modules/libreg/standalone/Makefile.in b/modules/libreg/standalone/Makefile.in index 03a697dc599d..99b1b2e6a4fd 100644 --- a/modules/libreg/standalone/Makefile.in +++ b/modules/libreg/standalone/Makefile.in @@ -32,7 +32,7 @@ MODULE = libreg LIBRARY_NAME = mozregsa_s # MacOSX requires the MoreFiles module -ifeq ($(MOZ_WIDGET_TOOLKIT),mac) +ifeq ($(OS_ARCH),Darwin) REQUIRES = macmorefiles endif @@ -48,11 +48,6 @@ 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/modules/oji/src/Makefile.in b/modules/oji/src/Makefile.in index b04e4de04b01..2f7a4edd1a4c 100644 --- a/modules/oji/src/Makefile.in +++ b/modules/oji/src/Makefile.in @@ -88,8 +88,3 @@ 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/modules/plugin/base/src/Makefile.in b/modules/plugin/base/src/Makefile.in index 42a4ef58c256..bb93559cfe65 100644 --- a/modules/plugin/base/src/Makefile.in +++ b/modules/plugin/base/src/Makefile.in @@ -110,8 +110,3 @@ CXXFLAGS += $(MOZ_QT_CFLAGS) CFLAGS += $(MOZ_QT_CFLAGS) endif #MOZ_ENABLE_QT -ifeq ($(MOZ_WIDGET_TOOLKIT),mac) -CXXFLAGS += $(TK_CFLAGS) -endif - - diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in index 9d1919b3126a..e61a1cccc9af 100644 --- a/parser/htmlparser/src/Makefile.in +++ b/parser/htmlparser/src/Makefile.in @@ -97,8 +97,3 @@ 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/profile/pref-migrator/src/Makefile.in b/profile/pref-migrator/src/Makefile.in index 713d65c50fcb..1c0970a40340 100644 --- a/profile/pref-migrator/src/Makefile.in +++ b/profile/pref-migrator/src/Makefile.in @@ -68,8 +68,4 @@ 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/profile/src/Makefile.in b/profile/src/Makefile.in index a2a881eaba2a..3f5e23fb48d2 100644 --- a/profile/src/Makefile.in +++ b/profile/src/Makefile.in @@ -64,8 +64,3 @@ 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/rdf/chrome/src/Makefile.in b/rdf/chrome/src/Makefile.in index a4f739e3024f..b1d1f33b74a7 100644 --- a/rdf/chrome/src/Makefile.in +++ b/rdf/chrome/src/Makefile.in @@ -60,8 +60,3 @@ 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/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in index 682db680cc32..dd6a07d28230 100644 --- a/rdf/datasource/src/Makefile.in +++ b/rdf/datasource/src/Makefile.in @@ -47,8 +47,3 @@ 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/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index c9bb0d84e858..0488258c3f3a 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -79,8 +79,3 @@ 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/widget/timer/src/mac/Makefile.in b/widget/timer/src/mac/Makefile.in index 0bdcf46da8f2..ebf91bfd2007 100644 --- a/widget/timer/src/mac/Makefile.in +++ b/widget/timer/src/mac/Makefile.in @@ -45,7 +45,6 @@ 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/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 08003430fe0e..10e89634f1b8 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -31,6 +31,7 @@ LIBRARY_NAME = xpcom EXPORT_LIBRARY = 1 REQUIRES = libreg \ string \ + unicharutil \ $(NULL) EXPORTS = \ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index eb7477104d34..f76b9bac4034 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -140,7 +140,3 @@ ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif -ifeq ($(MOZ_WIDGET_TOOLKIT),mac) -CXXFLAGS += $(TK_CFLAGS) -endif - diff --git a/xpcom/proxy/tests/Makefile.in b/xpcom/proxy/tests/Makefile.in index a82e7fa84809..a2bc00b939aa 100644 --- a/xpcom/proxy/tests/Makefile.in +++ b/xpcom/proxy/tests/Makefile.in @@ -43,7 +43,3 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -ifeq ($(MOZ_WIDGET_TOOLKIT),mac) -CXXFLAGS += $(TK_CFLAGS) -endif - diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index 750b16ad2cb9..3cca8b6344cc 100644 --- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -78,10 +78,6 @@ 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/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in index 26470c42a45d..438a71f1f6d2 100644 --- a/xpcom/threads/Makefile.in +++ b/xpcom/threads/Makefile.in @@ -74,8 +74,3 @@ 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/xpfe/appshell/src/Makefile.in b/xpfe/appshell/src/Makefile.in index 1ce9901a243e..eda01205dfb5 100644 --- a/xpfe/appshell/src/Makefile.in +++ b/xpfe/appshell/src/Makefile.in @@ -89,7 +89,3 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk -ifeq ($(MOZ_WIDGET_TOOLKIT),mac) -CXXFLAGS += $(TK_CFLAGS) -endif - diff --git a/xpfe/components/bookmarks/src/Makefile.in b/xpfe/components/bookmarks/src/Makefile.in index ce87cc435558..a9e39c066b72 100644 --- a/xpfe/components/bookmarks/src/Makefile.in +++ b/xpfe/components/bookmarks/src/Makefile.in @@ -51,7 +51,3 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -ifeq ($(MOZ_WIDGET_TOOLKIT),mac) -CXXFLAGS += $(TK_CFLAGS) -endif - diff --git a/xpinstall/src/Makefile.in b/xpinstall/src/Makefile.in index 2515b0abcb62..44749427f362 100644 --- a/xpinstall/src/Makefile.in +++ b/xpinstall/src/Makefile.in @@ -107,8 +107,3 @@ 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/xpinstall/stub/Makefile.in b/xpinstall/stub/Makefile.in index d3e118a171bb..bbd803555a81 100644 --- a/xpinstall/stub/Makefile.in +++ b/xpinstall/stub/Makefile.in @@ -55,8 +55,3 @@ EXTRA_DSO_LDOPTS= \ include $(topsrcdir)/config/rules.mk -# xpcom/io pulls in osx toolkit headers -ifeq ($(MOZ_WIDGET_TOOLKIT),mac) -CXXFLAGS += $(TK_CFLAGS) -endif -