Perform a major cleanup of the usr.sbin Makefiles.

These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.

14 files changed, 92 insertions, 107 deletions

diff --git a/usr.sbin/amd/Makefile b/usr.sbin/amd/Makefile
index 0bf72fd..37e4200 100644
--- a/usr.sbin/amd/Makefile
+++ b/usr.sbin/amd/Makefile
@@ -4,8 +4,8 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
-#
 
-SUBDIR= include libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd scripts wire-test
+SUBDIR= include libamu amd amq doc 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 55290c8..186b508 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -8,16 +8,15 @@
 #	$NetBSD: Makefile.inc,v 1.10 1998/08/08 22:33:27 christos Exp $
 #	Portions derived from amd/libamu/Makefile
 #	$NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
-#
 
-CFLAGS+=	-I. -I${.CURDIR} 
-CFLAGS+=	-I${.CURDIR}/../include
+CFLAGS+= -I. -I${.CURDIR} 
+CFLAGS+= -I${.CURDIR}/../include
 .if exists(${.OBJDIR}/../include)
-CFLAGS+=	-I${.OBJDIR}/../include
+CFLAGS+= -I${.OBJDIR}/../include
 .endif
-CFLAGS+=	-I${.CURDIR}/../../../contrib/amd/include
-CFLAGS+=	-I${.CURDIR}/../../../contrib/amd
-CFLAGS+=	-DHAVE_CONFIG_H
+CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include
+CFLAGS+= -I${.CURDIR}/../../../contrib/amd
+CFLAGS+= -DHAVE_CONFIG_H
 
 .if exists(${.OBJDIR}/../libamu)
 LIBAMUDIR=	${.OBJDIR}/../libamu
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 485ace6..1a42b193 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -6,31 +6,30 @@
 # $FreeBSD$
 #
 
-.PATH:		${.CURDIR}/../../../contrib/amd/amd
-
-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+=		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_nis.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_lofs.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+=		srvr_amfs_auto.c srvr_nfs.c
-
-CFLAGS+=	-I${.CURDIR}/../../../contrib/amd/amd
-
-DPADD=		${LIBAMU} ${LIBRPCSVC}
-LDADD=		${LIBAMU} -lrpcsvc
+.PATH: ${.CURDIR}/../../../contrib/amd/amd
+
+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+=	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_nis.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_lofs.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+=	srvr_amfs_auto.c srvr_nfs.c
+
+CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd
+
+DPADD=	${LIBAMU} ${LIBRPCSVC}
+LDADD=	${LIBAMU} -lrpcsvc
 
 CLEANFILES+=	conf_parse.c conf_parse.h conf_tok.c
 
-conf_tok.o:	conf_parse.h
+conf_tok.o: conf_parse.h
 
 #		These are generated at compile time
 SRCS+=		mount_xdr.c
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 660c432..74fc749 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -6,16 +6,15 @@
 # $FreeBSD$
 #
 
-.PATH:		${.CURDIR}/../../../contrib/amd/amq
+.PATH: ${.CURDIR}/../../../contrib/amd/amq
 
-PROG=		amq
-MAN=		amq.8
+PROG=	amq
+MAN=	amq.8
+SRCS=	amq.c amq_clnt.c amq_xdr.c
 
-SRCS=		amq.c amq_clnt.c amq_xdr.c
+CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
 
-CFLAGS+=	-I${.CURDIR}/../../../contrib/amd/amq
-
-DPADD+=		${LIBAMU}
-LDADD+=		${LIBAMU}
+DPADD=	${LIBAMU}
+LDADD=	${LIBAMU}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/doc/Makefile b/usr.sbin/amd/doc/Makefile
index 0d96d8d..e9c7707 100644
--- a/usr.sbin/amd/doc/Makefile
+++ b/usr.sbin/amd/doc/Makefile
@@ -2,6 +2,8 @@
 
 # $FreeBSD$
 
+.PATH: ${.CURDIR}/../../../contrib/amd/doc
+
 INFO=	am-utils
 
 INFOSECTION=	"AMD Documentation"
@@ -9,6 +11,4 @@ INFOENTRY= 	"* Am-utils: (am-utils).	The Amd automounter suite of utilities"
 
 MAKEINFOFLAGS+=	-I ${.CURDIR}/../../../contrib/amd/doc
 
