Skip to content

Commit 91b6e45

Browse files
committed
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".
1 parent 6de5e12 commit 91b6e45

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1892,11 +1892,6 @@ autoconf:
18921892
cmdidxs: ex_cmds.h
18931893
vim -u NONE -i NONE -X -S create_cmdidxs.vim
18941894

1895-
# Re-execute this Makefile to include the new auto/config.mk produced by
1896-
# configure Only used when typing "make" with a fresh auto/config.mk.
1897-
myself:
1898-
$(MAKE) -f Makefile all
1899-
19001895

19011896
# The normal command to compile a .c file to its .o file.
19021897
# Without or with ALL_CFLAGS.
@@ -2768,7 +2763,8 @@ uninstall_runtime:
27682763
# Clean up all the files that have been produced, except configure's.
27692764
# We support common typing mistakes for Juergen! :-)
27702765
clean celan: testclean
2771-
-rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
2766+
-rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
2767+
-rm -rf objects
27722768
-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h
27732769
-rm -f conftest* *~ auto/link.sed
27742770
-rm -f testdir/opt_test.vim

src/config.mk.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
the first targets to make vim are: scratch config myself
1+
the first target to make vim is: reconfig
22
srcdir = .
33
VIMNAME = vim
44
EXNAME = ex

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
573,
767769
/**/
768770
572,
769771
/**/

0 commit comments

Comments
 (0)