diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-04-20 22:32:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-04-20 22:32:24 +0200 |
| commit | 91b6e4591a839139f720798a2efbe83b2ecf8446 (patch) | |
| tree | aa2aa95bf945320aa417150fd0f6f3456f5b59d5 | |
| parent | 6de5e126018b6f92526795cc06b1d73fac965db1 (diff) | |
| download | vim-git-91b6e4591a839139f720798a2efbe83b2ecf8446.tar.gz | |
patch 8.0.0573: running parallel make after distclean failsv8.0.0573
Problem: Running parallel make after distclean fails. (Manuel Ortega)
Solution: Instead of using targets "scratch config myself" use "reconfig".
| -rw-r--r-- | src/Makefile | 8 | ||||
| -rw-r--r-- | src/config.mk.dist | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index 628345179..bcfbbb722 100644 --- 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 fa7c10850..8a584c29a 100644 --- 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 6870b017b..7bafae1db 100644 --- 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, |