3 files changed, 0 insertions, 35 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index cc445b0befda..93a7e5581ef2 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -58,30 +58,6 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz
 OLD_FILES+=etc/rc.d/powerd
 .endif
 
-.if ${MK_AMD} == no
-OLD_FILES+=etc/amd.map
-OLD_FILES+=etc/newsyslog.conf.d/amd.conf
-OLD_FILES+=etc/rc.d/amd
-OLD_FILES+=usr/bin/pawd
-OLD_FILES+=usr/sbin/amd
-OLD_FILES+=usr/sbin/amq
-OLD_FILES+=usr/sbin/fixmount
-OLD_FILES+=usr/sbin/fsinfo
-OLD_FILES+=usr/sbin/hlfsd
-OLD_FILES+=usr/sbin/mk-amd-map
-OLD_FILES+=usr/sbin/wire-test
-OLD_FILES+=usr/share/examples/etc/amd.map
-OLD_FILES+=usr/share/man/man1/pawd.1.gz
-OLD_FILES+=usr/share/man/man5/amd.conf.5.gz
-OLD_FILES+=usr/share/man/man8/amd.8.gz
-OLD_FILES+=usr/share/man/man8/amq.8.gz
-OLD_FILES+=usr/share/man/man8/fixmount.8.gz
-OLD_FILES+=usr/share/man/man8/fsinfo.8.gz
-OLD_FILES+=usr/share/man/man8/hlfsd.8.gz
-OLD_FILES+=usr/share/man/man8/mk-amd-map.8.gz
-OLD_FILES+=usr/share/man/man8/wire-test.8.gz
-.endif
-
 .if ${MK_APM} == no
 OLD_FILES+=etc/rc.d/apm
 OLD_FILES+=etc/rc.d/apmd
diff --git a/tools/build/options/WITHOUT_AMD b/tools/build/options/WITHOUT_AMD
deleted file mode 100644
index 473d03e890a0..000000000000
--- a/tools/build/options/WITHOUT_AMD
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to not build
-.Xr amd 8 ,
-and related programs.
diff --git a/tools/build/options/WITH_AMD b/tools/build/options/WITH_AMD
deleted file mode 100644
index 7fc0d960bf7b..000000000000
--- a/tools/build/options/WITH_AMD
+++ /dev/null
@@ -1,7 +0,0 @@
-.\" $FreeBSD$
-Set to build the legacy
-.Xr amd 8
-automount daemon and related programs.
-Note that
-.Xr autofs 5
-is the preferred automount technique.