From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 9 Dec 2016 18:57:14 +0000 (+0100)
Subject: patch 8.0.0129
X-Git-Tag: v8.0.0129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0df3c7f2a05c2a99f2fb2747ae46bd6594052997;p=vim

patch 8.0.0129
Problem:    Parallel make still doesn't work. (Lewis Muir)
Solution:   Define OBJ_MAIN.
---

diff --git a/src/Makefile b/src/Makefile
index dcd59fc67..d6a5ba439 100644
--- 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.xml $(GUI_GTK_RES_INPUTS)
 # 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
 
diff --git a/src/version.c b/src/version.c
index 9b9705e0a..452ab18ac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    129,
 /**/
     128,
 /**/