From 2949f638d8d25ddb43d510e8982e6eab0bd93e18 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org>
Date: Sun, 25 Oct 1998 22:25:25 +0000
Subject: [PATCH] Split OS_CFLAGS into OS_CFLAGS, OS_INCLUDES and DEFINES.
 Modified Makefile.ins to append not overwrite DEFINES. Added $(DEFINES) to
 the mkdepend command line so that some conditional dependencies are caught as
 well.

---
 base/public/Makefile.in       | 2 +-
 base/src/Makefile.in          | 2 +-
 base/src/rhapsody/Makefile.in | 2 +-
 base/src/unix/Makefile.in     | 2 +-
 config/autoconf.mk.in         | 4 +++-
 config/config.mk              | 4 ++--
 config/rules.mk               | 4 ++--
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/base/public/Makefile.in b/base/public/Makefile.in
index 4967565b9e68..ef0af92da21e 100644
--- a/base/public/Makefile.in
+++ b/base/public/Makefile.in
@@ -22,7 +22,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES = -D_IMPL_NS_BASE
+DEFINES += -D_IMPL_NS_BASE
 
 EXPORTS =		\
     nsISizeOfHandler.h	\
diff --git a/base/src/Makefile.in b/base/src/Makefile.in
index 3c4168bc4777..82dfe76b38a1 100644
--- a/base/src/Makefile.in
+++ b/base/src/Makefile.in
@@ -22,7 +22,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES =-D_IMPL_NS_BASE
+DEFINES +=-D_IMPL_NS_BASE
 
 ifeq ($(OS_TARGET),Rhapsody)
 DIRS = rhapsody
diff --git a/base/src/rhapsody/Makefile.in b/base/src/rhapsody/Makefile.in
index aa43040ede9b..126d61fdda91 100644
--- a/base/src/rhapsody/Makefile.in
+++ b/base/src/rhapsody/Makefile.in
@@ -29,7 +29,7 @@ MODULE=raptor
 
 REQUIRES=xpcom raptor 
 
-DEFINES = -D_IMPL_NS_WIDGET 
+DEFINES += -D_IMPL_NS_WIDGET 
 
 CPPSRCS= \
 	nsTimer.cpp 
diff --git a/base/src/unix/Makefile.in b/base/src/unix/Makefile.in
index aa43040ede9b..126d61fdda91 100644
--- a/base/src/unix/Makefile.in
+++ b/base/src/unix/Makefile.in
@@ -29,7 +29,7 @@ MODULE=raptor
 
 REQUIRES=xpcom raptor 
 
-DEFINES = -D_IMPL_NS_WIDGET 
+DEFINES += -D_IMPL_NS_WIDGET 
 
 CPPSRCS= \
 	nsTimer.cpp 
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index a7aa9e13fa65..8e3f9ce1d648 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -50,8 +50,10 @@ MOZ_NATIVE_JPEG	= @SYSTEM_JPEG@
 MOZ_NATIVE_PNG	= @SYSTEM_PNG@
 
 # Should the extra CFLAGS only be added in Makefile.ins that need them? 
-OS_CFLAGS	= @CFLAGS@ @DEFS@ $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
+OS_CFLAGS	= @CFLAGS@
+OS_INCLUDES	= $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
 OS_LIBS		= @LDFLAGS@ @LIBS@
+DEFINES		= @DEFS@
 
 XCFLAGS		= @XCFLAGS@
 XLDFLAGS	= @XLDFLAGS@
diff --git a/config/config.mk b/config/config.mk
index f9f3384417eb..25910c662b4b 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -225,7 +225,7 @@ endif
 
 ifdef USE_AUTOCONF
 OPTIMIZER	= 
-DEFINES		= -UDEBUG -DNDEBUG -DTRIMMED
+DEFINES		+= -UDEBUG -DNDEBUG -DTRIMMED
 XBCFLAGS	=
 else
 
@@ -285,7 +285,7 @@ else
 OPTIMIZER	= -g
 endif
 JAVA_OPTIMIZER	= -g
-DEFINES		= -DDEBUG -UNDEBUG -DDEBUG_$(shell $(WHOAMI)) -DTRACING
+DEFINES		+= -DDEBUG -UNDEBUG -DDEBUG_$(shell $(WHOAMI)) -DTRACING
 XBCFLAGS	= -FR$*
 endif
 
diff --git a/config/rules.mk b/config/rules.mk
index c1070170d8dd..e265aaa04743 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -779,10 +779,10 @@ $(MKDEPENDENCIES)::
 	@$(MAKE_OBJDIR)
 	touch $(MKDEPENDENCIES)
 ifdef USE_AUTOCONF
-	$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(INCLUDES) $(addprefix $(srcdir)/,$(CSRCS) $(CPPSRCS))
+	$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(DEFINES) $(INCLUDES) $(addprefix $(srcdir)/,$(CSRCS) $(CPPSRCS))
 	@mv depend.mk depend.mk.old && cat depend.mk.old | sed "s|^$(OBJDIR_NAME)/$(srcdir)/|$(OBJDIR_NAME)/|g" > depend.mk && rm -f depend.mk.old
 else
-	$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(INCLUDES) $(CSRCS) $(CPPSRCS)
+	$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(DEFINES) $(INCLUDES) $(CSRCS) $(CPPSRCS)
 endif
 
 $(MKDEPEND)::