# HG changeset patch # User Christian Brabandt # Date 1481310005 -3600 # Node ID 0a92ca179bbaf88def2337206d4237def5c84dc2 # Parent dacb7d2edc42bf74c81737fb586d4a4ec9c42006 commit https://github.com/vim/vim/commit/0df3c7f2a05c2a99f2fb2747ae46bd6594052997 Author: Bram Moolenaar 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. diff --git a/src/Makefile b/src/Makefile --- 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 diff --git a/src/version.c b/src/version.c --- 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,