Mercurial > vim

changeset 10472:0a92ca179bba v8.0.0129

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/0df3c7f2a05c2a99f2fb2747ae46bd6594052997 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 9 19:57:14 2016 +0100 patch 8.0.0129 Problem: Parallel make still doesn't work. (Lewis Muir) Solution: Define OBJ_MAIN.
author Christian Brabandt <cb@256bit.org>
date Fri, 09 Dec 2016 20:00:05 +0100
parents dacb7d2edc42
children 0c7f827aad1c
files src/Makefile src/version.c
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile
+++ b/src/Makefile
@@ -1678,12 +1678,14 @@ OBJ_COMMON = \
 	$(WSDEBUG_OBJ)
 
 # The files included by tests are not in OBJ_COMMON.
-OBJ = $(OBJ_COMMON) \
+OBJ_MAIN = \
 	objects/json.o \
 	objects/main.o \
 	objects/memfile.o \
 	objects/message.o
 
+OBJ = $(OBJ_COMMON) $(OBJ_MAIN)
+
 OBJ_JSON_TEST = \
 	objects/memfile.o \
 	objects/message.o \
@@ -1705,7 +1707,11 @@ OBJ_MESSAGE_TEST = \
 
 MESSAGE_TEST_OBJ = $(OBJ_COMMON) $(OBJ_MESSAGE_TEST)
 
-ALL_OBJ = $(OBJ_COMMON) $(OBJ_JSON_TEST) $(OBJ_MEMFILE_TEST) $(OBJ_MESSAGE_TEST)
+ALL_OBJ = $(OBJ_COMMON) \
+	  $(OBJ_MAIN) \
+	  $(OBJ_JSON_TEST) \
+	  $(OBJ_MEMFILE_TEST) \
+	  $(OBJ_MESSAGE_TEST)
 
 
 PRO_AUTO = \
@@ -2863,7 +2869,9 @@ auto/gui_gtk_gresources.h: gui_gtk_res.x
 # commands understand putting object files in another directory, it must be
 # specified for each file separately.
 
-objects objects/.dirstamp:
+objects: objects/.dirstamp
+
+objects/.dirstamp:
 	mkdir -p objects
 	touch objects/.dirstamp
 
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    129,
+/**/
     128,
 /**/
     127,