Adjust for new files added to 6.1.5, and files retired from 6.0.10p1.

Also TCP Wrappers is now supported.
Also tweak the MK_HESIOD.

1 files changed, 10 insertions, 9 deletions

diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index f56650c..61b89e8 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -13,22 +13,22 @@
 PROG=	amd
 MAN=	amd.8
 SRCS=	conf_parse.y conf_tok.l
-SRCS+=	am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c
-SRCS+=	amfs_host.c amfs_inherit.c amfs_link.c amfs_linkx.c amfs_nfsl.c
+SRCS+=	am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_generic.c
+SRCS+=	amfs_host.c amfs_link.c amfs_linkx.c amfs_nfsl.c
 SRCS+=	amfs_nfsx.c amfs_program.c amfs_root.c amfs_toplvl.c
 SRCS+=	amfs_union.c amq_subr.c amq_svc.c autil.c clock.c conf.c
-SRCS+=	get_args.c info_file.c info_ndbm.c info_passwd.c
-SRCS+=	info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c 
-SRCS+=	nfs_subr.c ops_cdfs.c ops_mfs.c ops_nfs.c ops_nfs3.c 
-SRCS+=	ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c 
-SRCS+=	ops_unionfs.c opts.c restart.c rpc_fwd.c sched.c
+SRCS+=	get_args.c info_exec.c info_file.c info_ndbm.c info_passwd.c
+SRCS+=	info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c
+SRCS+=	nfs_subr.c ops_cdfs.c ops_mfs.c ops_nfs.c ops_nfs3.c
+SRCS+=	ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c
+SRCS+=	ops_unionfs.c opts.c readdir.c restart.c rpc_fwd.c sched.c
 SRCS+=	srvr_amfs_auto.c srvr_nfs.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
 	 -I${DESTDIR}/usr/include/rpcsvc
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+DPADD=	${LIBAMU} ${LIBWRAP}
+LDADD=	${LIBAMU} ${LIBWRAP}
 
 CLEANFILES+=	conf_parse.c conf_parse.h conf_tok.c
 
@@ -43,6 +43,7 @@ mount_xdr.c: ${MOUNT_X}
 
 .if ${MK_HESIOD} != "no"
 SRCS+=	info_hesiod.c
+CFLAGS+= -DHAVE_MAP_HESIOD
 .endif
 
 .if ${MK_NIS} != "no"