Permalink
Browse files

patch 8.0.0117

Problem:    Parallel make fails. (J. Lewis Muir)
Solution:   Make sure the objects directory exists. (closes #1259)
  • Loading branch information...
1 parent 6dbf66a commit 327054df45faf5390e7392708f58eb49e9f323d4 @brammool brammool committed Dec 1, 2016
Showing with 22 additions and 5 deletions.
  1. +20 −5 src/Makefile
  2. +2 −0 src/version.c
View
@@ -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
View
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 117,
+/**/
116,
/**/
115,

0 comments on commit 327054d

Please sign in to comment.