Skip to content

Commit

Permalink
patch 8.0.0573: running parallel make after distclean fails
Browse files Browse the repository at this point in the history
Problem:    Running parallel make after distclean fails. (Manuel Ortega)
Solution:   Instead of using targets "scratch config myself" use "reconfig".
  • Loading branch information
brammool committed Apr 20, 2017
1 parent 6de5e12 commit 91b6e45
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
8 changes: 2 additions & 6 deletions src/Makefile
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -764,6 +764,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
573,
/**/
572,
/**/
Expand Down

0 comments on commit 91b6e45

Please sign in to comment.