1.1 --- a/libexec/lib/src/Makefile Thu Dec 08 22:39:38 2022 +0100
1.2 +++ b/libexec/lib/src/Makefile Sat Dec 10 01:31:35 2022 +0100
1.3 @@ -13,24 +13,17 @@
1.4
1.5 include $(IDL_MK_DIR)/idl.mk
1.6
1.7 -# Compound interfaces.
1.8 -
1.9 -pager_object_NAME = PagerObject
1.10 -pager_object_INTERFACES = region_mapper system_pager
1.11 -
1.12 -COMP_INTERFACES_CC = pager_object
1.13 -
1.14 -# Individual interfaces.
1.15 +# Required interfaces.
1.16
1.17 CLIENT_INTERFACES_CC = dataspace mapped_file
1.18
1.19 -SERVER_INTERFACES_CC = $(call common_interfaces,$(COMP_INTERFACES_CC))
1.20 +SERVER_INTERFACES_CC = pager_object
1.21
1.22 # Generated and plain source files.
1.23
1.24 CLIENT_INTERFACES_SRC_CC = $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC))
1.25
1.26 -SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
1.27 +SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC))
1.28
1.29 # Normal source files.
1.30
2.1 --- a/libexec/rm/Makefile Thu Dec 08 22:39:38 2022 +0100
2.2 +++ b/libexec/rm/Makefile Sat Dec 10 01:31:35 2022 +0100
2.3 @@ -23,20 +23,13 @@
2.4
2.5 include $(IDL_MK_DIR)/idl.mk
2.6
2.7 -# Compound interfaces.
2.8 -
2.9 -pager_object_NAME = PagerObject
2.10 -pager_object_INTERFACES = region_mapper system_pager
2.11 +# Required interfaces.
2.12
2.13 -COMP_INTERFACES_CC = pager_object
2.14 -
2.15 -# Individual interfaces.
2.16 -
2.17 -SERVER_INTERFACES_CC = $(call common_interfaces,$(COMP_INTERFACES_CC))
2.18 +SERVER_INTERFACES_CC = pager_object
2.19
2.20 # Generated and plain source files.
2.21
2.22 -SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
2.23 +SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC))
2.24
2.25 # Normal source files.
2.26
3.1 --- a/libfsserver/lib/Makefile Thu Dec 08 22:39:38 2022 +0100
3.2 +++ b/libfsserver/lib/Makefile Sat Dec 10 01:31:35 2022 +0100
3.3 @@ -13,36 +13,24 @@
3.4
3.5 include $(IDL_MK_DIR)/idl.mk
3.6
3.7 -# Compound interfaces.
3.8 -
3.9 -directory_object_NAME = DirectoryObject
3.10 -directory_object_INTERFACES = directory notification
3.11 -
3.12 -filesystem_object_NAME = FilesystemObject
3.13 -filesystem_object_INTERFACES = filesystem filesystem_factory
3.14 -
3.15 -mapped_file_object_NAME = MappedFileObject
3.16 -mapped_file_object_INTERFACES = dataspace file flush mapped_file notification
3.17 -
3.18 -opener_context_object_NAME = OpenerContextObject
3.19 -opener_context_object_INTERFACES = dataspace opener_context
3.20 -
3.21 -pipe_object_NAME = PipeObject
3.22 -pipe_object_INTERFACES = dataspace flush notification pipe
3.23 -
3.24 -COMP_INTERFACES_CC = directory_object filesystem_object mapped_file_object opener_context_object pipe_object
3.25 -
3.26 -# Individual interfaces.
3.27 +# Required interfaces.
3.28
3.29 CLIENT_INTERFACES_CC = notifier
3.30
3.31 -SERVER_INTERFACES_CC = opener pipe_opener $(call common_interfaces,$(COMP_INTERFACES_CC))
3.32 +SERVER_INTERFACES_CC = \
3.33 + directory_object \
3.34 + filesystem_object \
3.35 + mapped_file_object \
3.36 + opener_context_object \
3.37 + pipe_object \
3.38 + opener \
3.39 + pipe_opener \
3.40
3.41 # Generated and plain source files.
3.42
3.43 CLIENT_INTERFACES_SRC_CC = $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC))
3.44
3.45 -SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
3.46 +SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC))
3.47
3.48 PLAIN_SRC_CC = \
3.49 directories/directory_accessor.cc \
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/libsystypes/idl/directory_object.idl Sat Dec 10 01:31:35 2022 +0100
4.3 @@ -0,0 +1,4 @@
4.4 +import "directory.idl";
4.5 +import "notification.idl";
4.6 +
4.7 +interface DirectoryObject composes Directory, Notification;
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/libsystypes/idl/filesystem_object.idl Sat Dec 10 01:31:35 2022 +0100
5.3 @@ -0,0 +1,4 @@
5.4 +import "filesystem.idl";
5.5 +import "filesystem_factory.idl";
5.6 +
5.7 +interface FilesystemObject composes Filesystem, FilesystemFactory;
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/libsystypes/idl/mapped_file_object.idl Sat Dec 10 01:31:35 2022 +0100
6.3 @@ -0,0 +1,7 @@
6.4 +import "dataspace.idl";
6.5 +import "file.idl";
6.6 +import "flush.idl";
6.7 +import "mapped_file.idl";
6.8 +import "notification.idl";
6.9 +
6.10 +interface MappedFileObject composes Dataspace, File, Flush, MappedFile, Notification;
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/libsystypes/idl/opener_context_object.idl Sat Dec 10 01:31:35 2022 +0100
7.3 @@ -0,0 +1,4 @@
7.4 +import "dataspace.idl";
7.5 +import "opener_context.idl";
7.6 +
7.7 +interface OpenerContextObject composes Dataspace, OpenerContext;
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/libsystypes/idl/pager_object.idl Sat Dec 10 01:31:35 2022 +0100
8.3 @@ -0,0 +1,4 @@
8.4 +import "region_mapper.idl";
8.5 +import "system_pager.idl";
8.6 +
8.7 +interface PagerObject composes RegionMapper, SystemPager;
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/libsystypes/idl/pipe_object.idl Sat Dec 10 01:31:35 2022 +0100
9.3 @@ -0,0 +1,6 @@
9.4 +import "dataspace.idl";
9.5 +import "flush.idl";
9.6 +import "notification.idl";
9.7 +import "pipe.idl";
9.8 +
9.9 +interface PipeObject composes Dataspace, Flush, Notification, Pipe;
10.1 --- a/tests/Makefile Thu Dec 08 22:39:38 2022 +0100
10.2 +++ b/tests/Makefile Sat Dec 10 01:31:35 2022 +0100
10.3 @@ -30,24 +30,17 @@
10.4
10.5 include $(IDL_MK_DIR)/idl.mk
10.6
10.7 -# Compound interfaces.
10.8 -
10.9 -pager_object_NAME = PagerObject
10.10 -pager_object_INTERFACES = region_mapper system_pager
10.11 -
10.12 -COMP_INTERFACES_CC = pager_object
10.13 -
10.14 -# Individual interfaces.
10.15 +# Required interfaces.
10.16
10.17 CLIENT_INTERFACES_CC = dataspace
10.18
10.19 -SERVER_INTERFACES_CC = $(call common_interfaces,$(COMP_INTERFACES_CC))
10.20 +SERVER_INTERFACES_CC = pager_object
10.21
10.22 # Generated and plain source files.
10.23
10.24 CLIENT_INTERFACES_SRC_CC = $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC))
10.25
10.26 -SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
10.27 +SERVER_INTERFACES_SRC_CC = $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC))
10.28
10.29 # Normal source files.
10.30