diff options
| author | hobbs <hobbs> | 2001-08-04 00:29:56 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2001-08-04 00:29:56 (GMT) |
| commit | 4139b2c4978591ed1c9b9e76cc3219cb696b19e4 (patch) | |
| tree | 3387369f256aa7d567422b42156ccee929799f0a /win/Makefile.in | |
| parent | f5fcafe38f40d3c5ef1159dd478cd9eae7048739 (diff) | |
| download | tk-4139b2c4978591ed1c9b9e76cc3219cb696b19e4.zip tk-4139b2c4978591ed1c9b9e76cc3219cb696b19e4.tar.gz tk-4139b2c4978591ed1c9b9e76cc3219cb696b19e4.tar.bz2 | |
* win/configure: regenerated
* win/tcl.m4: fixed DLLSUFFIX definition to always be ${DBGX}.dll.
This is necessary for TEA compliant builds that build shared
against a static-built Tk.
* win/Makefile.in ($(WISH)): added $(TK_STUB_LIB_FILE) to build
target, otherwise it wouldn't get generated in a static build.
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 4463c67..2d5df58 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.41 2001/07/06 02:25:02 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.42 2001/08/04 00:29:56 hobbs Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -408,24 +408,20 @@ install-binaries: binaries else true; \ fi; \ done; - @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) - @echo "Installing $(WISH) as $(BIN_INSTALL_DIR)/wish$(VERSION)" - @$(INSTALL_PROGRAM) $(WISH) $(BIN_INSTALL_DIR)/$(WISH) - @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh - @if test "$(DLLSUFFIX)" != "" ; then \ - echo "Installing $(TK_DLL_FILE) to $(LIB_INSTALL_DIR)/" ; \ - $(INSTALL_PROGRAM) $(TK_DLL_FILE) \ - $(BIN_INSTALL_DIR)/$(TK_DLL_FILE) ; \ - fi - @if test "$(TK_STUB_LIB_FILE)" != "" ; then \ - if [ -f $(TK_STUB_LIB_FILE) ]; then \ - echo "Installing $(TK_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TK_STUB_LIB_FILE) \ - $(LIB_INSTALL_DIR)/$(TK_STUB_LIB_FILE); \ + @for i in $(TK_DLL_FILE) $(WISH); \ + do \ + if [ -f $$i ]; then \ + echo "Installing $$i to $(BIN_INSTALL_DIR)/"; \ + $(COPY) $$i "$(BIN_INSTALL_DIR)"; \ + fi; \ + done + @for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \ + do \ + if [ -f $$i ]; then \ + echo "Installing $$i to $(LIB_INSTALL_DIR)/"; \ + $(COPY) $$i "$(LIB_INSTALL_DIR)"; \ fi; \ - fi + done install-libraries: libraries @for i in $(INSTALL_ROOT)$(prefix)/lib \ @@ -439,7 +435,7 @@ install-libraries: libraries else true; \ fi; \ done; - @echo "Installing header files"; + @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \ $(GENERIC_DIR)/tkIntXlibDecls.h $(GENERIC_DIR)/tkDecls.h ; \ do \ @@ -498,7 +494,7 @@ install-demos: install-doc: doc -$(WISH): $(TK_LIB_FILE) $(WISH_OBJS) wish.$(RES) +$(WISH): $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(WISH_OBJS) wish.$(RES) $(CC) $(CFLAGS) $(WISH_OBJS) $(TCL_LIB_FILE) $(TK_LIB_FILE) $(LIBS) \ wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW) |