5 files changed, 37 insertions, 3 deletions

diff --git a/usr.sbin/hyperv/Makefile b/usr.sbin/hyperv/Makefile
index c11b3417c191c..d42817f4a747c 100644
--- a/usr.sbin/hyperv/Makefile
+++ b/usr.sbin/hyperv/Makefile
@@ -2,6 +2,8 @@
 
 .include <bsd.own.mk>
 
-SUBDIR = tools 
+SUBDIR= \
+	tools/kvp \
+	tools/vss
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/hyperv/tools/Makefile b/usr.sbin/hyperv/tools/kvp/Makefile
index 3cfc0013cf591..e1bc47c0011fc 100644
--- a/usr.sbin/hyperv/tools/Makefile
+++ b/usr.sbin/hyperv/tools/kvp/Makefile
@@ -2,12 +2,12 @@
 
 .include <bsd.own.mk>
 
-HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../contrib/hyperv/tools
+HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../../contrib/hyperv/tools
 .PATH: ${HV_KVP_DAEMON_DISTDIR} 
 
 PROG= 	hv_kvp_daemon
 MAN= 	hv_kvp_daemon.8	
 
-CFLAGS+=	-I${.CURDIR}/../../../sys/dev/hyperv/utilities
+CFLAGS+=	-I${.CURDIR}/../../../../sys/dev/hyperv/utilities
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/hyperv/tools/Makefile.depend b/usr.sbin/hyperv/tools/kvp/Makefile.depend
index 54c1f6f1442ea..54c1f6f1442ea 100644
--- a/usr.sbin/hyperv/tools/Makefile.depend
+++ b/usr.sbin/hyperv/tools/kvp/Makefile.depend
diff --git a/usr.sbin/hyperv/tools/vss/Makefile b/usr.sbin/hyperv/tools/vss/Makefile
new file mode 100644
index 0000000000000..c9a2e6a96106d
--- /dev/null
+++ b/usr.sbin/hyperv/tools/vss/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+DIRDEPS = lib/libc
+
+.include <bsd.own.mk>
+
+HV_VSS_DAEMON_DISTDIR?= ${.CURDIR}/../../../../contrib/hyperv/tools
+.PATH: ${HV_VSS_DAEMON_DISTDIR} 
+
+PROG= 	hv_vss_daemon
+MAN= 	hv_vss_daemon.8	
+
+CFLAGS+=	-I${.CURDIR}/../../../../sys/dev/hyperv/utilities
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/hyperv/tools/vss/Makefile.depend b/usr.sbin/hyperv/tools/vss/Makefile.depend
new file mode 100644
index 0000000000000..3646e2e2b1afa
--- /dev/null
+++ b/usr.sbin/hyperv/tools/vss/Makefile.depend
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif