summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2007-09-06 05:02:12 (GMT)
committerdas <das>2007-09-06 05:02:12 (GMT)
commit2b55a796c66431a80bab3e8bafb7314818c53d6c (patch)
treee258004a81ded1732b938e94ba358ddbf4ca8f64
parent3ba6d8349dcdfb6638956648ba6800f8255c29e8 (diff)
downloadtcl-2b55a796c66431a80bab3e8bafb7314818c53d6c.zip
tcl-2b55a796c66431a80bab3e8bafb7314818c53d6c.tar.gz
tcl-2b55a796c66431a80bab3e8bafb7314818c53d6c.tar.bz2
replace (ab)use of GENERIC_FLAGS as a unix/Makefile override by dedicated EXTRA_CFLAGS var
-rw-r--r--macosx/GNUmakefile4
-rw-r--r--unix/Makefile.in10
2 files changed, 7 insertions, 7 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index c121ddf..d4ebe69 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -9,7 +9,7 @@
# See the file "license.terms" for information on usage and redistribution of
# this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: GNUmakefile,v 1.5 2007/04/23 20:46:13 das Exp $
+# RCS: @(#) $Id: GNUmakefile,v 1.6 2007/09/06 05:02:12 das Exp $
#
########################################################################################################
@@ -76,7 +76,7 @@ OBJ_DIR = ${OBJROOT}/${BUILD_STYLE}
develop_make_args := BUILD_STYLE=Development CONFIGURE_ARGS=--enable-symbols
deploy_make_args := BUILD_STYLE=Deployment INSTALL_TARGET=install-strip \
- GENERIC_FLAGS=-DNDEBUG
+ EXTRA_CFLAGS=-DNDEBUG
embedded_make_args := EMBEDDED_BUILD=1
install_make_args := INSTALL_BUILD=1
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 298f457..742273f 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.217 2007/09/05 21:31:06 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.218 2007/09/06 05:02:12 das Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -257,7 +257,7 @@ DDD = ddd
STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
-I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR} -I${TOMMATH_DIR} \
-${AC_FLAGS} ${PROTO_FLAGS} ${ENV_FLAGS} @EXTRA_CC_SWITCHES@
+${AC_FLAGS} ${PROTO_FLAGS} ${ENV_FLAGS} ${EXTRA_CFLAGS} @EXTRA_CC_SWITCHES@
CC_SWITCHES = $(STUB_CC_SWITCHES) ${NO_DEPRECATED_FLAGS}
@@ -266,7 +266,7 @@ APP_CC_SWITCHES = $(CC_SWITCHES) @EXTRA_APP_CC_SWITCHES@
LIBS = @TCL_LIBS@
DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
-${AC_FLAGS} ${PROTO_FLAGS} @EXTRA_CC_SWITCHES@
+${AC_FLAGS} ${PROTO_FLAGS} ${EXTRA_CFLAGS} @EXTRA_CC_SWITCHES@
TCLSH_OBJS = tclAppInit.o
@@ -315,8 +315,6 @@ TOMMATH_OBJS = bncore.o bn_reverse.o bn_fast_s_mp_mul_digs.o \
STUB_LIB_OBJS = tclStubLib.o ${COMPAT_OBJS}
-MAC_OSX_OBJS = tclMacOSXBundle.o tclMacOSXFCmd.o tclMacOSXNotify.o
-
UNIX_OBJS = tclUnixChan.o tclUnixEvent.o tclUnixFCmd.o \
tclUnixFile.o tclUnixPipe.o tclUnixSock.o \
tclUnixTime.o tclUnixInit.o tclUnixThrd.o \
@@ -324,6 +322,8 @@ UNIX_OBJS = tclUnixChan.o tclUnixEvent.o tclUnixFCmd.o \
NOTIFY_OBJS = tclUnixNotfy.o
+MAC_OSX_OBJS = tclMacOSXBundle.o tclMacOSXFCmd.o tclMacOSXNotify.o
+
OBJS = ${GENERIC_OBJS} ${TOMMATH_OBJS} ${UNIX_OBJS} ${NOTIFY_OBJS} \
${COMPAT_OBJS} @DL_OBJS@ @PLAT_OBJS@