1.1 --- a/Makefile Sun Jan 24 19:29:07 2021 +0100
1.2 +++ b/Makefile Mon Feb 01 00:10:21 2021 +0100
1.3 @@ -15,16 +15,19 @@
1.4
1.5 # Compound interfaces.
1.6
1.7 -mapped_file_object_NAME = MappedFileObject
1.8 -mapped_file_object_INTERFACES = dataspace mapped_file
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 +opener_context_object_NAME = OpenerContextObject
1.14 +opener_context_object_INTERFACES = dataspace opener_context
1.15 +
1.16 +COMP_INTERFACES_CC = mapped_file_object opener_context_object
1.17
1.18 # Individual interfaces.
1.19
1.20 -CLIENT_INTERFACES_CC = mapped_file
1.21 +CLIENT_INTERFACES_CC = dataspace mapped_file opener opener_context
1.22
1.23 -SERVER_INTERFACES_CC = $(call common_interfaces,$(COMP_INTERFACES_CC))
1.24 +SERVER_INTERFACES_CC = opener $(call common_interfaces,$(COMP_INTERFACES_CC))
1.25
1.26 # Generated and plain source files.
1.27
1.28 @@ -32,27 +35,30 @@
1.29
1.30 SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
1.31
1.32 -PLAIN_SRC_CC_dstest_client = \
1.33 - dstest_client.cc memory_utils.cc
1.34 +COMMON_SRC_CC = memory_utils.cc
1.35 +
1.36 +PLAIN_SRC_CC_dstest_client = dstest_client.cc
1.37
1.38 PLAIN_SRC_CC_dstest_server = \
1.39 access_map.cc accessing.cc accessor.cc \
1.40 dstest_server.cc flexpage.cc file_pager.cc \
1.41 - ipc.cc memory.cc memory_map.cc memory_utils.cc \
1.42 - opener.cc opener_context.cc \
1.43 + ipc.cc memory.cc memory_map.cc \
1.44 + opener_resource.cc opener_context_resource.cc \
1.45 page_mapper.cc page_queue.cc pager.cc pages.cc paging.cc \
1.46 - region.cc resource.cc simple_pager.cc \
1.47 - test_file_accessor.cc test_file_opener.cc
1.48 + region.cc resource_server.cc simple_pager.cc \
1.49 + test_file_accessor.cc test_file_opener.cc \
1.50
1.51 # Normal definitions.
1.52
1.53 SRC_CC_dstest_client = \
1.54 $(CLIENT_INTERFACES_SRC_CC) \
1.55 - $(PLAIN_SRC_CC_dstest_client)
1.56 + $(PLAIN_SRC_CC_dstest_client) \
1.57 + $(COMMON_SRC_CC)
1.58
1.59 SRC_CC_dstest_server = \
1.60 $(SERVER_INTERFACES_SRC_CC) \
1.61 - $(PLAIN_SRC_CC_dstest_server)
1.62 + $(PLAIN_SRC_CC_dstest_server) \
1.63 + $(COMMON_SRC_CC)
1.64
1.65 REQUIRES_LIBS = l4re_c-util libipc libstdc++
1.66