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
index 628345179130ac6ec16cd1cb0f36247e10efd4c7..bcfbbb722456ca57ecf3311c3f7a0350a2fe2e1c 100644 (file)
--- 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
index fa7c10850589eda582a9dd60125bf2b7fbf251a7..8a584c29a45c987032cd14801b38a427fb18a7eb 100644 (file)
--- 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
index 6870b017b8a671e511c5509d1533664519cfff0f..7bafae1db578c931fa2eb1c3ce5e16d7c2d16586 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    573,
 /**/
     572,
 /**/