Mercurial > vim
changeset 10446:cc04895a5c35 v8.0.0117
commit https://github.com/vim/vim/commit/327054df45faf5390e7392708f58eb49e9f323d4
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 1 21:46:14 2016 +0100
patch 8.0.0117
Problem: Parallel make fails. (J. Lewis Muir)
Solution: Make sure the objects directory exists. (closes https://github.com/vim/vim/issues/1259)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 01 Dec 2016 22:00:04 +0100 |
parents | cde4d9ccca0a |
children | 49c97bf9cfdc |
files | src/Makefile src/version.c |
diffstat | 2 files changed, 22 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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.x # 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