diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-28 13:27:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-28 13:27:43 (GMT) |
| commit | c728c451a4b3e2e2166d49547c49f5e4132b8652 (patch) | |
| tree | e80f950b22e0684bc52e4c2917eec9dded867cc1 /unix/Makefile.in | |
| parent | 59051e407213c7a42b2427b17338c30336b82845 (diff) | |
| parent | d244749081139cd68d5004e67c30a2ec6f99682e (diff) | |
| download | tk-c728c451a4b3e2e2166d49547c49f5e4132b8652.zip tk-c728c451a4b3e2e2166d49547c49f5e4132b8652.tar.gz tk-c728c451a4b3e2e2166d49547c49f5e4132b8652.tar.bz2 | |
Link cygwin wish.exe with win32 tk.dll, only in combination with --enable-shared
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 9ae26e1..8d5d8c7 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -612,8 +612,12 @@ objs: ${OBJS} ${WISH_EXE}: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@ - ${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \ - $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o ${WISH_EXE} + @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 + ${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @WISH_BUILD_LIB_SPEC@ \ + $(CC_SEARCH_FLAGS) -o ${WISH_EXE} # Resetting the LIB_RUNTIME_DIR below is required so that # the generated tktest executable gets the build directory @@ -741,6 +745,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" + @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ + $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ + chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ + fi @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" |