summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-19 08:23:05 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-19 08:23:05 (GMT)
commit18b36e37e61e3936419af460b146f5c27e2d87f1 (patch)
tree8293221612f42a9d572adfd353d5468276df7712 /unix/Makefile.in
parent0507a702179a76c4f004e5321dc5f5daa0604080 (diff)
downloadtcl-18b36e37e61e3936419af460b146f5c27e2d87f1.zip
tcl-18b36e37e61e3936419af460b146f5c27e2d87f1.tar.gz
tcl-18b36e37e61e3936419af460b146f5c27e2d87f1.tar.bz2
Cygwin: Instead of checking whether the win32 part is configured properly, just configure it when needed.
Always build the stub library first (and - on Cygwin - configure win32 properly just before building the stub library)
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 210d90b..70d98c1 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -546,7 +546,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
all: binaries libraries doc
-binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
+binaries: ${LIB_FILE} ${TCL_EXE}
libraries:
@@ -554,11 +554,14 @@ doc:
# The following target is configured by autoconf to generate either a shared
# library or non-shared library for Tcl.
-${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
+${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS}
rm -f $@
@MAKE_LIB@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ @if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
+ (cd ${TOP_DIR}/win; ${MAKE} libtclstub${MAJOR_VERSION}${MINOR_VERSION}.a); \
+ fi
rm -f $@
@MAKE_STUB_LIB@