summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-18 15:37:44 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-18 15:37:44 (GMT)
commit48494f66c267f103ed95d01c2b56fc4f140d9913 (patch)
tree70064bf1cfdd18f31955dae35ec3204b6d640c71 /unix/Makefile.in
parentff32dfae22846c7a5e3e85b77309a9c186a3b56f (diff)
parent0af1f3e468baaf1b8cf6bc13452d1fc8f0a265f5 (diff)
downloadtk-48494f66c267f103ed95d01c2b56fc4f140d9913.zip
tk-48494f66c267f103ed95d01c2b56fc4f140d9913.tar.gz
tk-48494f66c267f103ed95d01c2b56fc4f140d9913.tar.bz2
Cygwin: In stead 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.in16
1 files changed, 8 insertions, 8 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 3914940..f21fdbb 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -570,7 +570,7 @@ SHELL_ENV = \
all: binaries libraries doc
-binaries: ${LIB_FILE} ${STUB_LIB_FILE} ${WISH_EXE}
+binaries: ${LIB_FILE} ${WISH_EXE}
libraries:
@@ -581,11 +581,15 @@ doc: $(TOP_DIR)/doc/man.macros
# The following target is configured by autoconf to generate either
# a shared library or non-shared library for Tk.
-${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
+${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_FILE@ ${OBJS}
rm -f $@
@MAKE_LIB@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
+ (cd ${TOP_DIR}/win; ${MAKE} tk${MAJOR_VERSION}${MINOR_VERSION}.dll); \
+ cp "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" .; \
+ fi
rm -f $@
@MAKE_STUB_LIB@
@@ -610,11 +614,7 @@ tkLibObjs:
objs: ${OBJS}
-${WISH_EXE}: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@
- @if test "x$(TK_SHARED_BUILD)" = "x1" -a \
- -f "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
- cp "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" .; \
- fi
+${WISH_EXE}: $(TK_STUB_LIB_FILE) $(WISH_OBJS) $(TK_LIB_FILE) @APP_RSRC_FILE@
${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o ${WISH_EXE}
@@ -713,7 +713,7 @@ install-strip:
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
+install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
"$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
do \