summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordas <das>2004-11-12 20:27:28 (GMT)
committerdas <das>2004-11-12 20:27:28 (GMT)
commitfcf4caf8ae7e9763a64b2290db20aeedd438b99e (patch)
treea820ddeceb34a1b306987774ae74052dcdded800 /unix
parent15db0cfaf8db72f2cd37a9379f11ccd9efb3ae7d (diff)
downloadtcl-fcf4caf8ae7e9763a64b2290db20aeedd438b99e.zip
tcl-fcf4caf8ae7e9763a64b2290db20aeedd438b99e.tar.gz
tcl-fcf4caf8ae7e9763a64b2290db20aeedd438b99e.tar.bz2
* generic/tcl.h:
* generic/tclInt.h: * unix/Makefile.in: include tclConfig.h from tcl.h and install it as a public header. Normalized compiler include path order to -I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR}. * unix/dltest/Makefile.in: add ${BUILD_DIR}/.. to include path to pick up tclConfig.h.
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in15
-rw-r--r--unix/dltest/Makefile.in5
2 files changed, 11 insertions, 9 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index c10f040..746d49b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.153 2004/11/12 20:20:24 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.154 2004/11/12 20:27:29 das Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -275,17 +275,17 @@ DDD = ddd
CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I${BUILD_DIR} -I${GENERIC_DIR} -I${SRC_DIR} \
+-I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR} \
${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} \
${NO_DEPRECATED_FLAGS} ${ENV_FLAGS}
STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I${BUILD_DIR} -I${GENERIC_DIR} -I${SRC_DIR} \
+-I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR} \
${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${ENV_FLAGS}
LIBS = @TCL_LIBS@
-DEPEND_SWITCHES = ${CFLAGS} -I${GENERIC_DIR} -I${SRC_DIR} \
+DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
${AC_FLAGS} ${MATH_FLAGS} \
${GENERIC_FLAGS} ${PROTO_FLAGS}
@@ -331,7 +331,8 @@ GENERIC_HDRS = \
$(GENERIC_DIR)/tclPatch.h \
$(GENERIC_DIR)/tclPlatDecls.h \
$(GENERIC_DIR)/tclPort.h \
- $(GENERIC_DIR)/tclRegexp.h
+ $(GENERIC_DIR)/tclRegexp.h \
+ $(BUILD_DIR)/tclConfig.h
GENERIC_SRCS = \
$(GENERIC_DIR)/regcomp.c \
@@ -649,7 +650,7 @@ install-libraries: libraries install-tzdata install-msgs
fi
@echo "Installing header files";
@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
- $(GENERIC_DIR)/tclPlatDecls.h ; \
+ $(GENERIC_DIR)/tclPlatDecls.h $(BUILD_DIR)/tclConfig.h; \
do \
$(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
done;
@@ -759,7 +760,7 @@ install-private-headers: libraries
@echo "Installing private header files";
@for i in $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \
$(GENERIC_DIR)/tclIntPlatDecls.h $(GENERIC_DIR)/tclPort.h \
- $(UNIX_DIR)/tclUnixPort.h $(BUILD_DIR)/tclConfig.h; \
+ $(UNIX_DIR)/tclUnixPort.h; \
do \
$(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \
done;
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 06f4345..378c721 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -1,7 +1,7 @@
# This Makefile is used to create several test cases for Tcl's load
# command. It also illustrates how to take advantage of configuration
# exported by Tcl to set up Makefiles for shared libraries.
-# RCS: @(#) $Id: Makefile.in,v 1.15 2004/09/23 20:02:50 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.16 2004/11/12 20:27:29 das Exp $
TCL_DBGX = @TCL_DBGX@
CC = @CC@
@@ -12,13 +12,14 @@ SHLIB_LD = @SHLIB_LD@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
SHLIB_SUFFIX = @SHLIB_SUFFIX@
SRC_DIR = @srcdir@
+BUILD_DIR = @builddir@
TCL_VERSION= @TCL_VERSION@
CFLAGS_DEBUG = @CFLAGS_DEBUG@
CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@
-CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
+CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -I${BUILD_DIR}/.. -DTCL_MEM_DEBUG \
${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX} pkgua${SHLIB_SUFFIX}