Merge sync of head

15 files changed, 12 insertions, 43 deletions

diff --git a/usr.sbin/amd/Makefile b/usr.sbin/amd/Makefile
index 37e42005884c..2255f1447ce2 100644
--- a/usr.sbin/amd/Makefile
+++ b/usr.sbin/amd/Makefile
@@ -5,7 +5,7 @@
 #
 # $FreeBSD$
 
-SUBDIR= include libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd \
+SUBDIR= include libamu amd amq fixmount fsinfo hlfsd mk-amd-map pawd \
 	scripts wire-test
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index e4425f52a2c5..8c397cfcc958 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -29,13 +29,6 @@ CFLAGS+= -DYES_HESIOD
 
 CFLAGS+= -DHOST_CPU=\"${MACHINE_CPUARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\"
 
-.if exists(${.OBJDIR}/../libamu)
-LIBAMUDIR=	${.OBJDIR}/../libamu
-.else
-LIBAMUDIR=	${.CURDIR}/../libamu
-.endif
-LIBAMU=		${LIBAMUDIR}/libamu.a
-
 RPCCOM=		RPCGEN_CPP=${CPP:Q} rpcgen
 MOUNT_X=	${DESTDIR}/usr/include/rpcsvc/mount.x
 NFS_PROT_X=	${DESTDIR}/usr/include/rpcsvc/nfs_prot.x
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 1fc41bfe20d0..602c9411eb63 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -27,8 +27,7 @@ SRCS+=	srvr_amfs_auto.c srvr_nfs.c
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
 	 -I${DESTDIR}/usr/include/rpcsvc
 
-DPADD=	${LIBAMU} ${LIBWRAP}
-LDADD=	${LIBAMU} -lwrap
+LIBADD=	amu wrap
 
 CLEANFILES+=	conf_parse.c conf_parse.h conf_tok.c
 
diff --git a/usr.sbin/amd/amd/Makefile.depend b/usr.sbin/amd/amd/Makefile.depend
index bdfb4b3e07b1..507b7adafbfb 100644
--- a/usr.sbin/amd/amd/Makefile.depend
+++ b/usr.sbin/amd/amd/Makefile.depend
@@ -14,6 +14,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libwrap \
+	usr.bin/yacc.host \
 	usr.sbin/amd/include \
 	usr.sbin/amd/libamu \
 
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 74fc7492f524..968ae4c7b044 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -14,7 +14,6 @@ SRCS=	amq.c amq_clnt.c amq_xdr.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/doc/Makefile b/usr.sbin/amd/doc/Makefile
deleted file mode 100644
index e9c77073b290..000000000000
--- a/usr.sbin/amd/doc/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
-
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../contrib/amd/doc
-
-INFO=	am-utils
-
-INFOSECTION=	"AMD Documentation"
-INFOENTRY= 	"* Am-utils: (am-utils).	The Amd automounter suite of utilities"
-
-MAKEINFOFLAGS+=	-I ${.CURDIR}/../../../contrib/amd/doc
-
-.include <bsd.info.mk>
diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile
index 7f96a456dfe4..8137ffb3fdb7 100644
--- a/usr.sbin/amd/fixmount/Makefile
+++ b/usr.sbin/amd/fixmount/Makefile
@@ -10,12 +10,11 @@
 
 PROG=	fixmount
 MAN=	fixmount.8
-SRCS=	fixmount.c 
+SRCS=	fixmount.c
 
 #	These would be links created by the GNU-style configure
 SRCS+=	checkmount_bsd44.c
 
-DPADD=	${LIBAMU} ${LIBRPCSVC}
-LDADD=	${LIBAMU} -lrpcsvc
+LIBADD+=	amu rpcsvc
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
index 1695a469f980..a059da690e43 100644
--- a/usr.sbin/amd/fsinfo/Makefile
+++ b/usr.sbin/amd/fsinfo/Makefile
@@ -15,8 +15,7 @@ SRCS+=	wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/fsinfo
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 CLEANFILES+=	fsi_gram.c fsi_gram.h fsi_lex.c
 
diff --git a/usr.sbin/amd/fsinfo/Makefile.depend b/usr.sbin/amd/fsinfo/Makefile.depend
index bec1372b5c6a..d78eb4fe56ef 100644
--- a/usr.sbin/amd/fsinfo/Makefile.depend
+++ b/usr.sbin/amd/fsinfo/Makefile.depend
@@ -14,6 +14,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libwrap \
+	usr.bin/yacc.host \
 	usr.sbin/amd/include \
 	usr.sbin/amd/libamu \
 
diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile
index 5b863dd5adcd..96d05c4f17ff 100644
--- a/usr.sbin/amd/hlfsd/Makefile
+++ b/usr.sbin/amd/hlfsd/Makefile
@@ -13,7 +13,6 @@ SRCS=	hlfsd.c homedir.c nfs_prot_svc.c stubs.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/include/Makefile.depend b/usr.sbin/amd/include/Makefile.depend
index 18f420a95592..57b7e10c3d71 100644
--- a/usr.sbin/amd/include/Makefile.depend
+++ b/usr.sbin/amd/include/Makefile.depend
@@ -3,7 +3,6 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
-	bin/cat.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index 5817a460a8fb..cffb82ad71f3 100644
--- a/usr.sbin/amd/include/config.h
+++ b/usr.sbin/amd/include/config.h
@@ -668,9 +668,6 @@
 /* Define to 1 if you have the <net/if.h> header file. */
 #define HAVE_NET_IF_H 1
 
-/* Define to 1 if you have the <net/if_var.h> header file. */
-#define HAVE_NET_IF_VAR_H 1
-
 /* Define to 1 if you have the <net/route.h> header file. */
 #define HAVE_NET_ROUTE_H 1
 
diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile
index 57fd6a5f0bdc..417ea2a85cf1 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile
+++ b/usr.sbin/amd/mk-amd-map/Makefile
@@ -10,7 +10,6 @@
 PROG=	mk-amd-map
 MAN=	mk-amd-map.8
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile
index c6bb1cc37a0b..2870ab4cd833 100644
--- a/usr.sbin/amd/pawd/Makefile
+++ b/usr.sbin/amd/pawd/Makefile
@@ -14,7 +14,6 @@ SRCS=	pawd.c amq_clnt.c amq_xdr.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile
index a07e6902fe76..edde2eb67d5b 100644
--- a/usr.sbin/amd/wire-test/Makefile
+++ b/usr.sbin/amd/wire-test/Makefile
@@ -10,7 +10,6 @@
 PROG=	wire-test
 MAN=	wire-test.8
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 .include <bsd.prog.mk>