diff options
author | gjb <gjb@FreeBSD.org> | 2014-09-26 02:30:47 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2014-09-26 02:30:47 +0000 |
commit | d7f74356449e59ba511e94714ccff7ee2f7219ff (patch) | |
tree | 28a75f09346b1f6fc8d967dc567ff8bd8644ca7e /usr.sbin | |
parent | 8c4f6ee128c206b479ac27824a2f8c5ceede92db (diff) | |
download | FreeBSD-src-d7f74356449e59ba511e94714ccff7ee2f7219ff.zip FreeBSD-src-d7f74356449e59ba511e94714ccff7ee2f7219ff.tar.gz |
Revert r272149, which introduces obscure vestiges from the
r272128 reversal.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile.amd64 | 3 | ||||
-rw-r--r-- | usr.sbin/Makefile.i386 | 3 | ||||
-rw-r--r-- | usr.sbin/hyperv/Makefile | 7 | ||||
-rw-r--r-- | usr.sbin/hyperv/Makefile.inc | 3 | ||||
-rw-r--r-- | usr.sbin/hyperv/tools/Makefile | 13 |
5 files changed, 29 insertions, 0 deletions
diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64 index b821625..2d1a3e8 100644 --- a/usr.sbin/Makefile.amd64 +++ b/usr.sbin/Makefile.amd64 @@ -18,6 +18,9 @@ SUBDIR+= boot0cfg SUBDIR+= btxld .endif SUBDIR+= cpucontrol +.if ${MK_HYPERV} != "no" +SUBDIR+= hyperv +.endif SUBDIR+= kgmon SUBDIR+= lptcontrol SUBDIR+= mount_smbfs diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386 index 7d66f78..de7bb46 100644 --- a/usr.sbin/Makefile.i386 +++ b/usr.sbin/Makefile.i386 @@ -9,6 +9,9 @@ SUBDIR+= asf SUBDIR+= btxld .endif SUBDIR+= cpucontrol +.if ${MK_HYPERV} != "no" +SUBDIR+= hyperv +.endif SUBDIR+= kgmon SUBDIR+= kgzip SUBDIR+= lptcontrol diff --git a/usr.sbin/hyperv/Makefile b/usr.sbin/hyperv/Makefile new file mode 100644 index 0000000..c11b341 --- /dev/null +++ b/usr.sbin/hyperv/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +.include <bsd.own.mk> + +SUBDIR = tools + +.include <bsd.subdir.mk> diff --git a/usr.sbin/hyperv/Makefile.inc b/usr.sbin/hyperv/Makefile.inc new file mode 100644 index 0000000..265f86d --- /dev/null +++ b/usr.sbin/hyperv/Makefile.inc @@ -0,0 +1,3 @@ +# $FreeBSD$ + +.include "../Makefile.inc" diff --git a/usr.sbin/hyperv/tools/Makefile b/usr.sbin/hyperv/tools/Makefile new file mode 100644 index 0000000..3cfc001 --- /dev/null +++ b/usr.sbin/hyperv/tools/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +.include <bsd.own.mk> + +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 + +.include <bsd.prog.mk> |