patch 8.0.0117

Problem:    Parallel make fails. (J. Lewis Muir)
Solution:   Make sure the objects directory exists. (closes #1259)

diff --git a/src/Makefile b/src/Makefile
index 0945cc928654bfa3c1401aebb2c56e5b66fa24f2..a24eb7b72df4f482a04ac5dc7717f5e9ad43bd99 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1684,21 +1684,30 @@ OBJ = $(OBJ_COMMON) \
        objects/memfile.o \
        objects/message.o
 
-JSON_TEST_OBJ = $(OBJ_COMMON) \
+OBJ_JSON_TEST = \
        objects/memfile.o \
        objects/message.o \
        objects/json_test.o
 
-MEMFILE_TEST_OBJ = $(OBJ_COMMON) \
+JSON_TEST_OBJ = $(OBJ_COMMON) $(OBJ_JSON_TEST)
+
+OBJ_MEMFILE_TEST = \
        objects/json.o \
        objects/message.o \
        objects/memfile_test.o
 
-MESSAGE_TEST_OBJ = $(OBJ_COMMON) \
+MEMFILE_TEST_OBJ = $(OBJ_COMMON) $(OBJ_MEMFILE_TEST)
+
+OBJ_MESSAGE_TEST = \
        objects/json.o \
        objects/memfile.o \
        objects/message_test.o
 
+MESSAGE_TEST_OBJ = $(OBJ_COMMON) $(OBJ_MESSAGE_TEST)
+
+ALL_OBJ = $(OBJ_COMMON) $(OBJ_JSON_TEST) $(OBJ_MEMFILE_TEST) $(OBJ_MESSAGE_TEST)
+
+
 PRO_AUTO = \
        arabic.pro \
        blowfish.pro \
@@ -2853,8 +2862,14 @@ 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:
-       mkdir objects
+objects objects/.dirstamp:
+       mkdir -p objects
+       touch objects/.dirstamp
+
+# All object files depend on the objects directory, so that parallel make
+# works.  Can't depend on the directory itself, its timestamp changes all the
+# time.
+$(ALL_OBJ): objects/.dirstamp
 
 objects/arabic.o: arabic.c
        $(CCC) -o $@ arabic.c

diff --git a/src/version.c b/src/version.c
index 598a7eae4404de0008bcfdc0e3a524e206cbf875..6bc108f0f5919d3673e8ab1d4be9da8aaa993408 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 */
+/**/
+    117,
 /**/
     116,
 /**/