Most CFLAGS should be CPPFLAGS, so fix that.

Remove non existent LDAP* variables.

ok robert@

8 files changed, 16 insertions, 16 deletions

diff --git a/kerberosV/usr.bin/hxtool/Makefile b/kerberosV/usr.bin/hxtool/Makefile
index d0f01a91ebb..59c7deab00b 100644
--- a/kerberosV/usr.bin/hxtool/Makefile
+++ b/kerberosV/usr.bin/hxtool/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2013/06/19 19:36:53 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2013/07/02 19:00:10 ajacoutot Exp $
 
 PROG=	hxtool
 NOMAN=
-CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
+CPPFLAGS=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
 DPADD=	${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
diff --git a/kerberosV/usr.bin/kcc/Makefile b/kerberosV/usr.bin/kcc/Makefile
index 46247ba9317..cf382485383 100644
--- a/kerberosV/usr.bin/kcc/Makefile
+++ b/kerberosV/usr.bin/kcc/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2013/07/02 19:00:10 ajacoutot Exp $
 
 PROG=	kcc
 MPAGES=	klist.1
 MSRC=	${KRB5DIR}/kuser
 LINKS=	${BINDIR}/kcc ${BINDIR}/klist
-CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
+CPPFLAGS=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
 DPADD=	${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile
index 970f30323cd..f398905888f 100644
--- a/kerberosV/usr.bin/kdestroy/Makefile
+++ b/kerberosV/usr.bin/kdestroy/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.10 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2013/07/02 19:00:10 ajacoutot Exp $
 
 PROG=	kdestroy
-CFLAGS+=-I${KRB5DIR}/lib/roken
+CPPFLAGS=	-I${KRB5DIR}/lib/roken
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
 LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
diff --git a/kerberosV/usr.bin/kf/Makefile b/kerberosV/usr.bin/kf/Makefile
index 79e6ae0afd0..45794ceefbc 100644
--- a/kerberosV/usr.bin/kf/Makefile
+++ b/kerberosV/usr.bin/kf/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2013/07/02 19:00:10 ajacoutot Exp $
 
 PROG=	kf
 MPAGES=	kf.1
 MSRC=	${KRB5DIR}/appl/kf
-CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
+CPPFLAGS=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
 DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBCRYPT} ${LIBVERS}
diff --git a/kerberosV/usr.bin/kgetcred/Makefile b/kerberosV/usr.bin/kgetcred/Makefile
index aeffe99a903..b1fe75545d5 100644
--- a/kerberosV/usr.bin/kgetcred/Makefile
+++ b/kerberosV/usr.bin/kgetcred/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.2 2013/06/19 19:36:55 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2013/07/02 19:00:10 ajacoutot Exp $
 
 PROG=	kgetcred
-CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
+CPPFLAGS=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
 DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
 LDADD=	-lkrb5 -lroken -lasn1 -lcrypto ${LIBVERS} -lheimbase -lcom_err \
diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile
index e07fc2b9016..2b315b000fd 100644
--- a/kerberosV/usr.bin/kinit/Makefile
+++ b/kerberosV/usr.bin/kinit/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.11 2013/06/19 19:36:55 robert Exp $
+# $OpenBSD: Makefile,v 1.12 2013/07/02 19:00:10 ajacoutot Exp $
 
 PROG=	kinit
-CFLAGS+=-I${KRB5DIR}/lib/roken
+CPPFLAGS=	-I${KRB5DIR}/lib/roken
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
 LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
diff --git a/kerberosV/usr.bin/string2key/Makefile b/kerberosV/usr.bin/string2key/Makefile
index d9cefdc1f4f..5cf91513c32 100644
--- a/kerberosV/usr.bin/string2key/Makefile
+++ b/kerberosV/usr.bin/string2key/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2013/07/02 19:00:10 ajacoutot Exp $
 
 PROG=	string2key
 MPAGES=	string2key.8
 MSRC=	${KRB5DIR}/kdc
-CFLAGS+=	-I${KRB5DIR}/kdc \
+CPPFLAGS=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/roken \
diff --git a/kerberosV/usr.bin/verify_krb5_conf/Makefile b/kerberosV/usr.bin/verify_krb5_conf/Makefile
index f535c12c157..c8d24963b41 100644
--- a/kerberosV/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberosV/usr.bin/verify_krb5_conf/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2013/07/02 19:00:10 ajacoutot Exp $
 
 PROG=	verify_krb5_conf
 MPAGES=	verify_krb5_conf.8
 MSRC=	${KRB5DIR}/lib/krb5
-CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
+CPPFLAGS=	-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \