Mercurial > vim

comparison src/Makefile @ 10446:cc04895a5c35 v8.0.0117

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cb856404d060
children 34b50194f82d
comparison
equal deleted inserted replaced
10445:cde4d9ccca0a 10446:cc04895a5c35
1682 objects/json.o \ 1682 objects/json.o \
1683 objects/main.o \ 1683 objects/main.o \
1684 objects/memfile.o \ 1684 objects/memfile.o \
1685 objects/message.o 1685 objects/message.o
1686 1686
1687 JSON_TEST_OBJ = $(OBJ_COMMON) \ 1687 OBJ_JSON_TEST = \
1688 objects/memfile.o \ 1688 objects/memfile.o \
1689 objects/message.o \ 1689 objects/message.o \
1690 objects/json_test.o 1690 objects/json_test.o
1691 1691
1692 MEMFILE_TEST_OBJ = $(OBJ_COMMON) \ 1692 JSON_TEST_OBJ = $(OBJ_COMMON) $(OBJ_JSON_TEST)
1693
1694 OBJ_MEMFILE_TEST = \
1693 objects/json.o \ 1695 objects/json.o \
1694 objects/message.o \ 1696 objects/message.o \
1695 objects/memfile_test.o 1697 objects/memfile_test.o
1696 1698
1697 MESSAGE_TEST_OBJ = $(OBJ_COMMON) \ 1699 MEMFILE_TEST_OBJ = $(OBJ_COMMON) $(OBJ_MEMFILE_TEST)
1700
1701 OBJ_MESSAGE_TEST = \
1698 objects/json.o \ 1702 objects/json.o \
1699 objects/memfile.o \ 1703 objects/memfile.o \
1700 objects/message_test.o 1704 objects/message_test.o
1705
1706 MESSAGE_TEST_OBJ = $(OBJ_COMMON) $(OBJ_MESSAGE_TEST)
1707
1708 ALL_OBJ = $(OBJ_COMMON) $(OBJ_JSON_TEST) $(OBJ_MEMFILE_TEST) $(OBJ_MESSAGE_TEST)
1709
1701 1710
1702 PRO_AUTO = \ 1711 PRO_AUTO = \
1703 arabic.pro \ 1712 arabic.pro \
1704 blowfish.pro \ 1713 blowfish.pro \
1705 buffer.pro \ 1714 buffer.pro \
2851 2860
2852 # All the object files are put in the "objects" directory. Since not all make 2861 # All the object files are put in the "objects" directory. Since not all make
2853 # commands understand putting object files in another directory, it must be 2862 # commands understand putting object files in another directory, it must be
2854 # specified for each file separately. 2863 # specified for each file separately.
2855 2864
2856 objects: 2865 objects objects/.dirstamp:
2857 mkdir objects 2866 mkdir -p objects
2867 touch objects/.dirstamp
2868
2869 # All object files depend on the objects directory, so that parallel make
2870 # works. Can't depend on the directory itself, its timestamp changes all the
2871 # time.
2872 $(ALL_OBJ): objects/.dirstamp
2858 2873
2859 objects/arabic.o: arabic.c 2874 objects/arabic.o: arabic.c
2860 $(CCC) -o $@ arabic.c 2875 $(CCC) -o $@ arabic.c
2861 2876
2862 objects/blowfish.o: blowfish.c 2877 objects/blowfish.o: blowfish.c