From 3eb22ca4d1e6489ed16f9d78b3e3ca8673bb5fe6 Mon Sep 17 00:00:00 2001
From: Arun Thomas <arun@minix3.org>
Date: Wed, 20 Jul 2011 09:57:08 +0200
Subject: [PATCH] MK option to build only system image programs

---
 drivers/Makefile    | 10 ++++++++--
 servers/Makefile    |  8 +++++++-
 share/mk/bsd.own.mk |  3 +++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/Makefile b/drivers/Makefile
index 7fb2bfc58..9c3e31674 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -3,17 +3,23 @@
 
 .include <bsd.own.mk>
 
+.if ${MKIMAGEONLY} == "yes"
+
 # memory driver must be last for ramdisk image
+SUBDIR=	at_wini bios_wini floppy log tty pci .WAIT ramdisk .WAIT memory
+
+.else
+
 .if ${COMPILER_TYPE} == "gnu"
 SUBDIR = acpi
 .endif
 
+# memory driver must be last for ramdisk image
 SUBDIR+= ahci amddev atl2 at_wini audio bios_wini dec21140A dp8390 dpeth \
 	e1000 filter floppy fxp hello lance log orinoco pci printer \
 	random readclock rtl8139 rtl8169 ti1225 tty \
 	.WAIT ramdisk .WAIT memory
 
-# memory driver must be last for ramdisk image
-IMAGE_SUBDIR=	at_wini bios_wini floppy log tty pci .WAIT ramdisk .WAIT memory
+.endif
 
 .include <bsd.subdir.mk>
diff --git a/servers/Makefile b/servers/Makefile
index 25aaf6493..f5e7140e7 100644
--- a/servers/Makefile
+++ b/servers/Makefile
@@ -3,9 +3,15 @@
 
 .include <bsd.own.mk>
 
+.if ${MKIMAGEONLY} == "yes"
+
+SUBDIR=	ds init mfs pfs pm rs sched vfs vm
+
+.else
+
 SUBDIR=	ds ext2 hgfs inet init ipc is iso9660fs \
 	mfs pfs pm procfs rs sched vfs vm devman
 
-IMAGE_SUBDIR=	ds init mfs pfs pm rs sched vfs vm
+.endif
 
 .include <bsd.subdir.mk>
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 47753cd83..08fe4f3d8 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -770,6 +770,9 @@ _MKVARS.no= \
 	MKPCC MKPCCCMDS \
 	MKSOFTFLOAT MKSTRIPIDENT \
 	MKUNPRIVED MKUPDATE MKX11 MKZFS
+#MINIX-specific vars
+_MKVARS.no+= \
+	MKIMAGEONLY
 .for var in ${_MKVARS.no}
 ${var}?=no
 .endfor
-- 
2.44.0