1.1 --- a/Makefile Sun Mar 14 17:17:09 2021 +0100
1.2 +++ b/Makefile Sun Mar 14 21:41:49 2021 +0100
1.3 @@ -2,8 +2,8 @@
1.4 L4DIR ?= $(PKGDIR)/../..
1.5
1.6 TARGET = \
1.7 - dstest_host_client dstest_test_client \
1.8 - dstest_host_server dstest_test_server
1.9 + dstest_block_client dstest_host_client dstest_test_client \
1.10 + dstest_block_server dstest_host_server dstest_test_server
1.11
1.12 MODE = static
1.13
1.14 @@ -24,77 +24,98 @@
1.15 opener_context_object_NAME = OpenerContextObject
1.16 opener_context_object_INTERFACES = dataspace opener_context
1.17
1.18 -COMP_INTERFACES_CC = mapped_file_object opener_context_object
1.19 +COMP_INTERFACES_CC = mapped_file_object opener_context_object
1.20
1.21 # Individual interfaces.
1.22
1.23 -CLIENT_INTERFACES_CC = dataspace mapped_file opener opener_context
1.24 +CLIENT_INTERFACES_CC = dataspace mapped_file opener opener_context
1.25
1.26 -SERVER_INTERFACES_CC = opener $(call common_interfaces,$(COMP_INTERFACES_CC))
1.27 +SERVER_INTERFACES_CC = opener $(call common_interfaces,$(COMP_INTERFACES_CC))
1.28
1.29 # Generated and plain source files.
1.30
1.31 -CLIENT_INTERFACES_SRC_CC = $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC))
1.32 +CLIENT_INTERFACES_SRC_CC = $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC))
1.33
1.34 -SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
1.35 +SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
1.36 +
1.37 +COMMON_SRC_CC = memory_utils.cc
1.38
1.39 -COMMON_SRC_CC = memory_utils.cc
1.40 +PLAIN_SRC_CC_dstest_block_client = dstest_block_client.cc file.cc
1.41
1.42 -PLAIN_SRC_CC_dstest_host_client = dstest_host_client.cc file.cc
1.43 +PLAIN_SRC_CC_dstest_host_client = dstest_host_client.cc file.cc
1.44
1.45 -PLAIN_SRC_CC_dstest_test_client = dstest_test_client.cc file.cc
1.46 +PLAIN_SRC_CC_dstest_test_client = dstest_test_client.cc file.cc
1.47
1.48 -PLAIN_SRC_CC_dstest_host_server = \
1.49 - access_map.cc accessing.cc accessor.cc \
1.50 - dstest_host_server.cc flexpage.cc file_pager.cc \
1.51 - ipc.cc memory.cc \
1.52 - opener_resource.cc opener_context_resource.cc \
1.53 - page_mapper.cc page_queue.cc pager.cc pages.cc paging.cc \
1.54 - region.cc resource_server.cc simple_pager.cc \
1.55 - files/host_file_accessor.cc files/host_file_opener.cc
1.56 +PLAIN_SRC_CC_common_server = \
1.57 + access_map.cc accessing.cc accessor.cc \
1.58 + flexpage.cc file_pager.cc ipc.cc memory.cc \
1.59 + opener_resource.cc opener_context_resource.cc \
1.60 + page_mapper.cc page_queue.cc pager.cc pages.cc paging.cc \
1.61 + region.cc resource_server.cc simple_pager.cc
1.62
1.63 -PLAIN_SRC_CC_dstest_test_server = \
1.64 - access_map.cc accessing.cc accessor.cc \
1.65 - dstest_test_server.cc flexpage.cc file_pager.cc \
1.66 - ipc.cc memory.cc \
1.67 - opener_resource.cc opener_context_resource.cc \
1.68 - page_mapper.cc page_queue.cc pager.cc pages.cc paging.cc \
1.69 - region.cc resource_server.cc simple_pager.cc \
1.70 - files/test_file_accessor.cc files/test_file_opener.cc
1.71 +PLAIN_SRC_CC_dstest_block_server = \
1.72 + $(PLAIN_SRC_CC_common_server) \
1.73 + dstest_block_server.cc \
1.74 + files/block_file_accessor.cc files/block_file_opener.cc \
1.75 + files/host_file_accessor.cc files/host_file_opener.cc
1.76 +
1.77 +PLAIN_SRC_CC_dstest_host_server = \
1.78 + $(PLAIN_SRC_CC_common_server) \
1.79 + dstest_host_server.cc \
1.80 + files/host_file_accessor.cc files/host_file_opener.cc
1.81 +
1.82 +PLAIN_SRC_CC_dstest_test_server = \
1.83 + $(PLAIN_SRC_CC_common_server) \
1.84 + dstest_test_server.cc \
1.85 + files/test_file_accessor.cc files/test_file_opener.cc
1.86
1.87 # Normal definitions.
1.88
1.89 -SRC_CC_dstest_host_client = \
1.90 - $(CLIENT_INTERFACES_SRC_CC) \
1.91 - $(PLAIN_SRC_CC_dstest_host_client) \
1.92 - $(COMMON_SRC_CC)
1.93 +SRC_CC_dstest_block_client = \
1.94 + $(CLIENT_INTERFACES_SRC_CC) \
1.95 + $(PLAIN_SRC_CC_dstest_block_client) \
1.96 + $(COMMON_SRC_CC)
1.97
1.98 -SRC_CC_dstest_test_client = \
1.99 - $(CLIENT_INTERFACES_SRC_CC) \
1.100 - $(PLAIN_SRC_CC_dstest_test_client) \
1.101 - $(COMMON_SRC_CC)
1.102 +SRC_CC_dstest_host_client = \
1.103 + $(CLIENT_INTERFACES_SRC_CC) \
1.104 + $(PLAIN_SRC_CC_dstest_host_client) \
1.105 + $(COMMON_SRC_CC)
1.106 +
1.107 +SRC_CC_dstest_test_client = \
1.108 + $(CLIENT_INTERFACES_SRC_CC) \
1.109 + $(PLAIN_SRC_CC_dstest_test_client) \
1.110 + $(COMMON_SRC_CC)
1.111
1.112 -SRC_CC_dstest_host_server = \
1.113 - $(SERVER_INTERFACES_SRC_CC) \
1.114 - $(PLAIN_SRC_CC_dstest_host_server) \
1.115 - $(COMMON_SRC_CC)
1.116 +SRC_CC_dstest_block_server = \
1.117 + $(SERVER_INTERFACES_SRC_CC) \
1.118 + $(PLAIN_SRC_CC_dstest_block_server) \
1.119 + $(COMMON_SRC_CC)
1.120
1.121 -SRC_CC_dstest_test_server = \
1.122 - $(SERVER_INTERFACES_SRC_CC) \
1.123 - $(PLAIN_SRC_CC_dstest_test_server) \
1.124 - $(COMMON_SRC_CC)
1.125 +SRC_CC_dstest_host_server = \
1.126 + $(SERVER_INTERFACES_SRC_CC) \
1.127 + $(PLAIN_SRC_CC_dstest_host_server) \
1.128 + $(COMMON_SRC_CC)
1.129
1.130 -REQUIRES_LIBS = l4re_c-util libipc libstdc++ libsystypes
1.131 +SRC_CC_dstest_test_server = \
1.132 + $(SERVER_INTERFACES_SRC_CC) \
1.133 + $(PLAIN_SRC_CC_dstest_test_server) \
1.134 + $(COMMON_SRC_CC)
1.135
1.136 -PRIVATE_INCDIR = $(PKGDIR) $(PKGDIR)/files $(IDL_BUILD_DIR) $(IDL_EXPORT_DIR)
1.137 +REQUIRES_LIBS = l4re_c-util libipc libstdc++ libsystypes
1.138 +
1.139 +PRIVATE_INCDIR = $(PKGDIR) $(PKGDIR)/files $(IDL_BUILD_DIR) $(IDL_EXPORT_DIR)
1.140
1.141 include $(L4DIR)/mk/prog.mk
1.142 include $(IDL_MK_DIR)/interface_rules.mk
1.143
1.144 +$(PLAIN_SRC_CC_dstest_block_client): $(CLIENT_INTERFACES_SRC_CC)
1.145 +
1.146 $(PLAIN_SRC_CC_dstest_host_client): $(CLIENT_INTERFACES_SRC_CC)
1.147
1.148 $(PLAIN_SRC_CC_dstest_test_client): $(CLIENT_INTERFACES_SRC_CC)
1.149
1.150 +$(PLAIN_SRC_CC_dstest_block_server): $(SERVER_INTERFACES_SRC_CC)
1.151 +
1.152 $(PLAIN_SRC_CC_dstest_host_server): $(SERVER_INTERFACES_SRC_CC)
1.153
1.154 $(PLAIN_SRC_CC_dstest_test_server): $(SERVER_INTERFACES_SRC_CC)