style.Makefile(5).

OK'ed by:	nectar

8 files changed, 52 insertions, 115 deletions

diff --git a/kerberos5/libexec/Makefile.inc b/kerberos5/libexec/Makefile.inc
index 496b56efcc1a..535597e7d2a5 100644
--- a/kerberos5/libexec/Makefile.inc
+++ b/kerberos5/libexec/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 BINDIR=	/usr/libexec
 
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index 74b1c7c4d972..84523cfac15d 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -1,26 +1,15 @@
 # $FreeBSD$
 
 PROG=	hprop
-
-SRCS=	\
-	hprop.c			\
-	mit_dump.c		\
-	v4_dump.c
-
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1
-
-LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
+MAN=	hprop.8
+SRCS=	hprop.c mit_dump.c v4_dump.c
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1
 DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
+LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
-MAN=	hprop.8
-
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/kdc
+.PATH: ${KRB5DIR}/kdc
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index 54a6038e1962..4db38fb4bb1b 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -1,22 +1,15 @@
 # $FreeBSD$
 
 PROG=	hpropd
-
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1	\
+MAN=	hpropd.8
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
 	${LDAPCFLAGS}
-
-LDADD=		-lhdb -lkrb5 -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
-DPADD=		${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
-LDFLAGS=	${LDAPLDFLAGS}
-
-MAN=		hpropd.8
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/kdc
+.PATH: ${KRB5DIR}/kdc
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 5cdd575159c8..73fcb8bd20b7 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -1,27 +1,16 @@
 # $FreeBSD$
 
 PROG=	ipropd-master
-
-SRCS=	\
-	ipropd_master.c		\
-	kadm5_err.h
-
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1	\
-	-I.			\
-	${LDAPCFLAGS}
-
+NOMAN=
+SRCS=	ipropd_master.c kadm5_err.h
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+	-I. ${LDAPCFLAGS}
+DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
 LDFLAGS=${LDAPLDFLAGS}
 
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
-NOMAN=	yes
-
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/lib/kadm5
+.PATH: ${KRB5DIR}/lib/kadm5
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index 6a1dbefc304d..e2dd6866520c 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -1,27 +1,16 @@
 # $FreeBSD$
 
 PROG=	ipropd-slave
-
-SRCS=	\
-	ipropd_slave.c		\
-	kadm5_err.h
-
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1	\
-	-I.			\
-	${LDAPCFLAGS}
-
+NOMAN=
+SRCS=	ipropd_slave.c kadm5_err.h
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+	-I. ${LDAPCFLAGS}
+DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
 LDFLAGS=${LDAPLDFLAGS}
 
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
-NOMAN=	yes
-
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/lib/kadm5
+.PATH: ${KRB5DIR}/lib/kadm5
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index 9eb06246fe4e..d0514a01342c 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -1,26 +1,16 @@
 # $FreeBSD$
 
 PROG=	kadmind
-
-SRCS=	kadmind.c			\
-	server.c			\
-	kadm_conn.c
-
-CFLAGS+=-I${KRB5DIR}/lib/roken		\
-	-I${KRB5DIR}/lib/krb5		\
-	-I${KRB5DIR}/lib/asn1		\
+MAN=	kadmind.8
+SRCS=	kadm_conn.c kadmind.c server.c
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	${LDAPCFLAGS}
-
+DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
 LDFLAGS=${LDAPLDFLAGS}
 
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
-MAN=	kadmind.8
-
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/kadmin
+.PATH: ${KRB5DIR}/kadmin
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 683274299e20..73a1efcbf853 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -1,32 +1,25 @@
 # $FreeBSD$
 
 PROG=	kdc
+MAN=	kdc.8
 
-SRCS=	\
-	524.c			\
-	config.c		\
-	connect.c		\
-	kerberos4.c		\
-	kerberos5.c		\
-	log.c			\
-	main.c			\
+SRCS=	524.c \
+	config.c \
+	connect.c \
+	kerberos4.c \
+	kerberos5.c \
+	log.c \
+	main.c \
 	misc.c
 
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1	\
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	${LDAPCFLAGS}
-
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
 LDFLAGS=${LDAPLDFLAGS}
 
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
-MAN=	kdc.8
-
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/kdc
+.PATH: ${KRB5DIR}/kdc
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 381197c5dbb4..c0e6a1ea1aa1 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -1,20 +1,14 @@
 # $FreeBSD$
 
 PROG=	kpasswdd
-
-CFLAGS+=-I${KRB5DIR}/lib/roken		\
-	${LDAPCFLAGS}
-
+MAN=	kpasswdd.8
+CFLAGS+=-I${KRB5DIR}/lib/roken ${LDAPCFLAGS}
+DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
 LDFLAGS=${LDAPLDFLAGS}
 
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
-MAN=	kpasswdd.8
-
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/kpasswd
+.PATH: ${KRB5DIR}/kpasswd