summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mach/Machrules2
-rw-r--r--mach/Makefile4
2 files changed, 5 insertions, 1 deletions
diff --git a/mach/Machrules b/mach/Machrules
index cd2545b784..a415ea6e8b 100644
--- a/mach/Machrules
+++ b/mach/Machrules
@@ -145,6 +145,7 @@ $(objpfx)%_server.c $(objpfx)%_server.h:
# To get header files that declare both the straight and __ functions,
# we generate two files and paste them together.
+$(objpfx)%_server.uh:; $(mig.uh)
$(objpfx)%.uh:; $(mig.uh)
define mig.uh
$(make-target-directory)
@@ -152,6 +153,7 @@ $(include-%.defs) | \
$(MIG) - /dev/null $(MIGFLAGS) \
-header $@ -server /dev/null -user /dev/null
endef
+$(objpfx)%_server.__h:; $(mig.__h)
$(objpfx)%.__h:; $(mig.__h)
define mig.__h
$(make-target-directory)
diff --git a/mach/Makefile b/mach/Makefile
index bf3816485d..e15e2f5c8e 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -47,7 +47,9 @@ user-interfaces := $(addprefix mach/,mach_interface mach_port mach_host \
$(addprefix device/,device device_request)
# We produce mach_interface.h from mach.defs because there is already a
# <mach/mach.h> that is not the interface header (thanks CMU).
-mach_interface.defs = mach.defs
+mach/mach_interface.defs = mach/mach.defs
+# Similarly for memory_object_user vs. memory_object
+mach/memory_object_user.defs = mach/memory_object.defs
server-interfaces := mach/exc
tests := hello
# It is important that we do not use the wildcard function to expand