From owner-svn-src-all@freebsd.org Thu Aug 27 17:16:21 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F29159C35F3; Thu, 27 Aug 2015 17:16:20 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6E40FCB; Thu, 27 Aug 2015 17:16:20 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7RHGKKY053224; Thu, 27 Aug 2015 17:16:20 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7RHGJuF053217; Thu, 27 Aug 2015 17:16:19 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201508271716.t7RHGJuF053217@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Thu, 27 Aug 2015 17:16:19 +0000 (UTC) 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 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Aug 2015 17:16:21 -0000 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 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 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 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}