Module Name: src Committed By: pooka Date: Sun Nov 15 16:54:16 UTC 2015
Modified Files: src/sys/rump/dev: Makefile.rumpdevcomp src/sys/rump/fs: Makefile.rumpfscomp src/sys/rump/kern: Makefile.rumpkerncomp src/sys/rump/net: Makefile.rumpnetcomp Log Message: Always descend into component directories for rumpdescribe. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/rump/dev/Makefile.rumpdevcomp cvs rdiff -u -r1.5 -r1.6 src/sys/rump/fs/Makefile.rumpfscomp cvs rdiff -u -r1.11 -r1.12 src/sys/rump/kern/Makefile.rumpkerncomp cvs rdiff -u -r1.12 -r1.13 src/sys/rump/net/Makefile.rumpnetcomp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/rump/dev/Makefile.rumpdevcomp diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.22 src/sys/rump/dev/Makefile.rumpdevcomp:1.23 --- src/sys/rump/dev/Makefile.rumpdevcomp:1.22 Sun Nov 1 09:03:28 2015 +++ src/sys/rump/dev/Makefile.rumpdevcomp Sun Nov 15 16:54:16 2015 @@ -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 @@ RUMPDEVLDADD+=-lrumpdev_${var} 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 Index: src/sys/rump/fs/Makefile.rumpfscomp diff -u src/sys/rump/fs/Makefile.rumpfscomp:1.5 src/sys/rump/fs/Makefile.rumpfscomp:1.6 --- src/sys/rump/fs/Makefile.rumpfscomp:1.5 Thu Apr 10 00:09:09 2014 +++ src/sys/rump/fs/Makefile.rumpfscomp Sun Nov 15 16:54:16 2015 @@ -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 @@ RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs nfs nilfs ntfs null ptyfs smbfs syspuffs sysvbfs \ tmpfs udf umap union v7fs -.if ${MKZFS} != "no" +.if ${MKZFS} != "no" || make(rumpdescribe) RUMPFSCOMP+= zfs .endif Index: src/sys/rump/kern/Makefile.rumpkerncomp diff -u src/sys/rump/kern/Makefile.rumpkerncomp:1.11 src/sys/rump/kern/Makefile.rumpkerncomp:1.12 --- src/sys/rump/kern/Makefile.rumpkerncomp:1.11 Wed Jan 7 22:24:03 2015 +++ src/sys/rump/kern/Makefile.rumpkerncomp Sun Nov 15 16:54:16 2015 @@ -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 Index: src/sys/rump/net/Makefile.rumpnetcomp diff -u src/sys/rump/net/Makefile.rumpnetcomp:1.12 src/sys/rump/net/Makefile.rumpnetcomp:1.13 --- src/sys/rump/net/Makefile.rumpnetcomp:1.12 Wed Nov 4 23:57:06 2015 +++ src/sys/rump/net/Makefile.rumpnetcomp Sun Nov 15 16:54:16 2015 @@ -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