aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.0.0129

Browse Source 
Problem:    Parallel make still doesn't work. (Lewis Muir)
Solution:   Define OBJ_MAIN.
This commit is contained in:
Bram Moolenaar
2016-12-09 19:57:14 +01:00
parent 7089237885
commit 0df3c7f2a0
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile
View File

@@ -1678,12 +1678,14 @@ OBJ_COMMON = \
$(WSDEBUG_OBJ) $(WSDEBUG_OBJ)
# The files included by tests are not in OBJ_COMMON. # The files included by tests are not in OBJ_COMMON.
OBJ = $(OBJ_COMMON) \ OBJ_MAIN = \
objects/json.o \ objects/json.o \
objects/main.o \ objects/main.o \
objects/memfile.o \ objects/memfile.o \
objects/message.o objects/message.o
OBJ = $(OBJ_COMMON) $(OBJ_MAIN)
OBJ_JSON_TEST = \ OBJ_JSON_TEST = \
objects/memfile.o \ objects/memfile.o \
objects/message.o \ objects/message.o \
@@ -1705,7 +1707,11 @@ OBJ_MESSAGE_TEST = \
MESSAGE_TEST_OBJ = $(OBJ_COMMON) $(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 = \ 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 # commands understand putting object files in another directory, it must be
# specified for each file separately. # specified for each file separately.
objects objects/.dirstamp: objects: objects/.dirstamp
objects/.dirstamp:
mkdir -p objects mkdir -p objects
touch objects/.dirstamp touch objects/.dirstamp

2
src/version.c
View File

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