diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-13 09:33:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-13 09:33:54 (GMT) |
| commit | 2be5f6c5c9a980c37debbf2c3fcb9fd723f01b61 (patch) | |
| tree | 15173ce606cbedc4ebe4cdff43f2d1d17c417445 /unix/Makefile.in | |
| parent | feec89c9e58abd4d8dbc0535779ad72141d6dabc (diff) | |
| download | tk-2be5f6c5c9a980c37debbf2c3fcb9fd723f01b61.zip tk-2be5f6c5c9a980c37debbf2c3fcb9fd723f01b61.tar.gz tk-2be5f6c5c9a980c37debbf2c3fcb9fd723f01b61.tar.bz2 | |
Some more fixes for Cygwin32/64 in win32 GUI mode.
Now that this is fully working, eliminate all usage of WISH_BUILD_LIB_SPEC: TK_BUILD_LIB_SPEC can be used everywhere in stead.
Add tk.pc
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 1da2d72..0383133 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -587,8 +587,8 @@ ${WISH_EXE}: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@ -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} + ${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \ + $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o ${WISH_EXE} # Resetting the LIB_RUNTIME_DIR below is required so that # the generated tktest executable gets the build directory @@ -719,6 +719,8 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} @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";\ + $(INSTALL_LIBRARY) "../win/libtk${MAJOR_VERSION}${MINOR_VERSION}.a" "$(LIB_INSTALL_DIR)";\ + chmod 555 "$(LIB_INSTALL_DIR)/libtk${MAJOR_VERSION}${MINOR_VERSION}.a";\ fi @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" |