diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-08 10:11:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-08 10:11:38 (GMT) |
| commit | 6efc470726851050a632aa88bf0ba5058d8c58bd (patch) | |
| tree | bb39d96b9853a29a09fa0ca049c28a68cc8914cc /win | |
| parent | fed1ff66dc94e36bd81d2375954f2f011f8c329a (diff) | |
| parent | fa2bb177ebd40bbd17d74535df0e5ba6769e3175 (diff) | |
| download | tcl-6efc470726851050a632aa88bf0ba5058d8c58bd.zip tcl-6efc470726851050a632aa88bf0ba5058d8c58bd.tar.gz tcl-6efc470726851050a632aa88bf0ba5058d8c58bd.tar.bz2 | |
Merge 8.5
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 8d85df2..7af6901 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -180,7 +180,7 @@ TCL_EXE = @TCL_EXE@ # Setting the VPATH variable to a list of paths will cause the Makefile to # look into these paths when resolving .c to .obj dependencies. -VPATH = $(GENERIC_DIR):$(TOMMATH_DIR):$(WIN_DIR):$(COMPAT_DIR):$(ZLIB_DIR) +VPATH = $(GENERIC_DIR):$(WIN_DIR):$(COMPAT_DIR):$(ZLIB_DIR):$(TOMMATH_DIR) AR = @AR@ RANLIB = @RANLIB@ @@ -422,7 +422,7 @@ ZLIB_OBJS = \ uncompr.$(OBJEXT) \ zutil.$(OBJEXT) -TCL_OBJS = ${GENERIC_OBJS} $(TOMMATH_OBJS) ${WIN_OBJS} @ZLIB_OBJS@ +TCL_OBJS = ${GENERIC_OBJS} ${WIN_OBJS} @ZLIB_OBJS@ $(TOMMATH_OBJS) TCL_DOCS = "$(ROOT_DIR_NATIVE)"/doc/*.[13n] @@ -469,7 +469,7 @@ doc: $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES) $(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \ - tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) + tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) $(COPY) tclsh.exe.manifest $(TCLSH).manifest @VC_MANIFEST_EMBED_EXE@ @@ -622,7 +622,7 @@ gentommath_h: install: all install-binaries install-libraries install-doc install-packages install-binaries: binaries - @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" ; \ + @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)"; \ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -809,11 +809,12 @@ cleanhelp: clean: cleanhelp clean-packages $(RM) *.lib *.a *.exp *.dll *.$(RES) *.${OBJEXT} *~ \#* TAGS a.out $(RM) $(TCLSH) $(CAT32) $(TEST_EXE_FILE) $(TEST_DLL_FILE) tcltest.cmd tcltest.sh - $(RM) *.pch *.ilk *.pdb + $(RM) *.pch *.ilk *.pdb *.zip + $(RMDIR) *.vfs distclean: distclean-packages clean $(RM) Makefile config.status config.cache config.log tclConfig.sh \ - tcl.hpj config.status.lineno + tcl.hpj config.status.lineno tclsh.exe.manifest # # Bundled package targets |