1.1 --- a/Makefile Fri Feb 12 00:20:27 2021 +0100
1.2 +++ b/Makefile Fri Feb 12 00:21:03 2021 +0100
1.3 @@ -1,8 +1,11 @@
1.4 PKGDIR ?= .
1.5 L4DIR ?= $(PKGDIR)/../..
1.6
1.7 -TARGET = dstest_client dstest_server
1.8 -MODE = shared
1.9 +TARGET = \
1.10 + dstest_host_client dstest_test_client \
1.11 + dstest_host_server dstest_test_server
1.12 +
1.13 +MODE = static
1.14
1.15 # Locations for interface input and generated output.
1.16
1.17 @@ -37,28 +40,48 @@
1.18
1.19 COMMON_SRC_CC = memory_utils.cc
1.20
1.21 -PLAIN_SRC_CC_dstest_client = dstest_client.cc
1.22 +PLAIN_SRC_CC_dstest_host_client = dstest_host_client.cc
1.23 +
1.24 +PLAIN_SRC_CC_dstest_test_client = dstest_test_client.cc
1.25
1.26 -PLAIN_SRC_CC_dstest_server = \
1.27 +PLAIN_SRC_CC_dstest_host_server = \
1.28 access_map.cc accessing.cc accessor.cc \
1.29 - dstest_server.cc flexpage.cc file_pager.cc \
1.30 + dstest_host_server.cc flexpage.cc file_pager.cc \
1.31 + ipc.cc memory.cc \
1.32 + opener_resource.cc opener_context_resource.cc \
1.33 + page_mapper.cc page_queue.cc pager.cc pages.cc paging.cc \
1.34 + region.cc resource_server.cc simple_pager.cc \
1.35 + host_file_accessor.cc host_file_opener.cc
1.36 +
1.37 +PLAIN_SRC_CC_dstest_test_server = \
1.38 + access_map.cc accessing.cc accessor.cc \
1.39 + dstest_test_server.cc flexpage.cc file_pager.cc \
1.40 ipc.cc memory.cc \
1.41 opener_resource.cc opener_context_resource.cc \
1.42 page_mapper.cc page_queue.cc pager.cc pages.cc paging.cc \
1.43 region.cc resource_server.cc simple_pager.cc \
1.44 - host_file_accessor.cc host_file_opener.cc \
1.45 - test_file_accessor.cc test_file_opener.cc \
1.46 + test_file_accessor.cc test_file_opener.cc
1.47
1.48 # Normal definitions.
1.49
1.50 -SRC_CC_dstest_client = \
1.51 +SRC_CC_dstest_host_client = \
1.52 $(CLIENT_INTERFACES_SRC_CC) \
1.53 - $(PLAIN_SRC_CC_dstest_client) \
1.54 + $(PLAIN_SRC_CC_dstest_host_client) \
1.55 $(COMMON_SRC_CC)
1.56
1.57 -SRC_CC_dstest_server = \
1.58 +SRC_CC_dstest_test_client = \
1.59 + $(CLIENT_INTERFACES_SRC_CC) \
1.60 + $(PLAIN_SRC_CC_dstest_test_client) \
1.61 + $(COMMON_SRC_CC)
1.62 +
1.63 +SRC_CC_dstest_host_server = \
1.64 $(SERVER_INTERFACES_SRC_CC) \
1.65 - $(PLAIN_SRC_CC_dstest_server) \
1.66 + $(PLAIN_SRC_CC_dstest_host_server) \
1.67 + $(COMMON_SRC_CC)
1.68 +
1.69 +SRC_CC_dstest_test_server = \
1.70 + $(SERVER_INTERFACES_SRC_CC) \
1.71 + $(PLAIN_SRC_CC_dstest_test_server) \
1.72 $(COMMON_SRC_CC)
1.73
1.74 REQUIRES_LIBS = l4re_c-util libipc libstdc++
1.75 @@ -68,6 +91,10 @@
1.76 include $(L4DIR)/mk/prog.mk
1.77 include $(IDL_MK_DIR)/interface_rules.mk
1.78
1.79 -$(PLAIN_SRC_CC_dstest_client): $(CLIENT_INTERFACES_SRC_CC)
1.80 +$(PLAIN_SRC_CC_dstest_host_client): $(CLIENT_INTERFACES_SRC_CC)
1.81 +
1.82 +$(PLAIN_SRC_CC_dstest_test_client): $(CLIENT_INTERFACES_SRC_CC)
1.83
1.84 -$(PLAIN_SRC_CC_dstest_server): $(SERVER_INTERFACES_SRC_CC)
1.85 +$(PLAIN_SRC_CC_dstest_host_server): $(SERVER_INTERFACES_SRC_CC)
1.86 +
1.87 +$(PLAIN_SRC_CC_dstest_test_server): $(SERVER_INTERFACES_SRC_CC)