diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-19 09:47:47 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-19 09:47:47 (GMT) |
commit | 2d9f60b950f9f3bd0bd78da48810eccecfe530da (patch) | |
tree | b11b66f6c207d9050482ce115f79f28a79603f51 /unix/Makefile.in | |
parent | ca48321a28f9238ba7db49e79ff1aabcaaf66162 (diff) | |
parent | 36434499c3efb22240ddc31f646e0e4d8379d672 (diff) | |
download | tcl-2d9f60b950f9f3bd0bd78da48810eccecfe530da.zip tcl-2d9f60b950f9f3bd0bd78da48810eccecfe530da.tar.gz tcl-2d9f60b950f9f3bd0bd78da48810eccecfe530da.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.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 6c09473..6e3ad8a 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -613,7 +613,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \ all: binaries libraries doc packages -binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} +binaries: ${LIB_FILE} ${TCL_EXE} libraries: @@ -621,11 +621,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} tcldde14.dll tclreg13.dll); \ + fi rm -f $@ @MAKE_STUB_LIB@ |