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
2001-11-03 03:29:05 +00:00 · 2001-11-03 03:29:05 +00:00 · be10c3b1a8
--- 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
-
--- 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
    ;;
--- 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
--- 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
-
--- 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
-
--- 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
-
--- 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

--- 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
-
--- 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
--- 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	+= \
--- 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
-
--- 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)
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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 $<
--- 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) $^ .

--- 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
-
--- 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
-
-
--- 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
-
--- 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

--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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) \
--- 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		= \
--- 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
-
--- 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
-
--- 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
--- 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
-
--- 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
-
--- 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
-
--- 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
-
--- 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
-