Skip to content

Commit

Permalink
patch 8.0.0117
Browse files Browse the repository at this point in the history
Problem:    Parallel make fails. (J. Lewis Muir)
Solution:   Make sure the objects directory exists. (closes #1259)
  • Loading branch information
brammool committed Dec 1, 2016
1 parent 6dbf66a commit 327054d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
25 changes: 20 additions & 5 deletions src/Makefile
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -764,6 +764,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
117,
/**/
116,
/**/
Expand Down

0 comments on commit 327054d

Please sign in to comment.