Skip to content

Commit c4390fe

Browse files
committed
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 #7311)
1 parent 50dc3ec commit c4390fe

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

src/Make_cyg_ming.mak

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,23 +1055,23 @@ install.exe: dosinst.c dosinst.h version.h
10551055
uninstall.exe: uninstall.c dosinst.h version.h
10561056
$(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32
10571057

1058-
$(OBJ): $(OUTDIR)
1058+
$(OBJ): | $(OUTDIR)
10591059

1060-
$(EXEOBJG): $(OUTDIR)
1060+
$(EXEOBJG): | $(OUTDIR)
10611061

1062-
$(EXEOBJC): $(OUTDIR)
1062+
$(EXEOBJC): | $(OUTDIR)
10631063

10641064
ifeq ($(VIMDLL),yes)
1065-
$(TARGET): $(OUTDIR) $(OBJ)
1065+
$(TARGET): $(OBJ)
10661066
$(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid -lgdi32 $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB)
10671067

1068-
$(GVIMEXE): $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll
1068+
$(GVIMEXE): $(EXEOBJG) $(VIMDLLBASE).dll
10691069
$(CC) -L. $(EXELFLAGS) -mwindows -o $@ $(EXEOBJG) -l$(VIMDLLBASE)
10701070

1071-
$(VIMEXE): $(OUTDIR) $(EXEOBJC) $(VIMDLLBASE).dll
1071+
$(VIMEXE): $(EXEOBJC) $(VIMDLLBASE).dll
10721072
$(CC) -L. $(EXELFLAGS) -o $@ $(EXEOBJC) -l$(VIMDLLBASE)
10731073
else
1074-
$(TARGET): $(OUTDIR) $(OBJ)
1074+
$(TARGET): $(OBJ)
10751075
$(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB)
10761076
endif
10771077

@@ -1286,7 +1286,7 @@ $(OUTDIR)/%.o : xdiff/%.c $(XDIFF_DEPS)
12861286
$(CC) -c $(CFLAGS) $< -o $@
12871287

12881288

1289-
$(PATHDEF_SRC): $(OUTDIR) Make_cyg_ming.mak Make_cyg.mak Make_ming.mak
1289+
$(PATHDEF_SRC): Make_cyg_ming.mak Make_cyg.mak Make_ming.mak | $(OUTDIR)
12901290
ifneq (sh.exe, $(SHELL))
12911291
@echo creating $(PATHDEF_SRC)
12921292
@echo '/* pathdef.c */' > $(PATHDEF_SRC)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
1994,
753755
/**/
754756
1993,
755757
/**/

0 commit comments

Comments
 (0)