-.PATH:	${.CURDIR}/../../../contrib/amd/doc
-
 .include <bsd.info.mk>
diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile
index 1730122..7f96a45 100644
--- a/usr.sbin/amd/fixmount/Makefile
+++ b/usr.sbin/amd/fixmount/Makefile
@@ -4,20 +4,18 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
-#
-
-.PATH:		${.CURDIR}/../../../contrib/amd/fixmount \
-		${.CURDIR}/../../../contrib/amd/conf/checkmount
 
-PROG=		fixmount
-MAN=		fixmount.8
+.PATH: ${.CURDIR}/../../../contrib/amd/fixmount \
+       ${.CURDIR}/../../../contrib/amd/conf/checkmount
 
-SRCS=		fixmount.c 
+PROG=	fixmount
+MAN=	fixmount.8
+SRCS=	fixmount.c 
 
-#		These would be links created by the GNU-style configure
-SRCS+=		checkmount_bsd44.c
+#	These would be links created by the GNU-style configure
+SRCS+=	checkmount_bsd44.c
 
-DPADD=		${LIBAMU} ${LIBRPCSVC}
-LDADD=		${LIBAMU} -lrpcsvc
+DPADD=	${LIBAMU} ${LIBRPCSVC}
+LDADD=	${LIBAMU} -lrpcsvc
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
index 6340626..9ae55ad 100644
--- a/usr.sbin/amd/fsinfo/Makefile
+++ b/usr.sbin/amd/fsinfo/Makefile
@@ -4,21 +4,19 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
-#
-
-.PATH:		${.CURDIR}/../../../contrib/amd/fsinfo
 
-PROG=		fsinfo
-MAN=		fsinfo.8
+.PATH: ${.CURDIR}/../../../contrib/amd/fsinfo
 
-SRCS=		fsi_gram.y fsi_lex.l
-SRCS+=		fsi_analyze.c fsi_dict.c fsi_util.c fsinfo.c wr_atab.c 
-SRCS+=		wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c
+PROG=	fsinfo
+MAN=	fsinfo.8
+SRCS=	fsi_gram.y fsi_lex.l
+SRCS+=	fsi_analyze.c fsi_dict.c fsi_util.c fsinfo.c wr_atab.c 
+SRCS+=	wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c
 
-CFLAGS+=	-I${.CURDIR}/../../../contrib/amd/fsinfo
+CFLAGS+= -I${.CURDIR}/../../../contrib/amd/fsinfo
 
 CLEANFILES+=	fsi_gram.c fsi_gram.h fsi_lex.c
 
-fsi_lex.o:	fsi_gram.h
+fsi_lex.o: fsi_gram.h
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile
index 93606ab..b2c9447 100644
--- a/usr.sbin/amd/hlfsd/Makefile
+++ b/usr.sbin/amd/hlfsd/Makefile
@@ -4,18 +4,16 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
-#
-
-.PATH:		${.CURDIR}/../../../contrib/amd/hlfsd
 
-PROG=		hlfsd
-MAN=		hlfsd.8
+.PATH: ${.CURDIR}/../../../contrib/amd/hlfsd
 
-SRCS=		hlfsd.c homedir.c nfs_prot_svc.c stubs.c
+PROG=	hlfsd
+MAN=	hlfsd.8
+SRCS=	hlfsd.c homedir.c nfs_prot_svc.c stubs.c
 
-CFLAGS+=	-I${.CURDIR}/../../../contrib/amd/hlfsd
+CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd
 
-DPADD=		${LIBAMU} ${LIBRPCSVC}
-LDADD=		${LIBAMU} -lrpcsvc
+DPADD=	${LIBAMU} ${LIBRPCSVC}
+LDADD=	${LIBAMU} -lrpcsvc
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile
index 4816e98..d3c77d1 100644
--- a/usr.sbin/amd/include/Makefile
+++ b/usr.sbin/amd/include/Makefile
@@ -6,9 +6,8 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998.
 #	Portions derived from amd/libamu/Makefile
 #	$NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
-#
 
