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 dcd59fc67101fe2fcd87a6acb3c2b3d78cec4117..d6a5ba439ba059dd2ef5be58eb8d8f54ef10b520 100644 (file)
--- 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 9b9705e0ac58b17e7f3794bfaeeda17ead78aa86..452ab18ac6fff3b8a9e1c4c9b47604bc2c275d09 100644 (file)
--- 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,
 /**/