1.1 --- a/Makefile Sat Jan 23 00:01:22 2021 +0100
1.2 +++ b/Makefile Sat Jan 23 23:45:31 2021 +0100
1.3 @@ -13,29 +13,45 @@
1.4
1.5 include $(IDL_MK_DIR)/idl.mk
1.6
1.7 +# Compound interfaces.
1.8 +
1.9 +mapped_file_object_NAME = MappedFileObject
1.10 +mapped_file_object_INTERFACES = dataspace mapped_file
1.11 +
1.12 +COMP_INTERFACES_CC = mapped_file_object
1.13 +
1.14 # Individual interfaces.
1.15
1.16 -SERVER_INTERFACES_CC = dataspace
1.17 +CLIENT_INTERFACES_CC = mapped_file
1.18 +
1.19 +SERVER_INTERFACES_CC = $(call common_interfaces,$(COMP_INTERFACES_CC))
1.20
1.21 # Generated and plain source files.
1.22
1.23 -SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC))
1.24 +CLIENT_INTERFACES_SRC_CC = $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC))
1.25 +
1.26 +SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
1.27
1.28 -PLAIN_SRC_CC = \
1.29 +PLAIN_SRC_CC_dstest_client = \
1.30 + dstest_client.cc memory_utils.cc
1.31 +
1.32 +PLAIN_SRC_CC_dstest_server = \
1.33 access_map.cc accessor.cc \
1.34 - dstest_server.cc flexpage.cc ipc.cc \
1.35 - memory.cc memory_map.cc memory_utils.cc \
1.36 + dstest_server.cc flexpage.cc file_pager.cc \
1.37 + ipc.cc memory.cc memory_map.cc memory_utils.cc \
1.38 page_mapper.cc page_queue.cc pager.cc pages.cc \
1.39 region.cc resource.cc simple_pager.cc \
1.40 test_file_accessor.cc
1.41
1.42 # Normal definitions.
1.43
1.44 -SRC_CC_dstest_client = dstest_client.cc
1.45 +SRC_CC_dstest_client = \
1.46 + $(CLIENT_INTERFACES_SRC_CC) \
1.47 + $(PLAIN_SRC_CC_dstest_client)
1.48
1.49 SRC_CC_dstest_server = \
1.50 $(SERVER_INTERFACES_SRC_CC) \
1.51 - $(PLAIN_SRC_CC)
1.52 + $(PLAIN_SRC_CC_dstest_server)
1.53
1.54 REQUIRES_LIBS = l4re_c-util libipc libstdc++
1.55
1.56 @@ -44,4 +60,6 @@
1.57 include $(L4DIR)/mk/prog.mk
1.58 include $(IDL_MK_DIR)/interface_rules.mk
1.59
1.60 -$(PLAIN_SRC_CC): $(SERVER_INTERFACES_SRC_CC)
1.61 +$(PLAIN_SRC_CC_dstest_client): $(CLIENT_INTERFACES_SRC_CC)
1.62 +
1.63 +$(PLAIN_SRC_CC_dstest_server): $(SERVER_INTERFACES_SRC_CC)