[43366] trunk/base

[toby at macports.org]

Revision: 43366
          http://trac.macports.org/changeset/43366
Author:   toby at macports.org
Date:     2008-12-09 17:38:18 -0800 (Tue, 09 Dec 2008)
Log Message:
-----------
Stop passing TCL_DEFS on the command line; everything's already defined in config.h and it makes compiling base ugly.

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	2008-12-10 01:20:01 UTC (rev 43365)
+++ trunk/base/Mk/macports.autoconf.mk.in	2008-12-10 01:38:18 UTC (rev 43366)
@@ -10,7 +10,7 @@
 CFLAGS			= @CFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) $(CPPFLAGS)
 OBJCFLAGS		= @OBJCFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) ${CFLAGS_DEBUG} $(CFLAGS_OPTIMIZE) $(CPPFLAGS)
 CPPFLAGS		= @CPPFLAGS@ @DEFS@ @INCLUDES@ @TCL_INCLUDES@
-TCL_DEFS		= @TCL_DEFS@ -UPACKAGE_NAME -UPACKAGE_TARNAME -UPACKAGE_VERSION -UPACKAGE_STRING -UPACKAGE_BUGREPORT
+TCL_DEFS		= @TCL_DEFS@
 SHLIB_CFLAGS		= @SHLIB_CFLAGS@
 CFLAGS_DEBUG		= @CFLAGS_DEBUG@
 CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@

Modified: trunk/base/Mk/macports.tea.mk
===================================================================
--- trunk/base/Mk/macports.tea.mk	2008-12-10 01:20:01 UTC (rev 43365)
+++ trunk/base/Mk/macports.tea.mk	2008-12-10 01:38:18 UTC (rev 43366)
@@ -3,10 +3,10 @@
 .SUFFIXES: .m
 
 .m.o:
-	${CC} -c -DUSE_TCL_STUBS ${OBJCFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
+	${CC} -c -DUSE_TCL_STUBS ${OBJCFLAGS} ${SHLIB_CFLAGS} $< -o $@
 
 .c.o:
-	${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
+	${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${SHLIB_CFLAGS} $< -o $@
 
 $(SHLIB_NAME):: ${OBJS}
 	${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS}

Modified: trunk/base/src/cregistry/Makefile
===================================================================
--- trunk/base/src/cregistry/Makefile	2008-12-10 01:20:01 UTC (rev 43365)
+++ trunk/base/src/cregistry/Makefile	2008-12-10 01:38:18 UTC (rev 43366)
@@ -11,7 +11,7 @@
 all:: ${STLIB_NAME}
 
 .c.o:
-	${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
+	${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${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/20081209/3cbf11ca/attachment.html>