diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2015-08-27 17:16:18 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2015-08-27 17:16:18 +0000 |
| commit | 7525abf8112dc96e2f9527593cac24436f93f6ea (patch) | |
| tree | f90498754264e6ef9c48e457c9cfd6104427ae5b /kerberos5 | |
| parent | 2640322a2ebe73c947f016cd4ed17137304e533e (diff) | |
| download | src-test-7525abf8112dc96e2f9527593cac24436f93f6ea.tar.gz src-test-7525abf8112dc96e2f9527593cac24436f93f6ea.zip | |
Move setting of LDFLAGS to the modules which require it actually, as
other kerberos5 modules do so.
Notes
Notes:
svn path=/head/; revision=287216
Diffstat (limited to 'kerberos5')
| -rw-r--r-- | kerberos5/Makefile.inc | 1 | ||||
| -rw-r--r-- | kerberos5/libexec/digest-service/Makefile | 1 | ||||
| -rw-r--r-- | kerberos5/libexec/kdc/Makefile | 1 | ||||
| -rw-r--r-- | kerberos5/usr.bin/kpasswd/Makefile | 1 | ||||
| -rw-r--r-- | kerberos5/usr.sbin/iprop-log/Makefile | 1 |
5 files changed, 4 insertions, 1 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index c02eafb000b64..0c3d69682d199 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -14,7 +14,6 @@ LDAPLDADD= -lldap -llber LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;} LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1 LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib -LDFLAGS+= ${LDAPLDFLAGS} .endif .if defined(SRCS) diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile index f018aac64da86..840f2c4d2fec6 100644 --- a/kerberos5/libexec/digest-service/Makefile +++ b/kerberos5/libexec/digest-service/Makefile @@ -9,6 +9,7 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/wind \ -I${KRB5DIR}/lib/roken LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm +LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index c88a5cd7040ee..aa4584e4ac7b4 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -11,6 +11,7 @@ SRCS= config.c \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kdc ${LDAPCFLAGS} LIBADD= kdc hdb krb5 roken crypt vers +LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index 66cb4569a6509..05e07dddc03de 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -3,6 +3,7 @@ PROG= kpasswd CFLAGS+=-I${KRB5DIR}/lib/roken LIBADD= hdb krb5 roken vers crypto +LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> diff --git a/kerberos5/usr.sbin/iprop-log/Makefile b/kerberos5/usr.sbin/iprop-log/Makefile index f31be516fb286..23439198efb54 100644 --- a/kerberos5/usr.sbin/iprop-log/Makefile +++ b/kerberos5/usr.sbin/iprop-log/Makefile @@ -9,6 +9,7 @@ CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/lib/sl \ -I. LIBADD= kadm5srv hdb krb5 roken edit sl vers +LDFLAGS=${LDAPLDFLAGS} iprop-commands.h: iprop-commands.in ${SLC} ${.ALLSRC:M*.in} |