summaryrefslogtreecommitdiff
path: root/kerberosV/libexec
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2013-07-02 19:00:11 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2013-07-02 19:00:11 +0000
commitc833dd7dd152140795451c8f530613e8f22006a6 (patch)
tree79f64fcc06ef8d79601402d75c8d6e0a94e6c292 /kerberosV/libexec
parent04406384e729c5f832184829ff1a11a2209df6da (diff)
Most CFLAGS should be CPPFLAGS, so fix that.
Remove non existent LDAP* variables. ok robert@
Diffstat (limited to 'kerberosV/libexec')
-rw-r--r--kerberosV/libexec/digest-service/Makefile4
-rw-r--r--kerberosV/libexec/hprop/Makefile16
-rw-r--r--kerberosV/libexec/hpropd/Makefile9
-rw-r--r--kerberosV/libexec/ipropd-master/Makefile8
-rw-r--r--kerberosV/libexec/ipropd-slave/Makefile8
-rw-r--r--kerberosV/libexec/kadmind/Makefile8
-rw-r--r--kerberosV/libexec/kcm/Makefile8
-rw-r--r--kerberosV/libexec/kdc/Makefile6
-rw-r--r--kerberosV/libexec/kfd/Makefile4
-rw-r--r--kerberosV/libexec/kpasswdd/Makefile6
10 files changed, 38 insertions, 39 deletions
diff --git a/kerberosV/libexec/digest-service/Makefile b/kerberosV/libexec/digest-service/Makefile
index ea0ba755a47..5edb96c7b24 100644
--- a/kerberosV/libexec/digest-service/Makefile
+++ b/kerberosV/libexec/digest-service/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2013/06/19 19:36:45 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2013/07/02 19:00:10 ajacoutot Exp $
PROG= digest-service
NOMAN= 1
-CFLAGS+= -I${KRB5DIR}/kdc \
+CPPFLAGS= -I${KRB5DIR}/kdc \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/ipc \
diff --git a/kerberosV/libexec/hprop/Makefile b/kerberosV/libexec/hprop/Makefile
index a1c902dd31b..cd4c2544079 100644
--- a/kerberosV/libexec/hprop/Makefile
+++ b/kerberosV/libexec/hprop/Makefile
@@ -1,17 +1,17 @@
-# $OpenBSD: Makefile,v 1.11 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2013/07/02 19:00:10 ajacoutot Exp $
PROG= hprop
MPAGES= hprop.8
MSRC= ${KRB5DIR}/kdc
SRCS= hprop.c mit_dump.c
-CFLAGS+=-I${KRB5DIR}/lib/roken
-CFLAGS+=-I${KRB5DIR}/lib/krb5
-CFLAGS+=-I${KRB5DIR}/lib/asn1
-CFLAGS+=-I${KRB5DIR}/lib/ntlm
-CFLAGS+=-I${KRB5DIR}/kdc
-CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5
+CPPFLAGS= -I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/krb5 \
+ -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/lib/ntlm \
+ -I${KRB5DIR}/kdc \
+ -I${.OBJDIR}/../../lib/libkrb5
DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcom_err -lheimbase -lwind
diff --git a/kerberosV/libexec/hpropd/Makefile b/kerberosV/libexec/hpropd/Makefile
index d7581214c33..7128247e137 100644
--- a/kerberosV/libexec/hpropd/Makefile
+++ b/kerberosV/libexec/hpropd/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.11 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2013/07/02 19:00:10 ajacoutot Exp $
PROG= hpropd
MPAGES= hpropd.8
MSRC= ${KRB5DIR}/kdc
-CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
- -I${KRB5DIR}/kdc ${LDAPCFLAGS}
+CPPFLAGS= -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/kdc
DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcom_err -lheimbase -lwind
-LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
diff --git a/kerberosV/libexec/ipropd-master/Makefile b/kerberosV/libexec/ipropd-master/Makefile
index a2749403180..401a1f214c0 100644
--- a/kerberosV/libexec/ipropd-master/Makefile
+++ b/kerberosV/libexec/ipropd-master/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.12 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2013/07/02 19:00:10 ajacoutot Exp $
PROG= ipropd-master
MPAGES= iprop.8
MSRC= ${KRB5DIR}/lib/kadm5
SRCS= ipropd_common.c ipropd_master.c kadm5_err.h
-CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
- -I. ${LDAPCFLAGS}
+CPPFLAGS= -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+ -I.
DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcom_err -lwind -lheimbase \
-lutil
diff --git a/kerberosV/libexec/ipropd-slave/Makefile b/kerberosV/libexec/ipropd-slave/Makefile
index 669ef2321ed..a4a86bdad65 100644
--- a/kerberosV/libexec/ipropd-slave/Makefile
+++ b/kerberosV/libexec/ipropd-slave/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.12 2013/06/19 19:36:47 robert Exp $
+# $OpenBSD: Makefile,v 1.13 2013/07/02 19:00:10 ajacoutot Exp $
PROG= ipropd-slave
NOMAN=
SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h
-CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
- -I. ${LDAPCFLAGS}
+CPPFLAGS= -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+ -I.
DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcom_err -lheimbase -lwind -lutil
diff --git a/kerberosV/libexec/kadmind/Makefile b/kerberosV/libexec/kadmind/Makefile
index 07233b29903..43383f907e6 100644
--- a/kerberosV/libexec/kadmind/Makefile
+++ b/kerberosV/libexec/kadmind/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2013/07/02 19:00:10 ajacoutot Exp $
PROG= kadmind
MPAGES= kadmind.8
@@ -8,10 +8,10 @@ SRCS= rpc.c \
kadmind.c \
kadm_conn.c
-CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
- -I/usr/include/kerberosV/gssapi
+CPPFLAGS= -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+ -I/usr/include/kerberosV/gssapi
DPADD= ${LIBKADM5SRV} ${LIBGSSAPI} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} \
- ${LIBASN1} ${LIBVERS} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
+ ${LIBASN1} ${LIBVERS} ${LIBCRYPTO} ${LIBCRYPT}
LDADD= -lkadm5srv -lgssapi -lhdb -lkrb5 -lasn1 \
-lroken ${LIBVERS} -lcrypto -lheimbase -lwind \
-lcom_err -lutil
diff --git a/kerberosV/libexec/kcm/Makefile b/kerberosV/libexec/kcm/Makefile
index c854ce07bec..84af349f5e8 100644
--- a/kerberosV/libexec/kcm/Makefile
+++ b/kerberosV/libexec/kcm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2013/07/02 19:00:10 ajacoutot Exp $
PROG= kcm
MPAGES= kcm.8
@@ -18,10 +18,10 @@ SRCS= acl.c \
sessions.c \
renew.c
-CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS}
+CPPFLAGS= -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc
DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \
- ${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
+ ${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
LDADD= -lhdb -lkrb5 -lroken -lasn1 ${LIBHEIMIPCS} \
-lcrypto ${LIBVERS} -lwind -lcom_err -lwind \
-lheimbase -lutil
diff --git a/kerberosV/libexec/kdc/Makefile b/kerberosV/libexec/kdc/Makefile
index 29be9710e0a..73f39d908e1 100644
--- a/kerberosV/libexec/kdc/Makefile
+++ b/kerberosV/libexec/kdc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2013/07/02 19:00:10 ajacoutot Exp $
PROG= kdc
MPAGES= kdc.8
@@ -9,8 +9,8 @@ SRCS= config.c \
announce.c \
main.c
-CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/kdc ${LDAPCFLAGS}
+CPPFLAGS= -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/kdc
DPADD= ${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
LDADD= -lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto ${LIBVERS} -lheimbase \
diff --git a/kerberosV/libexec/kfd/Makefile b/kerberosV/libexec/kfd/Makefile
index a2e89369d28..30b38525c3f 100644
--- a/kerberosV/libexec/kfd/Makefile
+++ b/kerberosV/libexec/kfd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2013/07/02 19:00:10 ajacoutot Exp $
PROG= kfd
MPAGES= kfd.8
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/libexec/kpasswdd/Makefile b/kerberosV/libexec/kpasswdd/Makefile
index 40adce2914f..4bb881bd76a 100644
--- a/kerberosV/libexec/kpasswdd/Makefile
+++ b/kerberosV/libexec/kpasswdd/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.14 2013/07/01 05:15:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2013/07/02 19:00:10 ajacoutot Exp $
PROG= kpasswdd
MPAGES= kpasswdd.8
MSRC= ${KRB5DIR}/kpasswd
-CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS}
+CPPFLAGS= -I${KRB5DIR}/lib/roken -I../../lib/libhdb
DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcom_err -lheimbase -lwind -lutil
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 07:40:28 +0000