To: vim_dev@googlegroups.com
Subject: Patch 9.0.1486
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1486
Problem:    Parallel make might not work.
Solution:   Add missing dependencies. (Samuel Dionne-Riel, closes #12288)
Files:      src/Makefile


*** ../vim-9.0.1485/src/Makefile	2022-12-04 20:11:12.795828027 +0000
--- src/Makefile	2023-04-24 22:38:47.874473108 +0100
***************
*** 455,460 ****
--- 455,461 ----
  # 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,591 ****
  # 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.
  #CFLAGS = -g
  #CFLAGS = -O
  
--- 586,592 ----
  # 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 for gcc and -O for others.
  #CFLAGS = -g
  #CFLAGS = -O
  
***************
*** 2329,2335 ****
  
  # 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) \
  		$(DEST_HELP) $(DEST_PRINT) $(DEST_COL) \
  		$(DEST_SYN) $(DEST_SYN)/shared $(DEST_IND) \
  		$(DEST_FTP) $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml \
--- 2330,2336 ----
  
  # 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) $(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,2349 ****
  	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
  	cd $(HELPSOURCE); \
  		files=`ls *.txt tags`; \
  		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
--- 2343,2352 ----
  	cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \
  		mv -f tags tags.dist; fi
  	@echo generating help tags
! 	# 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,2664 ****
  	$(MKDIR_P) $@
  	-chmod $(DIRMOD) $@
  
! # 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) \
--- 2661,2667 ----
  	$(MKDIR_P) $@
  	-chmod $(DIRMOD) $@
  
! # 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,2717 ****
  installvimdiff: $(DEST_BIN)/$(VIMDIFFTARGET)
  installgvimdiff: $(DEST_BIN)/$(GVIMDIFFTARGET)
  
! $(DEST_BIN)/$(EXTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET)
  
! $(DEST_BIN)/$(VIEWTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIEWTARGET)
  
! $(DEST_BIN)/$(GVIMTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMTARGET)
  
! $(DEST_BIN)/$(GVIEWTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET)
  
! $(DEST_BIN)/$(RVIMTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET)
  
! $(DEST_BIN)/$(RVIEWTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIEWTARGET)
  
! $(DEST_BIN)/$(RGVIMTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIMTARGET)
  
! $(DEST_BIN)/$(RGVIEWTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET)
  
! $(DEST_BIN)/$(VIMDIFFTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET)
  
! $(DEST_BIN)/$(GVIMDIFFTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET)
  
! $(DEST_BIN)/$(EVIMTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET)
  
! $(DEST_BIN)/$(EVIEWTARGET):
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIEWTARGET)
  
  # Create links for the manual pages with various names to vim.	This is only
--- 2681,2720 ----
  installvimdiff: $(DEST_BIN)/$(VIMDIFFTARGET)
  installgvimdiff: $(DEST_BIN)/$(GVIMDIFFTARGET)
  
! $(DEST_BIN)/$(EXTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET)
  
! $(DEST_BIN)/$(VIEWTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIEWTARGET)
  
! $(DEST_BIN)/$(GVIMTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMTARGET)
  
! $(DEST_BIN)/$(GVIEWTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET)
  
! $(DEST_BIN)/$(RVIMTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET)
  
! $(DEST_BIN)/$(RVIEWTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIEWTARGET)
  
! $(DEST_BIN)/$(RGVIMTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIMTARGET)
  
! $(DEST_BIN)/$(RGVIEWTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET)
  
! $(DEST_BIN)/$(VIMDIFFTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET)
  
! $(DEST_BIN)/$(GVIMDIFFTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET)
  
! $(DEST_BIN)/$(EVIMTARGET): $(DEST_BIN)
  	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET)
  
! $(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
*** ../vim-9.0.1485/src/version.c	2023-04-24 21:09:28.125166628 +0100
--- src/version.c	2023-04-24 22:41:22.134526342 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1486,
  /**/

-- 
SUPERIMPOSE "England AD 787".  After a few more seconds we hear hoofbeats in
the distance.  They come slowly closer.  Then out of the mist comes KING
ARTHUR followed by a SERVANT who is banging two half coconuts together.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///