diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-28 11:41:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-28 11:41:29 (GMT) |
| commit | d244749081139cd68d5004e67c30a2ec6f99682e (patch) | |
| tree | c1a8afe6d156883bccbdaabb82b6a4a8ce13459d /unix/Makefile.in | |
| parent | 022dcdf1391c87fa59c87ed6efb740f84b4ae95d (diff) | |
| parent | 5bf292f9ab0ddda2f59f652e94185832af078740 (diff) | |
| download | tk-d244749081139cd68d5004e67c30a2ec6f99682e.zip tk-d244749081139cd68d5004e67c30a2ec6f99682e.tar.gz tk-d244749081139cd68d5004e67c30a2ec6f99682e.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 eb30d25..fbe7b97 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -607,8 +607,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 @@ -734,6 +738,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) "${TOP_DIR}/win/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)@EXEEXT@" @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@" @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" |