diff options
Diffstat (limited to 'kerberosV')
45 files changed, 129 insertions, 129 deletions
diff --git a/kerberosV/lib/libasn1/Makefile b/kerberosV/lib/libasn1/Makefile index 21d6378e82b..2360a60deb5 100644 --- a/kerberosV/lib/libasn1/Makefile +++ b/kerberosV/lib/libasn1/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2013/06/21 12:26:03 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.5 2013/07/02 19:00:09 ajacoutot Exp $ LIB= asn1 INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h @@ -19,7 +19,7 @@ SRCS= asn1_err.c \ roken.h \ ${GEN:S/.x$/.c/:S/.hx$/.h/} -CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/com_err -I. +CPPFLAGS= -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/com_err -I. GEN_RFC2459= asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx GEN_CMS= asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx diff --git a/kerberosV/lib/libcom_err/Makefile b/kerberosV/lib/libcom_err/Makefile index 4fb0801eb58..2f3dc4e368a 100644 --- a/kerberosV/lib/libcom_err/Makefile +++ b/kerberosV/lib/libcom_err/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2013/06/19 19:36:43 robert Exp $ +# $OpenBSD: Makefile,v 1.3 2013/07/02 19:00:09 ajacoutot Exp $ LIB= com_err SRCS= com_err.c error.c INCS= com_err.h com_right.h -CFLAGS+=-I. -I${KRB5DIR}/lib/com_err -CFLAGS+=-I. -I${KRB5DIR}/lib/roken +CPPFLAGS= -I. -I${KRB5DIR}/lib/com_err \ + -I. -I${KRB5DIR}/lib/roken .include <bsd.lib.mk> diff --git a/kerberosV/lib/libgssapi/Makefile b/kerberosV/lib/libgssapi/Makefile index 7c01f1a4ef4..3479fb8c619 100644 --- a/kerberosV/lib/libgssapi/Makefile +++ b/kerberosV/lib/libgssapi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2013/07/01 05:15:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2013/07/02 19:00:09 ajacoutot Exp $ LIB= gssapi @@ -237,13 +237,13 @@ MLINKS= \ gss_acquire_cred.3 gsskrb5_extract_authz_data_from_sec_context.3 \ gss_acquire_cred.3 gsskrb5_register_acceptor_identity.3 -CFLAGS+=-I${KRB5DIR}/lib/gssapi -CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi -CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5 -CFLAGS+=-I${KRB5DIR}/lib/gssapi/mech -CFLAGS+=-I${KRB5DIR}/lib/krb5 -CFLAGS+=-I${KRB5DIR}/lib/asn1 -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CPPFLAGS= -I${KRB5DIR}/lib/gssapi \ + -I${KRB5DIR}/lib/gssapi/gssapi \ + -I${KRB5DIR}/lib/gssapi/krb5 \ + -I${KRB5DIR}/lib/gssapi/mech \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken -I. CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} gssapi_asn1_files spnego_asn1_files \ gssapi_asn1-template.c spnego_asn1-template.c diff --git a/kerberosV/lib/libhdb/Makefile b/kerberosV/lib/libhdb/Makefile index 160cf776b50..1667b74bb55 100644 --- a/kerberosV/lib/libhdb/Makefile +++ b/kerberosV/lib/libhdb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2013/07/01 05:15:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2013/07/02 19:00:09 ajacoutot Exp $ LIB= hdb @@ -52,11 +52,12 @@ SRCS= common.c \ print.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} -CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I. -CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" +CPPFLAGS= -I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I. + +CFLAGS= -DHDB_DB_DIR="\"/var/heimdal\"" GEN= asn1_Salt.x \ asn1_Key.x \ diff --git a/kerberosV/lib/libheimbase/Makefile b/kerberosV/lib/libheimbase/Makefile index 2a5715737ed..aec47f5ce7c 100644 --- a/kerberosV/lib/libheimbase/Makefile +++ b/kerberosV/lib/libheimbase/Makefile @@ -1,4 +1,4 @@ -#$OpenBSD: Makefile,v 1.2 2013/06/21 10:59:40 ajacoutot Exp $ +#$OpenBSD: Makefile,v 1.3 2013/07/02 19:00:09 ajacoutot Exp $ LIB= heimbase @@ -13,7 +13,7 @@ SRCS= \ number.c \ string.c -CFLAGS+= -I${KRB5DIR}/include +CPPFLAGS= -I${KRB5DIR}/include .include <bsd.lib.mk> diff --git a/kerberosV/lib/libheimipcc/Makefile b/kerberosV/lib/libheimipcc/Makefile index 994c6287aa9..31c0c19882c 100644 --- a/kerberosV/lib/libheimipcc/Makefile +++ b/kerberosV/lib/libheimipcc/Makefile @@ -1,4 +1,4 @@ -#$OpenBSD: Makefile,v 1.1 2013/06/17 19:11:35 robert Exp $ +#$OpenBSD: Makefile,v 1.2 2013/07/02 19:00:09 ajacoutot Exp $ .include <bsd.own.mk> @@ -12,7 +12,7 @@ SRCS= \ CFLAGS+= -DPIC ${PICFLAG} .endif -CFLAGS+= -I${KRB5DIR}/lib/roken \ +CPPFLAGS= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/base \ -I${KRB5DIR}/lib/ipc diff --git a/kerberosV/lib/libheimipcs/Makefile b/kerberosV/lib/libheimipcs/Makefile index 2dfeb7e4258..674d1d1aba3 100644 --- a/kerberosV/lib/libheimipcs/Makefile +++ b/kerberosV/lib/libheimipcs/Makefile @@ -1,4 +1,4 @@ -#$OpenBSD: Makefile,v 1.1 2013/06/17 19:11:35 robert Exp $ +#$OpenBSD: Makefile,v 1.2 2013/07/02 19:00:09 ajacoutot Exp $ .include <bsd.own.mk> @@ -12,7 +12,7 @@ SRCS= \ CFLAGS+= -DPIC ${PICFLAG} .endif -CFLAGS+= -I${KRB5DIR}/lib/roken \ +CPPFLAGS= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/base \ -I${KRB5DIR}/lib/ipc -I. diff --git a/kerberosV/lib/libheimntlm/Makefile b/kerberosV/lib/libheimntlm/Makefile index 16cd272e1f7..3b12286bff5 100644 --- a/kerberosV/lib/libheimntlm/Makefile +++ b/kerberosV/lib/libheimntlm/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2013/07/01 05:15:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2013/07/02 19:00:10 ajacoutot Exp $ LIB= heimntlm DPADD= ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} SRCS= ntlm.c ntlm_err.c INCS= heimntlm.h heimntlm-protos.h ntlm_err.h -CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken +CPPFLAGS= -I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken MPAGES= ntlm_buf.3 \ ntlm_core.3 \ diff --git a/kerberosV/lib/libhx509/Makefile b/kerberosV/lib/libhx509/Makefile index 0dd5c7ce049..f12036e6f6d 100644 --- a/kerberosV/lib/libhx509/Makefile +++ b/kerberosV/lib/libhx509/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2013/07/01 05:15:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2013/07/02 19:00:10 ajacoutot Exp $ LIB= hx509 DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPTO} ${LIBROKEN} ${LIBWIND} @@ -208,11 +208,11 @@ SRCS+= hx509_err.c \ SRCS+= ${GEN_OCSP:S/.x$/.c/:S/.hx$/.h/} \ ${GEN_PKCS10:S/.x$/.c/:S/.hx$/.h/} -CFLAGS+=-I${KRB5DIR}/lib/hx509 -CFLAGS+=-I${KRB5DIR}/lib/hx509/ref -CFLAGS+=-I${KRB5DIR}/lib/asn1 -CFLAGS+=-I${KRB5DIR}/lib/wind -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CPPFLAGS= -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hx509/ref \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/roken -I. GEN_OCSP= \ asn1_OCSPBasicOCSPResponse.x \ diff --git a/kerberosV/lib/libkadm5clnt/Makefile b/kerberosV/lib/libkadm5clnt/Makefile index 518cf0d2e69..537580183d7 100644 --- a/kerberosV/lib/libkadm5clnt/Makefile +++ b/kerberosV/lib/libkadm5clnt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2013/06/21 10:59:40 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2013/07/02 19:00:10 ajacoutot Exp $ LIB= kadm5clnt @@ -32,7 +32,7 @@ SRCS= ad.c \ rename_c.c \ send_recv.c -CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. +CPPFLAGS= -I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. .include <bsd.lib.mk> diff --git a/kerberosV/lib/libkadm5srv/Makefile b/kerberosV/lib/libkadm5srv/Makefile index 60abcb0280e..912c8b3fecd 100644 --- a/kerberosV/lib/libkadm5srv/Makefile +++ b/kerberosV/lib/libkadm5srv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2013/07/01 05:15:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2013/07/02 19:00:10 ajacoutot Exp $ LIB= kadm5srv MPAGES= kadm5_pwcheck.3 @@ -33,7 +33,7 @@ SRCS= acl.c \ set_keys.c \ set_modifier.c -CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. +CPPFLAGS= -I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. .include <bsd.lib.mk> diff --git a/kerberosV/lib/libkafs5/Makefile b/kerberosV/lib/libkafs5/Makefile index 92a7cc6e478..2033f0e5c67 100644 --- a/kerberosV/lib/libkafs5/Makefile +++ b/kerberosV/lib/libkafs5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2013/07/01 05:15:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2013/07/02 19:00:10 ajacoutot Exp $ LIB= kafs5 INCS= kafs.h @@ -25,7 +25,7 @@ SRCS= afssys.c \ afskrb5.c \ common.c -CFLAGS+= -I${KRB5DIR}/lib/kafs \ +CPPFLAGS= -I${KRB5DIR}/lib/kafs \ -I${KRB5DIR}/lib/krb5 \ -I${.OBJDIR}/../libkrb5/ \ -I${KRB5DIR}/lib/roken diff --git a/kerberosV/lib/libkdc/Makefile b/kerberosV/lib/libkdc/Makefile index 65ef38254e9..b6e2a456363 100644 --- a/kerberosV/lib/libkdc/Makefile +++ b/kerberosV/lib/libkdc/Makefile @@ -1,4 +1,4 @@ -#$OpenBSD: Makefile,v 1.5 2013/06/21 12:26:04 ajacoutot Exp $ +#$OpenBSD: Makefile,v 1.6 2013/07/02 19:00:10 ajacoutot Exp $ LIB= kdc @@ -20,7 +20,7 @@ SRCS= \ process.c \ windc.c -CFLAGS+= -I${KRB5DIR}/lib/roken \ +CPPFLAGS= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/hdb \ -I${KRB5DIR}/kdc diff --git a/kerberosV/lib/libkrb5/Makefile b/kerberosV/lib/libkrb5/Makefile index e449060b5ef..1df4dc0da9e 100644 --- a/kerberosV/lib/libkrb5/Makefile +++ b/kerberosV/lib/libkrb5/Makefile @@ -1,4 +1,4 @@ -# $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 $ LIB= krb5 @@ -617,7 +617,7 @@ SRCS+= heim_err.c \ krb_err.c \ krb_err.h -CFLAGS+= -I${KRB5DIR}/lib/krb5 \ +CPPFLAGS= -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/ipc \ diff --git a/kerberosV/lib/libroken/Makefile b/kerberosV/lib/libroken/Makefile index 41b71e93fd7..73d4fbff130 100644 --- a/kerberosV/lib/libroken/Makefile +++ b/kerberosV/lib/libroken/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2013/06/21 10:59:40 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2013/07/02 19:00:10 ajacoutot Exp $ LIB= roken DPADD= ${LIBCRYPT} @@ -74,8 +74,8 @@ SRCS= base64.c \ write_pid.c \ xfree.c -CPPFLAGS+= -DBUILD_ROKEN_LIB -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS= -DBUILD_ROKEN_LIB +CPPFLAGS= -I${KRB5DIR}/lib/roken -I. .include <bsd.lib.mk> diff --git a/kerberosV/lib/libsl/Makefile b/kerberosV/lib/libsl/Makefile index a85dd487345..edf17002332 100644 --- a/kerberosV/lib/libsl/Makefile +++ b/kerberosV/lib/libsl/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1 2013/06/17 19:11:35 robert Exp $ +# $OpenBSD: Makefile,v 1.2 2013/07/02 19:00:10 ajacoutot Exp $ LIB= sl SRCS= sl.c -CFLAGS+=-I${KRB5DIR}/lib/sl +CPPFLAGS= -I${KRB5DIR}/lib/sl # skip installation install: diff --git a/kerberosV/lib/libvers/Makefile b/kerberosV/lib/libvers/Makefile index 5face4ae810..09eb45bb202 100644 --- a/kerberosV/lib/libvers/Makefile +++ b/kerberosV/lib/libvers/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1 2013/06/17 19:11:35 robert Exp $ +# $OpenBSD: Makefile,v 1.2 2013/07/02 19:00:10 ajacoutot Exp $ LIB= vers SRCS= print_version.c roken.h -CFLAGS+=-I. -I${KRB5DIR}/lib/roken +CPPFLAGS= -I. -I${KRB5DIR}/lib/roken # skip installation install: diff --git a/kerberosV/lib/libwind/Makefile b/kerberosV/lib/libwind/Makefile index 142ce844bf0..538500e6241 100644 --- a/kerberosV/lib/libwind/Makefile +++ b/kerberosV/lib/libwind/Makefile @@ -1,4 +1,4 @@ -#$OpenBSD: Makefile,v 1.2 2013/06/21 10:59:40 ajacoutot Exp $ +#$OpenBSD: Makefile,v 1.3 2013/07/02 19:00:10 ajacoutot Exp $ LIB= wind @@ -24,7 +24,7 @@ SRCS= bidi.c \ SRCS+= wind_err.c \ wind_err.h -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CPPFLAGS= -I${KRB5DIR}/lib/roken -I. .include <bsd.lib.mk> 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 diff --git a/kerberosV/tools/asn1_compile/Makefile b/kerberosV/tools/asn1_compile/Makefile index 03dcf1267de..97c349d77e2 100644 --- a/kerberosV/tools/asn1_compile/Makefile +++ b/kerberosV/tools/asn1_compile/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2013/06/17 19:11:46 robert Exp $ +# $OpenBSD: Makefile,v 1.2 2013/07/02 19:00:10 ajacoutot Exp $ PROG= asn1_compile NOMAN= @@ -36,7 +36,7 @@ SRCS+= ecalloc.c \ # libvers SRCS+= print_version.c -CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/com_err -I. +CPPFLAGS= -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/com_err -I. CLEANFILES= lex.c asn1parse.c asn1parse.h diff --git a/kerberosV/tools/compile_et/Makefile b/kerberosV/tools/compile_et/Makefile index e7a45e124bd..280637b29f6 100644 --- a/kerberosV/tools/compile_et/Makefile +++ b/kerberosV/tools/compile_et/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2013/06/19 10:39:00 robert Exp $ +# $OpenBSD: Makefile,v 1.3 2013/07/02 19:00:10 ajacoutot Exp $ PROG= compile_et @@ -20,7 +20,7 @@ parse.c parse.h: parse.y compile_et.o: parse.h -CFLAGS+= -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/com_err -I. +CPPFLAGS= -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/com_err -I. CLEANFILES+= parse.[ch]* diff --git a/kerberosV/tools/slc/Makefile b/kerberosV/tools/slc/Makefile index 73e09fbb7e9..83c6186058b 100644 --- a/kerberosV/tools/slc/Makefile +++ b/kerberosV/tools/slc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2013/06/17 19:11:46 robert Exp $ +# $OpenBSD: Makefile,v 1.2 2013/07/02 19:00:10 ajacoutot Exp $ PROG= slc NOMAN= @@ -20,7 +20,7 @@ slc-gram.c slc-gram.h: slc-gram.y # libvers SRCS+= print_version.c -CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I${KRB5DIR}/lib/vers -I. +CPPFLAGS= -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I${KRB5DIR}/lib/vers -I. CLEANFILES= slc-gram.c slc-lex.c slc-gram.h 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} \ diff --git a/kerberosV/usr.sbin/iprop-log/Makefile b/kerberosV/usr.sbin/iprop-log/Makefile index 6dd603b908c..f9b335130a6 100644 --- a/kerberosV/usr.sbin/iprop-log/Makefile +++ b/kerberosV/usr.sbin/iprop-log/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= iprop-log MPAGES= iprop-log.8 @@ -8,7 +8,7 @@ SRCS= iprop-log.c \ kadm5_err.h \ iprop-commands.c -CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ +CPPFLAGS= -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl \ diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile index 3552b7ea46b..ad575a737ab 100644 --- a/kerberosV/usr.sbin/kadmin/Makefile +++ b/kerberosV/usr.sbin/kadmin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2013/07/01 05:15:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.26 2013/07/02 19:00:10 ajacoutot Exp $ PROG= kadmin MPAGES= kadmin.8 @@ -24,12 +24,12 @@ SRCS= add_enctype.c \ stash.c \ util.c -CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS} +CPPFLAGS=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/sl -I. DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \ ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBEDIT} ${LIBNCURSES} ${LDAPDPADD} + ${LIBEDIT} ${LIBNCURSES} LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 \ ${LIBSL} -lroken ${LIBVERS} -lasn1 \ -lcrypto -lcom_err \ diff --git a/kerberosV/usr.sbin/kdigest/Makefile b/kerberosV/usr.sbin/kdigest/Makefile index 14617521355..a7645893e44 100644 --- a/kerberosV/usr.sbin/kdigest/Makefile +++ b/kerberosV/usr.sbin/kdigest/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2013/07/01 05:15:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2013/07/02 19:00:10 ajacoutot Exp $ PROG= kdigest MPAGES= kdigest.8 MSRC= ${KRB5DIR}/kuser -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.sbin/kimpersonate/Makefile b/kerberosV/usr.sbin/kimpersonate/Makefile index 214f4484cef..a595737fb7d 100644 --- a/kerberosV/usr.sbin/kimpersonate/Makefile +++ b/kerberosV/usr.sbin/kimpersonate/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2013/07/01 05:15:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2013/07/02 19:00:10 ajacoutot Exp $ PROG= kimpersonate MPAGES= kimpersonate.8 MSRC= ${KRB5DIR}/kuser -CFLAGS+= -I${KRB5DIR}/lib/asn1 \ +CPPFLAGS= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl -I. DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ diff --git a/kerberosV/usr.sbin/kstash/Makefile b/kerberosV/usr.sbin/kstash/Makefile index 0334486ded8..566ab7dbfdb 100644 --- a/kerberosV/usr.sbin/kstash/Makefile +++ b/kerberosV/usr.sbin/kstash/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= kstash MPAGES= kstash.8 MSRC= ${KRB5DIR}/kdc -CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/kdc ${LDAPCFLAGS} +CPPFLAGS= -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/kdc DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcom_err -lheimbase -lwind diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile index 849f8be7117..64f0469b104 100644 --- a/kerberosV/usr.sbin/ktutil/Makefile +++ b/kerberosV/usr.sbin/ktutil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2013/07/01 05:15:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.22 2013/07/02 19:00:10 ajacoutot Exp $ PROG= ktutil MPAGES= ktutil.8 @@ -16,7 +16,7 @@ SRCS= add.c \ remove.c \ rename.c -CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I. +CPPFLAGS= -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I. DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBEDIT} LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \ |