# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1670632295 -3600
# Node ID 1f1b2b1839cd712a0ff195faae6a67a053957eeb
# Parent  75dbc352935ab72a6013d7314789a6c43781ac98
Updated Makefiles for versions of idl with proper compound interface support.

diff -r 75dbc352935a -r 1f1b2b1839cd libexec/lib/src/Makefile
--- a/libexec/lib/src/Makefile	Thu Dec 08 22:39:38 2022 +0100
+++ b/libexec/lib/src/Makefile	Sat Dec 10 01:31:35 2022 +0100
@@ -13,24 +13,17 @@
 
 include $(IDL_MK_DIR)/idl.mk
 
-# Compound interfaces.
-
-pager_object_NAME		= PagerObject
-pager_object_INTERFACES		= region_mapper system_pager
-
-COMP_INTERFACES_CC		= pager_object
-
-# Individual interfaces.
+# Required interfaces.
 
 CLIENT_INTERFACES_CC		= dataspace mapped_file
 
-SERVER_INTERFACES_CC		= $(call common_interfaces,$(COMP_INTERFACES_CC))
+SERVER_INTERFACES_CC		= pager_object
 
 # Generated and plain source files.
 
 CLIENT_INTERFACES_SRC_CC	= $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC))
 
-SERVER_INTERFACES_SRC_CC	= $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
+SERVER_INTERFACES_SRC_CC	= $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC))
 
 # Normal source files.
 
diff -r 75dbc352935a -r 1f1b2b1839cd libexec/rm/Makefile
--- a/libexec/rm/Makefile	Thu Dec 08 22:39:38 2022 +0100
+++ b/libexec/rm/Makefile	Sat Dec 10 01:31:35 2022 +0100
@@ -23,20 +23,13 @@
 
 include $(IDL_MK_DIR)/idl.mk
 
-# Compound interfaces.
-
-pager_object_NAME		= PagerObject
-pager_object_INTERFACES		= region_mapper system_pager
+# Required interfaces.
 
-COMP_INTERFACES_CC		= pager_object
-
-# Individual interfaces.
-
-SERVER_INTERFACES_CC		= $(call common_interfaces,$(COMP_INTERFACES_CC))
+SERVER_INTERFACES_CC		= pager_object
 
 # Generated and plain source files.
 
-SERVER_INTERFACES_SRC_CC	= $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
+SERVER_INTERFACES_SRC_CC	= $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC))
 
 # Normal source files.
 
diff -r 75dbc352935a -r 1f1b2b1839cd libfsserver/lib/Makefile
--- a/libfsserver/lib/Makefile	Thu Dec 08 22:39:38 2022 +0100
+++ b/libfsserver/lib/Makefile	Sat Dec 10 01:31:35 2022 +0100
@@ -13,36 +13,24 @@
 
 include $(IDL_MK_DIR)/idl.mk
 
-# Compound interfaces.
-
-directory_object_NAME			= DirectoryObject
-directory_object_INTERFACES		= directory notification
-
-filesystem_object_NAME			= FilesystemObject
-filesystem_object_INTERFACES		= filesystem filesystem_factory
-
-mapped_file_object_NAME			= MappedFileObject
-mapped_file_object_INTERFACES		= dataspace file flush mapped_file notification
-
-opener_context_object_NAME		= OpenerContextObject
-opener_context_object_INTERFACES	= dataspace opener_context
-
-pipe_object_NAME			= PipeObject
-pipe_object_INTERFACES			= dataspace flush notification pipe
-
-COMP_INTERFACES_CC			= directory_object filesystem_object mapped_file_object opener_context_object pipe_object
-
-# Individual interfaces.
+# Required interfaces.
 
 CLIENT_INTERFACES_CC			= notifier
 
-SERVER_INTERFACES_CC			= opener pipe_opener $(call common_interfaces,$(COMP_INTERFACES_CC))
+SERVER_INTERFACES_CC			= \
+					directory_object \
+					filesystem_object \
+					mapped_file_object \
+					opener_context_object \
+					pipe_object \
+					opener \
+					pipe_opener \
 
 # Generated and plain source files.
 
 CLIENT_INTERFACES_SRC_CC		= $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC))
 
-SERVER_INTERFACES_SRC_CC		= $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
+SERVER_INTERFACES_SRC_CC		= $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC))
 
 PLAIN_SRC_CC				= \
 					directories/directory_accessor.cc \
diff -r 75dbc352935a -r 1f1b2b1839cd libsystypes/idl/directory_object.idl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libsystypes/idl/directory_object.idl	Sat Dec 10 01:31:35 2022 +0100
@@ -0,0 +1,4 @@
+import "directory.idl";
+import "notification.idl";
+
+interface DirectoryObject composes Directory, Notification;
diff -r 75dbc352935a -r 1f1b2b1839cd libsystypes/idl/filesystem_object.idl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libsystypes/idl/filesystem_object.idl	Sat Dec 10 01:31:35 2022 +0100
@@ -0,0 +1,4 @@
+import "filesystem.idl";
+import "filesystem_factory.idl";
+
+interface FilesystemObject composes Filesystem, FilesystemFactory;
diff -r 75dbc352935a -r 1f1b2b1839cd libsystypes/idl/mapped_file_object.idl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libsystypes/idl/mapped_file_object.idl	Sat Dec 10 01:31:35 2022 +0100
@@ -0,0 +1,7 @@
+import "dataspace.idl";
+import "file.idl";
+import "flush.idl";
+import "mapped_file.idl";
+import "notification.idl";
+
+interface MappedFileObject composes Dataspace, File, Flush, MappedFile, Notification;
diff -r 75dbc352935a -r 1f1b2b1839cd libsystypes/idl/opener_context_object.idl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libsystypes/idl/opener_context_object.idl	Sat Dec 10 01:31:35 2022 +0100
@@ -0,0 +1,4 @@
+import "dataspace.idl";
+import "opener_context.idl";
+
+interface OpenerContextObject composes Dataspace, OpenerContext;
diff -r 75dbc352935a -r 1f1b2b1839cd libsystypes/idl/pager_object.idl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libsystypes/idl/pager_object.idl	Sat Dec 10 01:31:35 2022 +0100
@@ -0,0 +1,4 @@
+import "region_mapper.idl";
+import "system_pager.idl";
+
+interface PagerObject composes RegionMapper, SystemPager;
diff -r 75dbc352935a -r 1f1b2b1839cd libsystypes/idl/pipe_object.idl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libsystypes/idl/pipe_object.idl	Sat Dec 10 01:31:35 2022 +0100
@@ -0,0 +1,6 @@
+import "dataspace.idl";
+import "flush.idl";
+import "notification.idl";
+import "pipe.idl";
+
+interface PipeObject composes Dataspace, Flush, Notification, Pipe;
diff -r 75dbc352935a -r 1f1b2b1839cd tests/Makefile
--- a/tests/Makefile	Thu Dec 08 22:39:38 2022 +0100
+++ b/tests/Makefile	Sat Dec 10 01:31:35 2022 +0100
@@ -30,24 +30,17 @@
 
 include $(IDL_MK_DIR)/idl.mk
 
-# Compound interfaces.
-
-pager_object_NAME		= PagerObject
-pager_object_INTERFACES		= region_mapper system_pager
-
-COMP_INTERFACES_CC		= pager_object
-
-# Individual interfaces.
+# Required interfaces.
 
 CLIENT_INTERFACES_CC		= dataspace
 
-SERVER_INTERFACES_CC		= $(call common_interfaces,$(COMP_INTERFACES_CC))
+SERVER_INTERFACES_CC		= pager_object
 
 # Generated and plain source files.
 
 CLIENT_INTERFACES_SRC_CC	= $(call interfaces_to_client_cc,$(CLIENT_INTERFACES_CC))
 
-SERVER_INTERFACES_SRC_CC	= $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC) $(COMP_INTERFACES_CC))
+SERVER_INTERFACES_SRC_CC	= $(call interfaces_to_server_cc,$(SERVER_INTERFACES_CC))
 
 # Normal source files.