[src/trunk]: src/sys/rump Always descend into component directories for rumpd...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/45dc5568e943
branches:  trunk
changeset: 811791:45dc5568e943
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Nov 15 16:54:16 2015 +0000

description:
Always descend into component directories for rumpdescribe.

diffstat:

 sys/rump/dev/Makefile.rumpdevcomp   |  11 ++++++-----
 sys/rump/fs/Makefile.rumpfscomp     |   4 ++--
 sys/rump/kern/Makefile.rumpkerncomp |  11 ++++++++---
 sys/rump/net/Makefile.rumpnetcomp   |   6 +++---
 4 files changed, 19 insertions(+), 13 deletions(-)

diffs (90 lines):

diff -r c29cd52253cf -r 45dc5568e943 sys/rump/dev/Makefile.rumpdevcomp
--- a/sys/rump/dev/Makefile.rumpdevcomp Sun Nov 15 14:42:03 2015 +0000
+++ b/sys/rump/dev/Makefile.rumpdevcomp Sun Nov 15 16:54:16 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpdevcomp,v 1.22 2015/11/01 09:03:28 pooka Exp $
+#      $NetBSD: Makefile.rumpdevcomp,v 1.23 2015/11/15 16:54:16 pooka Exp $
 #
 
 RUMPDEVCOMP=   audio bpf cgd disk dm drvctl fss md netsmb              \
@@ -24,7 +24,8 @@
 RUMPDEVLIBS+=lib${var}
 .endfor
 
-# Currently no NetBSD host support.
-#.for var in ${RUMPPCIDEVS}
-#RUMPDEVLIBS+=lib${var}
-#.endfor
+.if make(rumpdescribe)
+.for var in ${RUMPPCIDEVS}
+RUMPDEVLIBS+=lib${var}
+.endfor
+.endif
diff -r c29cd52253cf -r 45dc5568e943 sys/rump/fs/Makefile.rumpfscomp
--- a/sys/rump/fs/Makefile.rumpfscomp   Sun Nov 15 14:42:03 2015 +0000
+++ b/sys/rump/fs/Makefile.rumpfscomp   Sun Nov 15 16:54:16 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpfscomp,v 1.5 2014/04/10 00:09:09 pooka Exp $
+#      $NetBSD: Makefile.rumpfscomp,v 1.6 2015/11/15 16:54:16 pooka Exp $
 #
 
 .include <bsd.own.mk>
@@ -7,7 +7,7 @@
                nfs nilfs ntfs null ptyfs smbfs syspuffs sysvbfs        \
                tmpfs udf umap union v7fs
 
-.if ${MKZFS} != "no"
+.if ${MKZFS} != "no" || make(rumpdescribe)
 RUMPFSCOMP+=   zfs
 .endif
 
diff -r c29cd52253cf -r 45dc5568e943 sys/rump/kern/Makefile.rumpkerncomp
--- a/sys/rump/kern/Makefile.rumpkerncomp       Sun Nov 15 14:42:03 2015 +0000
+++ b/sys/rump/kern/Makefile.rumpkerncomp       Sun Nov 15 16:54:16 2015 +0000
@@ -1,15 +1,20 @@
-#      $NetBSD: Makefile.rumpkerncomp,v 1.11 2015/01/07 22:24:03 pooka Exp $
+#      $NetBSD: Makefile.rumpkerncomp,v 1.12 2015/11/15 16:54:16 pooka Exp $
 #
 
 .include <bsd.own.mk>
 
 RUMPKERNCOMPS= crypto sysproxy tty z
+RUMPSYSEMUS=   sys_cygwin sys_linux sys_sunos
 
-.if ${MKSLJIT} != "no"
+.if make(rumpdescribe)
+RUMPKERNCOMPS+=        ${RUMPSYSEMUS}
+.endif
+
+.if ${MKSLJIT} != "no" || make(rumpdescribe)
 RUMPKERNCOMPS+=        sljit
 .endif
 
-.if ${MKZFS} != "no"
+.if ${MKZFS} != "no" || make(rumpdescribe)
 RUMPKERNCOMPS+=    solaris
 .endif
 
diff -r c29cd52253cf -r 45dc5568e943 sys/rump/net/Makefile.rumpnetcomp
--- a/sys/rump/net/Makefile.rumpnetcomp Sun Nov 15 14:42:03 2015 +0000
+++ b/sys/rump/net/Makefile.rumpnetcomp Sun Nov 15 16:54:16 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpnetcomp,v 1.12 2015/11/04 23:57:06 knakahara Exp $
+#      $NetBSD: Makefile.rumpnetcomp,v 1.13 2015/11/15 16:54:16 pooka Exp $
 #
 
 .include <bsd.own.mk>
@@ -6,11 +6,11 @@
 RUMPNETCOMP=   agr bridge net net80211 netbt netinet netinet6
 RUMPNETCOMP+=  gif netmpls npf local shmif tap
 
-.if ${MKSLJIT} != "no"
+.if ${MKSLJIT} != "no" || make(rumpdescribe)
 RUMPNETCOMP+=  bpfjit
 .endif
 
-.if ${RUMP_VIRTIF:Uyes} == "yes"
+.if ${RUMP_VIRTIF:Uyes} == "yes" || make(rumpdescribe)
 RUMPNETCOMP+=  virtif
 .endif