summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2014-09-26 03:03:58 +0000
committergjb <gjb@FreeBSD.org>2014-09-26 03:03:58 +0000
commit91dd3107b120da0b78ee5edda663e91a6f9e5a79 (patch)
tree42087c96251fd97a010878503dc6d8dea801c8a5 /usr.sbin
parentd7f74356449e59ba511e94714ccff7ee2f7219ff (diff)
downloadFreeBSD-src-91dd3107b120da0b78ee5edda663e91a6f9e5a79.zip
FreeBSD-src-91dd3107b120da0b78ee5edda663e91a6f9e5a79.tar.gz
Properly revert r272128.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/Makefile.amd643
-rw-r--r--usr.sbin/Makefile.i3863
-rw-r--r--usr.sbin/hyperv/Makefile7
-rw-r--r--usr.sbin/hyperv/Makefile.inc3
-rw-r--r--usr.sbin/hyperv/tools/Makefile13
5 files changed, 0 insertions, 29 deletions
diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64
index 2d1a3e8..b821625 100644
--- a/usr.sbin/Makefile.amd64
+++ b/usr.sbin/Makefile.amd64
@@ -18,9 +18,6 @@ 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 de7bb46..7d66f78 100644
--- a/usr.sbin/Makefile.i386
+++ b/usr.sbin/Makefile.i386
@@ -9,9 +9,6 @@ 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
deleted file mode 100644
index c11b341..0000000
--- a/usr.sbin/hyperv/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $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
deleted file mode 100644
index 265f86d..0000000
--- a/usr.sbin/hyperv/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-.include "../Makefile.inc"
diff --git a/usr.sbin/hyperv/tools/Makefile b/usr.sbin/hyperv/tools/Makefile
deleted file mode 100644
index 3cfc001..0000000
--- a/usr.sbin/hyperv/tools/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $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>
OpenPOWER on IntegriCloud