Fix some dependencies and in the meantime indent all the loops in the

Makefile.inc file to make it more readable.
Also add missing files to CLEANFILES so that make clean removes all the
generated files.

with help from espie@, thanks!

5 files changed, 57 insertions, 59 deletions

diff --git a/kerberosV/Makefile.inc b/kerberosV/Makefile.inc
index dbe986e84a4..fdf8c083a22 100644
--- a/kerberosV/Makefile.inc
+++ b/kerberosV/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.16 2013/06/21 14:12:26 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.17 2013/06/21 17:02:20 robert Exp $
 
 KRB5DIR=	${.CURDIR}/../../../kerberosV/src
 
@@ -24,14 +24,14 @@ ETSRCS=	\
 	${KRB5DIR}/lib/ntlm/ntlm_err.et
 
 .for ET in ${ETSRCS}
-.for _ET in ${ET:T:R}
-.if ${SRCS:M${_ET}.[ch]} != ""
+.  for _ET in ${ET:T:R}
+.    if ${SRCS:M${_ET}.[ch]} != ""
 .ORDER: ${_ET}.c ${_ET}.h
 ${_ET}.c ${_ET}.h: ${ET}
 	${COMPILE_ET} ${.ALLSRC}
 CLEANFILES+=	${_ET}.h ${_ET}.c
-.endif
-.endfor
+.    endif
+.  endfor
 .endfor
 
 .endif # defined(SRCS)
@@ -46,8 +46,8 @@ INCLUDEDIR?=	/usr/include/kerberosV
 INCSDIR?=	${INCLUDEDIR}
 
 .if !target(includes)
-.for group in ${INCSGROUPS}
-.if defined(${group}) && !empty(${group})
+.  for group in ${INCSGROUPS}
+.    if defined(${group}) && !empty(${group})
 
 ${group}OWN?=	${BINOWN}
 ${group}GRP?=	${BINGRP}
@@ -55,51 +55,48 @@ ${group}MODE?=	${BINMODE}
 ${group}DIR?=	/usr/include
 
 _${group}INCS=
-.for header in ${${group}}
-.if defined(${group}OWN_${header:T}) || defined(${group}GRP_${header:T}) || \
+.      for header in ${${group}}
+.        if defined(${group}OWN_${header:T}) || defined(${group}GRP_${header:T}) || \
             defined(${group}MODE_${header:T}) || defined(${group}DIR_${header:T}) || \
             defined(${group}NAME_${header:T})
-${group}OWN_${header:T}?=	${${group}OWN}
-${group}GRP_${header:T}?=	${${group}GRP}
-${group}MODE_${header:T}?=	${${group}MODE}
-${group}DIR_${header:T}?=	${${group}DIR}
-.if defined(${group}NAME)
-${group}NAME_${header:T}?=	${${group}NAME}
-.else
-${group}NAME_${header:T}?=	${header:T}
-.endif
+${group}OWN_${header:T} ?=	${${group}OWN}
+${group}GRP_${header:T} ?=	${${group}GRP}
+${group}MODE_${header:T} ?=	${${group}MODE}
+${group}DIR_${header:T} ?=	${${group}DIR}
+.          if defined(${group}NAME)
+${group}NAME_${header:T} ?=	${${group}NAME}
+.          else
+${group}NAME_${header:T} ?=	${header:T}
+.          endif
 includes: _${group}INS_${header:T}
 _${group}INS_${header:T}: ${header}
-.if !exists(${DESTDIR}${${group}DIR_${.ALLSRC:T}})
-	${INSTALL} -d -o root -g bin -m 755 \
+	test -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}) || \
+	    ${INSTALL} -d -o root -g bin -m 755 \
 		${DESTDIR}${${group}DIR_${.ALLSRC:T}}
-.endif
 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
 	    ${.ALLSRC} \
 	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-.else
+.        else
 _${group}INCS+= ${header}
-.endif
-.endfor
-.if !empty(_${group}INCS)
+.        endif
+.      endfor
+.      if !empty(_${group}INCS)
 includes: _${group}INS
 _${group}INS: ${_${group}INCS}
-.if !exists(${DESTDIR}${${group}DIR})
-	${INSTALL} -d -o root -g bin -m 755 \
+	test -d ${DESTDIR}${${group}DIR} || \
+	    ${INSTALL} -d -o root -g bin -m 755 \
 		${DESTDIR}${${group}DIR}
-.endif
-.if defined(${group}NAME)
+.        if defined(${group}NAME)
 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
-.else
+.        else
 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/
-.endif
-.endif
-
-.endif # defined(${group}) && !empty(${group})
-.endfor
+.        endif
+.      endif
+.    endif # defined(${group}) && !empty(${group})
+.  endfor
 .endif
 
 .include <bsd.own.mk>
diff --git a/kerberosV/usr.bin/kcc/Makefile b/kerberosV/usr.bin/kcc/Makefile
index 7ce860e7630..7181a0939aa 100644
--- a/kerberosV/usr.bin/kcc/Makefile
+++ b/kerberosV/usr.bin/kcc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2013/06/21 13:36:31 robert Exp $
+# $OpenBSD: Makefile,v 1.4 2013/06/21 17:02:20 robert Exp $
 
 PROG=	kcc
 MAN=	klist.1
@@ -17,12 +17,12 @@ SRCS=	kcc.c \
 	kswitch.c \
 	copy_cred_cache.c
 
-kcc-commands.h: kcc-commands.in
+CLEANFILES+=	kcc-commands.[ch]*
+
+kcc-commands.h kcc-commands.c: kcc-commands.in
 	${SLC} ${.ALLSRC:M*.in}
 
-.for ext in c o
-kcc-commands.${ext}: kcc-commands.h
-.endfor
+kcc-commands.o: kcc-commands.h
 
 .include <bsd.prog.mk>
 
diff --git a/kerberosV/usr.sbin/iprop-log/Makefile b/kerberosV/usr.sbin/iprop-log/Makefile
index 8e92be1bb71..122672de186 100644
--- a/kerberosV/usr.sbin/iprop-log/Makefile
+++ b/kerberosV/usr.sbin/iprop-log/Makefile
@@ -1,8 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2013/06/19 19:36:58 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2013/06/21 17:02:20 robert Exp $
 
 PROG=	iprop-log
 MAN=	iprop-log.8
-SRCS=	iprop-log.c iprop-commands.c iprop-commands.h kadm5_err.h
+
+SRCS=	iprop-log.c \
+	kadm5_err.h \
+	iprop-commands.c
+
 CFLAGS+=	-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/roken \
@@ -14,12 +18,12 @@ LDADD=	-lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto ${LIBSL} -lroken \
 	${LIBVERS} -ledit -lwind -lheimbase \
 	-lcurses -lcom_err
 
-iprop-commands.h: iprop-commands.in
+CLEANFILES+=	iprop-commands.[ch]*
+
+iprop-commands.h iprop-commands.c: iprop-commands.in
 	${SLC} ${.ALLSRC:M*.in}
 
-.for ext in c o
-iprop-commands.${ext}: iprop-commands.h
-.endfor
+iprop-commands.o: iprop-commands.h kadm5_err.h
 
 .include <bsd.prog.mk>
 
diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile
index 23c64a9256d..f6b6be4205c 100644
--- a/kerberosV/usr.sbin/kadmin/Makefile
+++ b/kerberosV/usr.sbin/kadmin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2013/06/19 19:36:58 robert Exp $
+# $OpenBSD: Makefile,v 1.24 2013/06/21 17:02:20 robert Exp $
 
 PROG=	kadmin
 MAN=	kadmin.8
@@ -15,7 +15,6 @@ SRCS=	add_enctype.c \
 	init.c \
 	kadmin.c \
 	kadmin-commands.c \
-	kadmin-commands.h \
 	load.c \
 	mod.c \
 	pw_quality.c \
@@ -35,14 +34,13 @@ LDADD=	-lkadm5clnt -lkadm5srv -lhdb -lkrb5 \
 	-lcrypto -lcom_err \
 	-ledit -lncurses -lwind -lheimbase
 
+CLEANFILES+=	kadmin-commands.[ch]*
+
 .include <bsd.prog.mk>
 
-kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in
+kadmin-commands.h kadmin-commands.c: ${KRB5DIR}/kadmin/kadmin-commands.in
 	${SLC} ${.ALLSRC:M*.in}
 
-.for ext in o c
-kadmin-commands.${ext}: kadmin-commands.h
-.endfor
+kadmin-commands.o: kadmin-commands.h
 
 .PATH: ${KRB5DIR}/kadmin
-
diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile
index 585752d904f..c1463981f27 100644
--- a/kerberosV/usr.sbin/ktutil/Makefile
+++ b/kerberosV/usr.sbin/ktutil/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2013/06/19 19:37:00 robert Exp $
+# $OpenBSD: Makefile,v 1.20 2013/06/21 17:02:20 robert Exp $
 
 PROG=	ktutil
 MAN=	ktutil.8
@@ -10,7 +10,6 @@ SRCS=	add.c \
 	get.c \
 	ktutil.c \
 	ktutil-commands.c \
-	ktutil-commands.h \
 	list.c \
 	purge.c \
 	remove.c \
@@ -23,13 +22,13 @@ LDADD=	-lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -ledit -lheimbase -lwind -lcom_err \
 	-lcurses
 
+CLEANFILES+=	ktutil-commands.[ch]*
+
 .include <bsd.prog.mk>
 
-ktutil-commands.h: ${KRB5DIR}/admin/ktutil-commands.in
+ktutil-commands.h ktutil-commands.c: ${KRB5DIR}/admin/ktutil-commands.in
 	${SLC} ${.ALLSRC:M*.in}
 
-.for ext in c o
-ktutil-commands.${ext}: ktutil-commands.h
-.endfor
+ktutil-commands.o: ktutil-commands.h
 
 .PATH: ${KRB5DIR}/admin