Date: Thu, 27 Aug 2015 17:16:19 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287216 - in head/kerberos5: . libexec/digest-service libexec/kdc usr.bin/kpasswd usr.sbin/iprop-log Message-ID: <201508271716.t7RHGJuF053217@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Thu Aug 27 17:16:18 2015 New Revision: 287216 URL: https://svnweb.freebsd.org/changeset/base/287216 Log: Move setting of LDFLAGS to the modules which require it actually, as other kerberos5 modules do so. Modified: head/kerberos5/Makefile.inc head/kerberos5/libexec/digest-service/Makefile head/kerberos5/libexec/kdc/Makefile head/kerberos5/usr.bin/kpasswd/Makefile head/kerberos5/usr.sbin/iprop-log/Makefile Modified: head/kerberos5/Makefile.inc ============================================================================== --- head/kerberos5/Makefile.inc Thu Aug 27 16:36:39 2015 (r287215) +++ head/kerberos5/Makefile.inc Thu Aug 27 17:16:18 2015 (r287216) @@ -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) Modified: head/kerberos5/libexec/digest-service/Makefile ============================================================================== --- head/kerberos5/libexec/digest-service/Makefile Thu Aug 27 16:36:39 2015 (r287215) +++ head/kerberos5/libexec/digest-service/Makefile Thu Aug 27 17:16:18 2015 (r287216) @@ -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> Modified: head/kerberos5/libexec/kdc/Makefile ============================================================================== --- head/kerberos5/libexec/kdc/Makefile Thu Aug 27 16:36:39 2015 (r287215) +++ head/kerberos5/libexec/kdc/Makefile Thu Aug 27 17:16:18 2015 (r287216) @@ -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> Modified: head/kerberos5/usr.bin/kpasswd/Makefile ============================================================================== --- head/kerberos5/usr.bin/kpasswd/Makefile Thu Aug 27 16:36:39 2015 (r287215) +++ head/kerberos5/usr.bin/kpasswd/Makefile Thu Aug 27 17:16:18 2015 (r287216) @@ -3,6 +3,7 @@ PROG= kpasswd CFLAGS+=-I${KRB5DIR}/lib/roken LIBADD= hdb krb5 roken vers crypto +LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> Modified: head/kerberos5/usr.sbin/iprop-log/Makefile ============================================================================== --- head/kerberos5/usr.sbin/iprop-log/Makefile Thu Aug 27 16:36:39 2015 (r287215) +++ head/kerberos5/usr.sbin/iprop-log/Makefile Thu Aug 27 17:16:18 2015 (r287216) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508271716.t7RHGJuF053217>