Permalink
Browse files

patch 8.0.0129

Problem:    Parallel make still doesn't work. (Lewis Muir)
Solution:   Define OBJ_MAIN.
  • Loading branch information...
1 parent 7089237 commit 0df3c7f2a05c2a99f2fb2747ae46bd6594052997 @brammool brammool committed Dec 9, 2016
Showing with 13 additions and 3 deletions.
  1. +11 −3 src/Makefile
  2. +2 −0 src/version.c
View
@@ -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
View
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 129,
+/**/
128,
/**/
127,

0 comments on commit 0df3c7f

Please sign in to comment.