summaryrefslogtreecommitdiffstats
path: root/win/Makefile.in
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2003-06-16 18:36:44 (GMT)
committerandreas_kupries <akupries@shaw.ca>2003-06-16 18:36:44 (GMT)
commit1268ac3113dd4f5b5627c98afd15addcf608875a (patch)
tree2accbcfce059c2893b4f3a4073f383fe5a0487bf /win/Makefile.in
parent474a30aa667f24a8686adf6e4054789d5f199484 (diff)
downloadtcl-1268ac3113dd4f5b5627c98afd15addcf608875a.zip
tcl-1268ac3113dd4f5b5627c98afd15addcf608875a.tar.gz
tcl-1268ac3113dd4f5b5627c98afd15addcf608875a.tar.bz2
* win/Makefile.in: Haven't heard back from David for a week.
* win/configure: Now committing the remaining changes. * win/configure.in: Note: In active contact with Helmut Giese * win/makefile.vc: about the borland relatedchanges. This part * win/rules.vc: will see future updates. * win/tcl.m4: * win/makefile.bc:
Diffstat (limited to 'win/Makefile.in')
-rw-r--r--win/Makefile.in29
1 files changed, 28 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index a008ab1..195ccab 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.71 2003/04/15 00:18:58 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.72 2003/06/16 18:36:45 andreas_kupries Exp $
VERSION = @TCL_VERSION@
@@ -218,6 +218,7 @@ GENERIC_OBJS = \
tclCompCmds.$(OBJEXT) \
tclCompExpr.$(OBJEXT) \
tclCompile.$(OBJEXT) \
+ tclConfig.$(OBJEXT) \
tclDate.$(OBJEXT) \
tclDictObj.$(OBJEXT) \
tclEncoding.$(OBJEXT) \
@@ -250,6 +251,7 @@ GENERIC_OBJS = \
tclPathObj.$(OBJEXT) \
tclPipe.$(OBJEXT) \
tclPkg.$(OBJEXT) \
+ tclPkgConfig.$(OBJEXT) \
tclPosixStr.$(OBJEXT) \
tclPreserve.$(OBJEXT) \
tclProc.$(OBJEXT) \
@@ -413,6 +415,31 @@ tclWinReg.${OBJEXT} : tclWinReg.c
tclWinDde.${OBJEXT} : tclWinDde.c
$(CC) -c $(CC_SWITCHES) -DUSE_TCL_STUBS @DEPARG@ $(CC_OBJNAME)
+# TIP #59, embedding of configuration information into the binary library.
+#
+# Part of Tcl's configuration information are the paths where it was
+# installed and where it will look for its libraries (which can be
+# different). We derive this information from the variables which can
+# be overridden by the user. As every path can be configured
+# separately we do not remember one general prefix/exec_prefix but all
+# the different paths individually.
+
+tclPkgConfig.${OBJEXT}: tclPkgConfig.c
+ $(CC) -c $(CC_SWITCHES) \
+ -DCFG_INSTALL_LIBDIR=\"$(LIB_INSTALL_DIR)\" \
+ -DCFG_INSTALL_BINDIR=\"$(BIN_INSTALL_DIR)\" \
+ -DCFG_INSTALL_SCRDIR=\"$(SCRIPT_INSTALL_DIR)\" \
+ -DCFG_INSTALL_INCDIR=\"$(INCLUDE_INSTALL_DIR)\" \
+ -DCFG_INSTALL_DOCDIR=\"$(MAN_INSTALL_DIR)\" \
+ \
+ -DCFG_RUNTIME_LIBDIR=\"$(libdir)\" \
+ -DCFG_RUNTIME_BINDIR=\"$(bindir)\" \
+ -DCFG_RUNTIME_SCRDIR=\"$(TCL_LIBRARY)\" \
+ -DCFG_RUNTIME_INCDIR=\"$(includedir)\" \
+ -DCFG_RUNTIME_DOCDIR=\"$(mandir)\" \
+ \
+ -DUSE_TCL_STUBS @DEPARG@ $(CC_OBJNAME)
+
# The following objects are part of the stub library and should not
# be built as DLL objects but none of the symbols should be exported