1.1 --- a/tests/Makefile Tue Apr 26 23:15:30 2022 +0200
1.2 +++ b/tests/Makefile Sun May 01 01:07:25 2022 +0200
1.3 @@ -27,17 +27,20 @@
1.4
1.5 include $(IDL_MK_DIR)/idl.mk
1.6
1.7 +# Compound interfaces.
1.8 +
1.9 +pager_object_NAME = PagerObject
1.10 +pager_object_INTERFACES = region_mapper system_pager
1.11 +
1.12 +COMP_INTERFACES_CC = pager_object
1.13 +
1.14 # Individual interfaces.
1.15
1.16 -CLIENT_INTERFACES_CC = system_pager
1.17 -
1.18 -SERVER_INTERFACES_CC = system_pager
1.19 +SERVER_INTERFACES_CC = $(call common_interfaces,$(COMP_INTERFACES_CC))
1.20
1.21 # Generated and plain source files.
1.22
1.23 -CLIENT_INTERFACES_SRC_CC = $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC))
1.24 -
1.25 -SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC))
1.26 +SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
1.27
1.28 # Normal source files.
1.29
1.30 @@ -66,8 +69,7 @@
1.31 SRC_CC_dstest_test_client = dstest_test_client.cc
1.32
1.33 PLAIN_SRC_CC_dstest_exec = dstest_exec.cc
1.34 -SRC_CC_dstest_exec = $(PLAIN_SRC_CC_dstest_exec) $(SERVER_INTERFACES_SRC_CC) \
1.35 - $(CLIENT_INTERFACES_SRC_CC)
1.36 +SRC_CC_dstest_exec = $(PLAIN_SRC_CC_dstest_exec) $(SERVER_INTERFACES_SRC_CC)
1.37
1.38 REQUIRES_LIBS = l4re_c-util libfsclient libmem libipc libstdc++ libsystypes libe2access_blockserver
1.39 PRIVATE_INCDIR = $(IDL_BUILD_DIR) $(IDL_EXPORT_DIR)
1.40 @@ -75,4 +77,4 @@
1.41 include $(L4DIR)/mk/prog.mk
1.42 include $(IDL_MK_DIR)/interface_rules.mk
1.43
1.44 -$(PLAIN_SRC_CC_dstest_exec): $(SERVER_INTERFACES_SRC_CC) $(CLIENT_INTERFACES_SRC_CC)
1.45 +$(PLAIN_SRC_CC_dstest_exec): $(SERVER_INTERFACES_SRC_CC)