diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-12-01 21:46:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-12-01 21:46:14 +0100 |
| commit | 327054df45faf5390e7392708f58eb49e9f323d4 (patch) | |
| tree | ed5c3194e4800f8e6cf23733abd6bfae0b2991c2 | |
| parent | 6dbf66aa3e2197ce41f2b1cc7602bb9c15840548 (diff) | |
| download | vim-git-327054df45faf5390e7392708f58eb49e9f323d4.tar.gz | |
patch 8.0.0117v8.0.0117
Problem: Parallel make fails. (J. Lewis Muir)
Solution: Make sure the objects directory exists. (closes #1259)
| -rw-r--r-- | src/Makefile | 25 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 22 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index 0945cc928..a24eb7b72 100644 --- 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 598a7eae4..6bc108f0f 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 117, +/**/ 116, /**/ 115, |