aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.1486: parallel make might not work

Browse Source 
Problem:    Parallel make might not work.
Solution:   Add missing dependencies. (Samuel Dionne-Riel, closes #12288)
This commit is contained in:
Samuel Dionne-Riel 2023-04-24 22:41:53 +01:00 committed by Bram Moolenaar
parent 67672ef097
commit cfc788c388
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Makefile
View File

@ -455,6 +455,7 @@ CClink = $(CC)
# Uncomment this when you want to include the Tcl interface.
# First one is for static linking, second one for dynamic loading.
# Debian package is "tcl-dev".
# This requires at least "normal" features, "tiny" doesn't work.
#CONF_OPT_TCL = --enable-tclinterp
#CONF_OPT_TCL = --enable-tclinterp=dynamic
#CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4
@ -585,7 +586,7 @@ CClink = $(CC)
# configure or afterwards. For examples see below.
# When using -g with some older versions of Linux you might get a
# statically linked executable.
# When not defined, configure will try to use -O2 -g for gcc and -O for cc.
# When not defined, configure will try to use -O2 for gcc and -O for others.
#CFLAGS = -g
#CFLAGS = -O
@ -2329,7 +2330,7 @@ installruntime: installrtbase installmacros installpack installtutor installspel
# Install the help files; first adjust the contents for the final location.
# Also install most of the other runtime files.
installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \
$(DEST_HELP) $(DEST_PRINT) $(DEST_COL) \
$(DEST_SYN) $(DEST_SYN)/shared $(DEST_IND) \
$(DEST_FTP) $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml \
@ -2342,8 +2343,10 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \
mv -f tags tags.dist; fi
@echo generating help tags
-@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
$(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags; fi
# We can assume Vim was build, but it may not have been installed,
# thus use the executable in the current directory.
-@BUILD_DIR="`pwd`"; cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
$(MAKE) VIMEXE="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi
cd $(HELPSOURCE); \
files=`ls *.txt tags`; \
files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
@ -2658,7 +2661,7 @@ $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
$(MKDIR_P) $@
-chmod $(DIRMOD) $@
# create links from various names to vim. This is only done when the links
# Create links from various names to vim. This is only done when the links
# (or executables with the same name) don't exist yet.
installlinks: $(GUI_TARGETS) \
$(DEST_BIN)/$(EXTARGET) \
@ -2678,40 +2681,40 @@ installglinks: $(DEST_BIN)/$(GVIMTARGET) \
installvimdiff: $(DEST_BIN)/$(VIMDIFFTARGET)
installgvimdiff: $(DEST_BIN)/$(GVIMDIFFTARGET)
$(DEST_BIN)/$(EXTARGET):
$(DEST_BIN)/$(EXTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET)
$(DEST_BIN)/$(VIEWTARGET):
$(DEST_BIN)/$(VIEWTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIEWTARGET)
$(DEST_BIN)/$(GVIMTARGET):
$(DEST_BIN)/$(GVIMTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMTARGET)
$(DEST_BIN)/$(GVIEWTARGET):
$(DEST_BIN)/$(GVIEWTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET)
$(DEST_BIN)/$(RVIMTARGET):
$(DEST_BIN)/$(RVIMTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET)
$(DEST_BIN)/$(RVIEWTARGET):
$(DEST_BIN)/$(RVIEWTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIEWTARGET)
$(DEST_BIN)/$(RGVIMTARGET):
$(DEST_BIN)/$(RGVIMTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIMTARGET)
$(DEST_BIN)/$(RGVIEWTARGET):
$(DEST_BIN)/$(RGVIEWTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET)
$(DEST_BIN)/$(VIMDIFFTARGET):
$(DEST_BIN)/$(VIMDIFFTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET)
$(DEST_BIN)/$(GVIMDIFFTARGET):
$(DEST_BIN)/$(GVIMDIFFTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET)
$(DEST_BIN)/$(EVIMTARGET):
$(DEST_BIN)/$(EVIMTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET)
$(DEST_BIN)/$(EVIEWTARGET):
$(DEST_BIN)/$(EVIEWTARGET): $(DEST_BIN)
cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIEWTARGET)
# Create links for the manual pages with various names to vim. This is only

2
src/version.c
View File

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