File tree Expand file tree Collapse file tree 2 files changed +13
-3
lines changed
Expand file tree Collapse file tree 2 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -1678,12 +1678,14 @@ OBJ_COMMON = \
16781678 $(WSDEBUG_OBJ )
16791679
16801680# The files included by tests are not in OBJ_COMMON.
1681- OBJ = $( OBJ_COMMON ) \
1681+ OBJ_MAIN = \
16821682 objects/json.o \
16831683 objects/main.o \
16841684 objects/memfile.o \
16851685 objects/message.o
16861686
1687+ OBJ = $(OBJ_COMMON ) $(OBJ_MAIN )
1688+
16871689OBJ_JSON_TEST = \
16881690 objects/memfile.o \
16891691 objects/message.o \
@@ -1705,7 +1707,11 @@ OBJ_MESSAGE_TEST = \
17051707
17061708MESSAGE_TEST_OBJ = $(OBJ_COMMON ) $(OBJ_MESSAGE_TEST )
17071709
1708- ALL_OBJ = $(OBJ_COMMON ) $(OBJ_JSON_TEST ) $(OBJ_MEMFILE_TEST ) $(OBJ_MESSAGE_TEST )
1710+ ALL_OBJ = $(OBJ_COMMON ) \
1711+ $(OBJ_MAIN ) \
1712+ $(OBJ_JSON_TEST ) \
1713+ $(OBJ_MEMFILE_TEST ) \
1714+ $(OBJ_MESSAGE_TEST )
17091715
17101716
17111717PRO_AUTO = \
@@ -2863,7 +2869,9 @@ auto/gui_gtk_gresources.h: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS)
28632869# commands understand putting object files in another directory, it must be
28642870# specified for each file separately.
28652871
2866- objects objects/.dirstamp :
2872+ objects : objects/.dirstamp
2873+
2874+ objects/.dirstamp :
28672875 mkdir -p objects
28682876 touch objects/.dirstamp
28692877
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+ 129 ,
767769/**/
768770 128 ,
769771/**/
You can’t perform that action at this time.
0 commit comments