File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1684,21 +1684,30 @@ OBJ = $(OBJ_COMMON) \
16841684 objects/memfile.o \
16851685 objects/message.o
16861686
1687- JSON_TEST_OBJ = $( OBJ_COMMON ) \
1687+ OBJ_JSON_TEST = \
16881688 objects/memfile.o \
16891689 objects/message.o \
16901690 objects/json_test.o
16911691
1692- MEMFILE_TEST_OBJ = $(OBJ_COMMON ) \
1692+ JSON_TEST_OBJ = $(OBJ_COMMON ) $(OBJ_JSON_TEST )
1693+
1694+ OBJ_MEMFILE_TEST = \
16931695 objects/json.o \
16941696 objects/message.o \
16951697 objects/memfile_test.o
16961698
1697- MESSAGE_TEST_OBJ = $(OBJ_COMMON ) \
1699+ MEMFILE_TEST_OBJ = $(OBJ_COMMON ) $(OBJ_MEMFILE_TEST )
1700+
1701+ OBJ_MESSAGE_TEST = \
16981702 objects/json.o \
16991703 objects/memfile.o \
17001704 objects/message_test.o
17011705
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+
1710+
17021711PRO_AUTO = \
17031712 arabic.pro \
17041713 blowfish.pro \
@@ -2853,8 +2862,14 @@ auto/gui_gtk_gresources.h: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS)
28532862# commands understand putting object files in another directory, it must be
28542863# specified for each file separately.
28552864
2856- objects :
2857- mkdir objects
2865+ objects objects/.dirstamp :
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
28582873
28592874objects/arabic.o : arabic.c
28602875 $(CCC ) -o $@ arabic.c
Original file line number Diff line number Diff line change @@ -764,6 +764,8 @@ static char *(features[]) =
764764
765765static int included_patches [] =
766766{ /* Add new patch number below this line */
767+ /**/
768+ 117 ,
767769/**/
768770 116 ,
769771/**/
You can’t perform that action at this time.
0 commit comments