[54795] trunk/base

[toby at macports.org]

Revision: 54795
          http://trac.macports.org/changeset/54795
Author:   toby at macports.org
Date:     2009-08-01 22:19:57 -0700 (Sat, 01 Aug 2009)
Log Message:
-----------
Stop including CPPFLAGS in CFLAGS, as some components were being built with redundant flags. Add CPPFLAGS to build rules where necessary.

Modified Paths:
--------------
    trunk/base/Mk/macports.autoconf.mk.in
    trunk/base/Mk/macports.tea.mk
    trunk/base/src/cregistry/Makefile

Modified: trunk/base/Mk/macports.autoconf.mk.in
===================================================================
--- trunk/base/Mk/macports.autoconf.mk.in	2009-08-02 05:17:03 UTC (rev 54794)
+++ trunk/base/Mk/macports.autoconf.mk.in	2009-08-02 05:19:57 UTC (rev 54795)
@@ -7,8 +7,8 @@
 VPATH			= @srcdir@
 
 CC			= @CC@
-CFLAGS			= @CFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) $(CPPFLAGS)
-OBJCFLAGS		= @OBJCFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) $(CPPFLAGS)
+CFLAGS			= @CFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR)
+OBJCFLAGS		= @OBJCFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR)
 CPPFLAGS		= @CPPFLAGS@ @DEFS@ @INCLUDES@ @TCL_INCLUDES@
 TCL_DEFS		= @TCL_DEFS@
 SHLIB_CFLAGS		= @SHLIB_CFLAGS@

Modified: trunk/base/Mk/macports.tea.mk
===================================================================
--- trunk/base/Mk/macports.tea.mk	2009-08-02 05:17:03 UTC (rev 54794)
+++ trunk/base/Mk/macports.tea.mk	2009-08-02 05:19:57 UTC (rev 54795)
@@ -3,10 +3,10 @@
 .SUFFIXES: .m
 
 .m.o:
-	${CC} -c -DUSE_TCL_STUBS -DTCL_NO_DEPRECATED ${OBJCFLAGS} ${SHLIB_CFLAGS} $< -o $@
+	${CC} -c -DUSE_TCL_STUBS -DTCL_NO_DEPRECATED ${OBJCFLAGS} ${CPPFLAGS} ${SHLIB_CFLAGS} $< -o $@
 
 .c.o:
-	${CC} -c -DUSE_TCL_STUBS -DTCL_NO_DEPRECATED ${CFLAGS} ${SHLIB_CFLAGS} $< -o $@
+	${CC} -c -DUSE_TCL_STUBS -DTCL_NO_DEPRECATED ${CFLAGS} ${CPPFLAGS} ${SHLIB_CFLAGS} $< -o $@
 
 all:: ${SHLIB_NAME} pkgIndex.tcl
 

Modified: trunk/base/src/cregistry/Makefile
===================================================================
--- trunk/base/src/cregistry/Makefile	2009-08-02 05:17:03 UTC (rev 54794)
+++ trunk/base/src/cregistry/Makefile	2009-08-02 05:19:57 UTC (rev 54795)
@@ -11,7 +11,7 @@
 all:: ${STLIB_NAME}
 
 .c.o:
-	${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${SHLIB_CFLAGS} $< -o $@
+	${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${CPPFLAGS} ${SHLIB_CFLAGS} $< -o $@
 
 ${STLIB_NAME}:: ${OBJS}
 	${STLIB_LD} ${STLIB_NAME} ${OBJS}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090801/3d47b160/attachment.html>