1.1 --- a/Makefile Sat Mar 27 01:42:25 2021 +0100
1.2 +++ b/Makefile Sat Mar 27 22:12:12 2021 +0100
1.3 @@ -53,22 +53,25 @@
1.4
1.5 PLAIN_SRC_CC_common_server = \
1.6 access_map.cc accessing.cc accessor.cc \
1.7 - flexpage.cc files/file_pager.cc ipc.cc memory.cc \
1.8 + flexpage.cc ipc.cc \
1.9 + memory/memory_incremental.cc memory/memory_preallocated.cc \
1.10 opener_resource.cc opener_context_resource.cc \
1.11 - page_mapper.cc page_queue_partitioned.cc page_queue_shared.cc \
1.12 - pager.cc paging.cc \
1.13 - page_collection.cc pages.cc pages_conserving.cc \
1.14 + page_mapper.cc \
1.15 + page_queue_partitioned.cc page_queue_shared.cc \
1.16 + pager.cc paging.cc pages.cc \
1.17 region.cc resource_server.cc simple_pager.cc
1.18
1.19 PLAIN_SRC_CC_dstest_block_server = \
1.20 $(PLAIN_SRC_CC_common_server) \
1.21 dstest_block_server.cc \
1.22 + files/file_pager.cc \
1.23 files/block_file_accessor.cc files/block_file_opener.cc \
1.24 files/host_file_accessor.cc files/host_file_opener.cc
1.25
1.26 PLAIN_SRC_CC_dstest_host_server = \
1.27 $(PLAIN_SRC_CC_common_server) \
1.28 dstest_host_server.cc \
1.29 + files/file_pager.cc \
1.30 files/host_file_accessor.cc files/host_file_opener.cc
1.31
1.32 PLAIN_SRC_CC_dstest_pipe_server = \
1.33 @@ -80,6 +83,7 @@
1.34 PLAIN_SRC_CC_dstest_test_server = \
1.35 $(PLAIN_SRC_CC_common_server) \
1.36 dstest_test_server.cc \
1.37 + files/file_pager.cc \
1.38 files/test_file_accessor.cc files/test_file_opener.cc
1.39
1.40 # Normal definitions.
1.41 @@ -126,7 +130,7 @@
1.42
1.43 REQUIRES_LIBS = l4re_c-util libipc libstdc++ libsystypes
1.44
1.45 -PRIVATE_INCDIR = $(PKGDIR) $(PKGDIR)/files $(PKGDIR)/pipes \
1.46 +PRIVATE_INCDIR = $(PKGDIR) $(PKGDIR)/files $(PKGDIR)/memory $(PKGDIR)/pipes \
1.47 $(IDL_BUILD_DIR) $(IDL_EXPORT_DIR)
1.48
1.49 include $(L4DIR)/mk/prog.mk