MK option to build only system image programs

diff --git a/drivers/Makefile b/drivers/Makefile
index 7fb2bfc5863d003045f3e6006d86ea1b5492a116..9c3e31674ed15619da28678ec8d8245d9714cc5b 100644 (file)
--- 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 25aaf6493748b995b6819e493c40b86f03d4d48c..f5e7140e7e7d4776ce02639dba3b244f61296500 100644 (file)
--- 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 47753cd837ae69168e9222a45e216c968b68461d..08fe4f3d8c78c2ace36f679422418ab7eb2c78d3 100644 (file)
--- 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