Mercurial > vim

changeset 22894:a852e4e61887 v8.2.1994

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1994: MS-Windows: MinGW always does a full build Commit: https://github.com/vim/vim/commit/c4390fe6c0d1b47b1acd373d7e8ef986412c0600 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Nov 16 18:49:47 2020 +0100 patch 8.2.1994: MS-Windows: MinGW always does a full build Problem: MS-Windows: MinGW always does a full build. Solution: Only check if $OUTDIR exists. (Masamichi Abe, closes https://github.com/vim/vim/issues/7311)
author Bram Moolenaar <Bram@vim.org>
date Mon, 16 Nov 2020 19:00:03 +0100
parents 53e574842235
children 040778b130ee
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -1055,23 +1055,23 @@ install.exe: dosinst.c dosinst.h version
 uninstall.exe: uninstall.c dosinst.h version.h
 	$(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32
 
-$(OBJ): $(OUTDIR)
+$(OBJ): | $(OUTDIR)
 
-$(EXEOBJG): $(OUTDIR)
+$(EXEOBJG): | $(OUTDIR)
 
-$(EXEOBJC): $(OUTDIR)
+$(EXEOBJC): | $(OUTDIR)
 
 ifeq ($(VIMDLL),yes)
-$(TARGET): $(OUTDIR) $(OBJ)
+$(TARGET): $(OBJ)
 	$(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid -lgdi32 $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB)
 
-$(GVIMEXE): $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll
+$(GVIMEXE): $(EXEOBJG) $(VIMDLLBASE).dll
 	$(CC) -L. $(EXELFLAGS) -mwindows -o $@ $(EXEOBJG) -l$(VIMDLLBASE)
 
-$(VIMEXE): $(OUTDIR) $(EXEOBJC) $(VIMDLLBASE).dll
+$(VIMEXE): $(EXEOBJC) $(VIMDLLBASE).dll
 	$(CC) -L. $(EXELFLAGS) -o $@ $(EXEOBJC) -l$(VIMDLLBASE)
 else
-$(TARGET): $(OUTDIR) $(OBJ)
+$(TARGET): $(OBJ)
 	$(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB)
 endif
 
@@ -1286,7 +1286,7 @@ CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/
 	$(CC) -c $(CFLAGS) $< -o $@
 
 
-$(PATHDEF_SRC): $(OUTDIR) Make_cyg_ming.mak Make_cyg.mak Make_ming.mak
+$(PATHDEF_SRC): Make_cyg_ming.mak Make_cyg.mak Make_ming.mak | $(OUTDIR)
 ifneq (sh.exe, $(SHELL))
 	@echo creating $(PATHDEF_SRC)
 	@echo '/* pathdef.c */' > $(PATHDEF_SRC)
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1994,
+/**/
     1993,
 /**/
     1992,