patch 8.0.0117
Problem: Parallel make fails. (J. Lewis Muir) Solution: Make sure the objects directory exists. (closes #1259)
This commit is contained in:
25
src/Makefile
25
src/Makefile
@ -1684,21 +1684,30 @@ OBJ = $(OBJ_COMMON) \
|
|||||||
objects/memfile.o \
|
objects/memfile.o \
|
||||||
objects/message.o
|
objects/message.o
|
||||||
|
|
||||||
JSON_TEST_OBJ = $(OBJ_COMMON) \
|
OBJ_JSON_TEST = \
|
||||||
objects/memfile.o \
|
objects/memfile.o \
|
||||||
objects/message.o \
|
objects/message.o \
|
||||||
objects/json_test.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/json.o \
|
||||||
objects/message.o \
|
objects/message.o \
|
||||||
objects/memfile_test.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/json.o \
|
||||||
objects/memfile.o \
|
objects/memfile.o \
|
||||||
objects/message_test.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 = \
|
PRO_AUTO = \
|
||||||
arabic.pro \
|
arabic.pro \
|
||||||
blowfish.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
|
# commands understand putting object files in another directory, it must be
|
||||||
# specified for each file separately.
|
# specified for each file separately.
|
||||||
|
|
||||||
objects:
|
objects objects/.dirstamp:
|
||||||
mkdir objects
|
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
|
objects/arabic.o: arabic.c
|
||||||
$(CCC) -o $@ arabic.c
|
$(CCC) -o $@ arabic.c
|
||||||
|
|||||||
@ -764,6 +764,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
117,
|
||||||
/**/
|
/**/
|
||||||
116,
|
116,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user