-SRCS=		config_local.h mount.h nfs_prot.h
+SRCS=	config_local.h mount.h nfs_prot.h
 CLEANFILES=	${SRCS}
 
 all: ${SRCS}
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index ae02565..b2738ac 100644
--- a/usr.sbin/amd/libamu/Makefile
+++ b/usr.sbin/amd/libamu/Makefile
@@ -5,27 +5,25 @@
 #
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../../contrib/amd/libamu \
-		${.CURDIR}/../../../contrib/amd/conf/transp \
-		${.CURDIR}/../../../contrib/amd/conf/mtab \
-		${.CURDIR}/../../../contrib/amd/conf/umount
+.PATH: ${.CURDIR}/../../../contrib/amd/libamu \
+       ${.CURDIR}/../../../contrib/amd/conf/transp \
+       ${.CURDIR}/../../../contrib/amd/conf/mtab \
+       ${.CURDIR}/../../../contrib/amd/conf/umount
 
-LIB=		amu
+LIB=	amu
+NOMAN=	noman
+SRCS=	hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \
+	util.c wire.c xutil.c
 
-SRCS=		hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \
-		util.c wire.c xutil.c
-
-#		These would be links created by the GNU-style configure
-SRCS+=		transp_sockets.c mtab_bsd.c umount_bsd44.c
-
-CFLAGS+=	-I${.CURDIR}/../../../contrib/amd/libamu
-
-NOMAN=		noman
+#	These would be links created by the GNU-style configure
+SRCS+=	transp_sockets.c mtab_bsd.c umount_bsd44.c
 
 #		Generated at compile time (replaces supplied xdr_func.c)
 SRCS+=		nfs_prot_x.c
 CLEANFILES+=	nfs_prot_x.c
 
+CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu
+
 nfs_prot_x.c: ${NFS_PROT_X}
 	${RPCCOM} -c -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET}
 
diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile
index 66efcf5..ff792bd 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile
+++ b/usr.sbin/amd/mk-amd-map/Makefile
@@ -4,11 +4,10 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
-#
 
-.PATH:		${.CURDIR}/../../../contrib/amd/mk-amd-map
+.PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map
 
-PROG=		mk-amd-map
-MAN=		mk-amd-map.8
+PROG=	mk-amd-map
+MAN=	mk-amd-map.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile
index b4fd43e..c6bb1cc 100644
--- a/usr.sbin/amd/pawd/Makefile
+++ b/usr.sbin/amd/pawd/Makefile
@@ -4,18 +4,17 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
-#
 
-.PATH:		${.CURDIR}/../../../contrib/amd/amq
+.PATH: ${.CURDIR}/../../../contrib/amd/amq
 
-BINDIR=		/usr/bin
+BINDIR=	/usr/bin
 
-PROG=		pawd
-SRCS=		pawd.c amq_clnt.c amq_xdr.c
+PROG=	pawd
+SRCS=	pawd.c amq_clnt.c amq_xdr.c
 
-CFLAGS+=	-I${.CURDIR}/../../../contrib/amd/amq
+CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
 
-DPADD+=		${LIBAMU}
-LDADD+=		${LIBAMU}
+DPADD=	${LIBAMU}
+LDADD=	${LIBAMU}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/scripts/Makefile b/usr.sbin/amd/scripts/Makefile
index 4c069d7..822b951 100644
--- a/usr.sbin/amd/scripts/Makefile
+++ b/usr.sbin/amd/scripts/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../../contrib/amd/scripts
+.PATH: ${.CURDIR}/../../../contrib/amd/scripts
 
-MAN=		amd.conf.5
+MAN=	amd.conf.5
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile
index 61734d7..a07e690 100644
--- a/usr.sbin/amd/wire-test/Makefile
+++ b/usr.sbin/amd/wire-test/Makefile
@@ -4,14 +4,13 @@
 # 	This file is under a "BSD" copyright (c) by David O'Brien 1998
 #
 # $FreeBSD$
-#
 
-.PATH:		${.CURDIR}/../../../contrib/amd/wire-test
+.PATH: ${.CURDIR}/../../../contrib/amd/wire-test
 
-PROG=		wire-test
-MAN=		wire-test.8
+PROG=	wire-test
+MAN=	wire-test.8
 
-DPADD+=		${LIBAMU}
-LDADD+=		${LIBAMU}
+DPADD=	${LIBAMU}
+LDADD=	${LIBAMU}
 
 .include <bsd.prog.mk>