Since '-framework Carbon' causes binaries to require console access to run, do not link using that flag by default. Otherwise, remote builds & non-console tinderboxes will break. Mac OSX Mach-O only.

Bug #107696 r=mozbot
2001-11-01 00:54:48 +00:00 · 2001-11-01 00:54:48 +00:00 · 8a2a775382
--- a/caps/src/Makefile.in
+++ b/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
+
--- a/configure.in
+++ b/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
    ;;
--- a/docshell/base/Makefile.in
+++ b/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
+
--- a/dom/src/base/Makefile.in
+++ b/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
+
--- a/dom/src/build/Makefile.in
+++ b/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
+
--- a/extensions/wallet/src/Makefile.in
+++ b/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

--- a/htmlparser/src/Makefile.in
+++ b/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
+
--- a/js/src/xpconnect/shell/Makefile.in
+++ b/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
--- a/layout/html/base/src/Makefile.in
+++ b/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	+= \
--- a/layout/html/style/src/Makefile.in
+++ b/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
+
--- a/lib/mac/MoreFiles/Makefile.in
+++ b/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)
+
--- a/mailnews/addrbook/src/Makefile.in
+++ b/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
+
--- a/mailnews/base/search/src/Makefile.in
+++ b/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
+
--- a/mailnews/base/util/Makefile.in
+++ b/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
+
--- a/mailnews/compose/src/Makefile.in
+++ b/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
+
--- a/mailnews/imap/src/Makefile.in
+++ b/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
+
--- a/mailnews/mime/emitters/src/Makefile.in
+++ b/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
+
--- a/mailnews/mime/src/Makefile.in
+++ b/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
+
--- a/mailnews/news/src/Makefile.in
+++ b/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
+
--- 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 ($(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 $<
--- 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 ($(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) $^ .

--- a/modules/oji/src/Makefile.in
+++ b/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
+
--- a/modules/plugin/base/src/Makefile.in
+++ b/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
+
+
--- a/parser/htmlparser/src/Makefile.in
+++ b/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
+
--- a/profile/pref-migrator/src/Makefile.in
+++ b/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

--- a/profile/src/Makefile.in
+++ b/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
+
--- a/rdf/chrome/src/Makefile.in
+++ b/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
+
--- a/rdf/datasource/src/Makefile.in
+++ b/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
+
--- a/uriloader/exthandler/Makefile.in
+++ b/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
+
--- a/widget/timer/src/mac/Makefile.in
+++ b/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) \
--- a/xpcom/build/Makefile.in
+++ b/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
--- a/xpcom/io/Makefile.in
+++ b/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
+
--- a/xpcom/proxy/tests/Makefile.in
+++ b/xpcom/proxy/tests/Makefile.in
@ -43,3 +43,7 @@ LIBS		= \

 include $(topsrcdir)/config/rules.mk

+ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
+CXXFLAGS	+= $(TK_CFLAGS)
+endif
+
--- a/xpcom/tests/Makefile.in
+++ b/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
--- a/xpcom/threads/Makefile.in
+++ b/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
+
--- a/xpfe/appshell/src/Makefile.in
+++ b/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
+
--- a/xpfe/components/bookmarks/src/Makefile.in
+++ b/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
+
--- a/xpinstall/cleanup/Makefile.in
+++ b/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
+
+
--- a/xpinstall/src/Makefile.in
+++ b/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
+
--- a/xpinstall/stub/Makefile.in
+++ b/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
+