1.1 --- a/Makefile Thu Apr 01 00:57:43 2021 +0200
1.2 +++ b/Makefile Fri Apr 02 01:27:50 2021 +0200
1.3 @@ -43,21 +43,19 @@
1.4
1.5 COMMON_SRC_CC = memory/memory_utils.cc
1.6
1.7 -PLAIN_SRC_CC_dstest_block_client = tests/dstest_block_client.cc file.cc
1.8 +PLAIN_SRC_CC_dstest_block_client = tests/dstest_block_client.cc client/file.cc
1.9
1.10 -PLAIN_SRC_CC_dstest_host_client = tests/dstest_host_client.cc file.cc
1.11 +PLAIN_SRC_CC_dstest_host_client = tests/dstest_host_client.cc client/file.cc
1.12
1.13 -PLAIN_SRC_CC_dstest_pipe_client = tests/dstest_pipe_client.cc file.cc
1.14 +PLAIN_SRC_CC_dstest_pipe_client = tests/dstest_pipe_client.cc client/file.cc
1.15
1.16 -PLAIN_SRC_CC_dstest_test_client = tests/dstest_test_client.cc file.cc
1.17 +PLAIN_SRC_CC_dstest_test_client = tests/dstest_test_client.cc client/file.cc
1.18
1.19 PLAIN_SRC_CC_common_server = \
1.20 - accessor.cc \
1.21 - ipc.cc \
1.22 - mapping/access_map.cc mapping/flexpage.cc mapping/page_mapper.cc \
1.23 - memory/memory_incremental.cc memory/memory_preallocated.cc \
1.24 - memory/region.cc \
1.25 - pager.cc \
1.26 + generic/accessor.cc generic/pager.cc \
1.27 + mapping/access_map.cc mapping/flexpage.cc mapping/ipc.cc \
1.28 + memory/memory_incremental.cc mapping/page_mapper.cc \
1.29 + memory/memory_preallocated.cc memory/region.cc \
1.30 pages/page_queue.cc pages/page_queue_partitioned.cc \
1.31 pages/page_queue_shared.cc pages/pages.cc \
1.32 resource_server.cc
1.33 @@ -65,7 +63,7 @@
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 + generic/simple_pager.cc
1.39
1.40 PLAIN_SRC_CC_dstest_block_server = \
1.41 $(PLAIN_SRC_CC_common_server) \
1.42 @@ -136,7 +134,9 @@
1.43
1.44 REQUIRES_LIBS = l4re_c-util libipc libstdc++ libsystypes
1.45
1.46 -PRIVATE_INCDIR = $(PKGDIR) $(PKGDIR)/files $(PKGDIR)/mapping $(PKGDIR)/memory \
1.47 +PRIVATE_INCDIR = $(PKGDIR) $(PKGDIR)/client \
1.48 + $(PKGDIR)/files $(PKGDIR)/generic \
1.49 + $(PKGDIR)/mapping $(PKGDIR)/memory \
1.50 $(PKGDIR)/pages $(PKGDIR)/pipes \
1.51 $(IDL_BUILD_DIR) $(IDL_EXPORT_DIR)
1.52