1.1 --- a/Makefile Thu Apr 01 00:39:16 2021 +0200
1.2 +++ b/Makefile Thu Apr 01 00:57:43 2021 +0200
1.3 @@ -43,51 +43,54 @@
1.4
1.5 COMMON_SRC_CC = memory/memory_utils.cc
1.6
1.7 -PLAIN_SRC_CC_dstest_block_client = dstest_block_client.cc file.cc
1.8 +PLAIN_SRC_CC_dstest_block_client = tests/dstest_block_client.cc file.cc
1.9
1.10 -PLAIN_SRC_CC_dstest_host_client = dstest_host_client.cc file.cc
1.11 +PLAIN_SRC_CC_dstest_host_client = tests/dstest_host_client.cc file.cc
1.12
1.13 -PLAIN_SRC_CC_dstest_pipe_client = dstest_pipe_client.cc file.cc
1.14 +PLAIN_SRC_CC_dstest_pipe_client = tests/dstest_pipe_client.cc file.cc
1.15
1.16 -PLAIN_SRC_CC_dstest_test_client = dstest_test_client.cc file.cc
1.17 +PLAIN_SRC_CC_dstest_test_client = tests/dstest_test_client.cc file.cc
1.18
1.19 PLAIN_SRC_CC_common_server = \
1.20 - access_map.cc accessor.cc \
1.21 - flexpage.cc ipc.cc \
1.22 + accessor.cc \
1.23 + ipc.cc \
1.24 + mapping/access_map.cc mapping/flexpage.cc mapping/page_mapper.cc \
1.25 memory/memory_incremental.cc memory/memory_preallocated.cc \
1.26 memory/region.cc \
1.27 - page_mapper.cc pager.cc paging.cc \
1.28 + pager.cc \
1.29 pages/page_queue.cc pages/page_queue_partitioned.cc \
1.30 pages/page_queue_shared.cc pages/pages.cc \
1.31 - resource_server.cc simple_pager.cc
1.32 + resource_server.cc
1.33 +
1.34 +PLAIN_SRC_CC_common_file_server = \
1.35 + files/file_pager.cc files/file_paging.cc \
1.36 + files/opener_resource.cc files/opener_context_resource.cc \
1.37 + simple_pager.cc
1.38
1.39 PLAIN_SRC_CC_dstest_block_server = \
1.40 $(PLAIN_SRC_CC_common_server) \
1.41 - dstest_block_server.cc \
1.42 - files/file_pager.cc \
1.43 - files/opener_resource.cc files/opener_context_resource.cc \
1.44 + $(PLAIN_SRC_CC_common_file_server) \
1.45 files/block_file_accessor.cc files/block_file_opener.cc \
1.46 - files/host_file_accessor.cc files/host_file_opener.cc
1.47 + files/host_file_accessor.cc files/host_file_opener.cc \
1.48 + tests/dstest_block_server.cc
1.49
1.50 PLAIN_SRC_CC_dstest_host_server = \
1.51 $(PLAIN_SRC_CC_common_server) \
1.52 - dstest_host_server.cc \
1.53 - files/file_pager.cc \
1.54 - files/opener_resource.cc files/opener_context_resource.cc \
1.55 - files/host_file_accessor.cc files/host_file_opener.cc
1.56 + $(PLAIN_SRC_CC_common_file_server) \
1.57 + files/host_file_accessor.cc files/host_file_opener.cc \
1.58 + tests/dstest_host_server.cc
1.59
1.60 PLAIN_SRC_CC_dstest_pipe_server = \
1.61 $(PLAIN_SRC_CC_common_server) \
1.62 - dstest_pipe_server.cc \
1.63 pipes/pipe_opener_resource.cc pipes/pipe_pager.cc \
1.64 - pipes/pipe_accessor.cc pipes/pipe_paging.cc
1.65 + pipes/pipe_accessor.cc pipes/pipe_paging.cc \
1.66 + tests/dstest_pipe_server.cc
1.67
1.68 PLAIN_SRC_CC_dstest_test_server = \
1.69 $(PLAIN_SRC_CC_common_server) \
1.70 - dstest_test_server.cc \
1.71 - files/file_pager.cc \
1.72 - files/opener_resource.cc files/opener_context_resource.cc \
1.73 - files/test_file_accessor.cc files/test_file_opener.cc
1.74 + $(PLAIN_SRC_CC_common_file_server) \
1.75 + files/test_file_accessor.cc files/test_file_opener.cc \
1.76 + tests/dstest_test_server.cc
1.77
1.78 # Normal definitions.
1.79
1.80 @@ -133,8 +136,7 @@
1.81
1.82 REQUIRES_LIBS = l4re_c-util libipc libstdc++ libsystypes
1.83
1.84 -PRIVATE_INCDIR = $(PKGDIR) \
1.85 - $(PKGDIR)/files $(PKGDIR)/memory \
1.86 +PRIVATE_INCDIR = $(PKGDIR) $(PKGDIR)/files $(PKGDIR)/mapping $(PKGDIR)/memory \
1.87 $(PKGDIR)/pages $(PKGDIR)/pipes \
1.88 $(IDL_BUILD_DIR) $(IDL_EXPORT_DIR)
1.89