aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-14 23:04:02 -05:00
Code Activity

patch 8.0.0573: running parallel make after distclean fails

Browse Source 
Problem:    Running parallel make after distclean fails. (Manuel Ortega)
Solution:   Instead of using targets "scratch config myself" use "reconfig".
This commit is contained in:
Bram Moolenaar
2017-04-20 22:32:24 +02:00
parent 6de5e12601
commit 91b6e4591a
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@@ -1892,11 +1892,6 @@ autoconf:
cmdidxs: ex_cmds.h cmdidxs: ex_cmds.h
vim -u NONE -i NONE -X -S create_cmdidxs.vim 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. # The normal command to compile a .c file to its .o file.
# Without or with ALL_CFLAGS. # Without or with ALL_CFLAGS.
@@ -2768,7 +2763,8 @@ uninstall_runtime:
# Clean up all the files that have been produced, except configure's. # Clean up all the files that have been produced, except configure's.
# We support common typing mistakes for Juergen! :-) # We support common typing mistakes for Juergen! :-)
clean celan: testclean 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 $(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 conftest* *~ auto/link.sed
-rm -f testdir/opt_test.vim -rm -f testdir/opt_test.vim

2
src/config.mk.dist
View File

@@ -1,4 +1,4 @@
the first targets to make vim are: scratch config myself the first target to make vim is: reconfig
srcdir = . srcdir = .
VIMNAME = vim VIMNAME = vim
EXNAME = ex EXNAME = ex

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
573,
/**/ /**/
572, 572,
/**/ /**/