# HG changeset patch # User Christian Brabandt # Date 1492721103 -7200 # Node ID 78d7b92bfb1d54c48c4f9176ca6bb3446c4cd275 # Parent f49dddcfccfb9e72b625804171b38830b42719c3 patch 8.0.0573: running parallel make after distclean fails commit https://github.com/vim/vim/commit/91b6e4591a839139f720798a2efbe83b2ecf8446 Author: Bram Moolenaar Date: Thu Apr 20 22:32:24 2017 +0200 patch 8.0.0573: running parallel make after distclean fails Problem: Running parallel make after distclean fails. (Manuel Ortega) Solution: Instead of using targets "scratch config myself" use "reconfig". diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -1892,11 +1892,6 @@ autoconf: cmdidxs: ex_cmds.h vim -u NONE -i NONE -X -S create_cmdidxs.vim -# Re-execute this Makefile to include the new auto/config.mk produced by -# configure Only used when typing "make" with a fresh auto/config.mk. -myself: - $(MAKE) -f Makefile all - # The normal command to compile a .c file to its .o file. # Without or with ALL_CFLAGS. @@ -2768,7 +2763,8 @@ uninstall_runtime: # Clean up all the files that have been produced, except configure's. # We support common typing mistakes for Juergen! :-) clean celan: testclean - -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o + -rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o + -rm -rf objects -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h -rm -f conftest* *~ auto/link.sed -rm -f testdir/opt_test.vim diff --git a/src/config.mk.dist b/src/config.mk.dist --- a/src/config.mk.dist +++ b/src/config.mk.dist @@ -1,4 +1,4 @@ -the first targets to make vim are: scratch config myself +the first target to make vim is: reconfig srcdir = . VIMNAME = vim EXNAME = ex diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 573, +/**/ 572, /**/ 571,