From owner-svn-src-user@FreeBSD.ORG Thu May 31 23:22:01 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1868D106566C; Thu, 31 May 2012 23:22:01 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F19A58FC14; Thu, 31 May 2012 23:22:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4VNM0r9070044; Thu, 31 May 2012 23:22:00 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4VNM05j070032; Thu, 31 May 2012 23:22:00 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201205312322.q4VNM05j070032@svn.freebsd.org> From: "David E. O'Brien" Date: Thu, 31 May 2012 23:22:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236370 - in user/obrien/krb5bld/kerberos5: . lib/libasn1 lib/libgssapi_spnego lib/libhdb lib/libhx509 libexec/kdigest usr.bin/hxtool usr.bin/kadmin usr.bin/kcc usr.sbin/iprop-log usr.s... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 May 2012 23:22:01 -0000 Author: obrien Date: Thu May 31 23:22:00 2012 New Revision: 236370 URL: http://svn.freebsd.org/changeset/base/236370 Log: Centralize the specification of the krb5 build tools, and do not depend on them being in $PATH. Modified: user/obrien/krb5bld/kerberos5/Makefile.inc user/obrien/krb5bld/kerberos5/lib/libasn1/Makefile user/obrien/krb5bld/kerberos5/lib/libgssapi_spnego/Makefile user/obrien/krb5bld/kerberos5/lib/libhdb/Makefile user/obrien/krb5bld/kerberos5/lib/libhx509/Makefile user/obrien/krb5bld/kerberos5/libexec/kdigest/Makefile user/obrien/krb5bld/kerberos5/usr.bin/hxtool/Makefile user/obrien/krb5bld/kerberos5/usr.bin/kadmin/Makefile user/obrien/krb5bld/kerberos5/usr.bin/kcc/Makefile user/obrien/krb5bld/kerberos5/usr.sbin/iprop-log/Makefile user/obrien/krb5bld/kerberos5/usr.sbin/ktutil/Makefile Modified: user/obrien/krb5bld/kerberos5/Makefile.inc ============================================================================== --- user/obrien/krb5bld/kerberos5/Makefile.inc Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/Makefile.inc Thu May 31 23:22:00 2012 (r236370) @@ -46,3 +46,6 @@ CLEANFILES+= ${_ET}.h ${_ET}.c .endfor .endif # defined(SRCS) + +ASN1_COMPILE= ../../tools/asn1_compile/asn1_compile +SLC= ../../tools/slc/slc Modified: user/obrien/krb5bld/kerberos5/lib/libasn1/Makefile ============================================================================== --- user/obrien/krb5bld/kerberos5/lib/libasn1/Makefile Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/lib/libasn1/Makefile Thu May 31 23:22:00 2012 (r236370) @@ -56,8 +56,6 @@ INCS+= krb5_asn1.h \ digest_asn1.h \ kx509_asn1.h -ASN1_COMPILE= asn1_compile - ${GEN_CMS}: cms.asn1 cms.opt ${ASN1_COMPILE} --one-code-file \ --option-file=${.ALLSRC:M*.opt} ${.ALLSRC:M*.asn1} cms_asn1 Modified: user/obrien/krb5bld/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- user/obrien/krb5bld/kerberos5/lib/libgssapi_spnego/Makefile Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/lib/libgssapi_spnego/Makefile Thu May 31 23:22:00 2012 (r236370) @@ -38,8 +38,6 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ spnego_asn1_files spnego_asn1-template.c -ASN1_COMPILE= asn1_compile - ${GEN}: spnego.asn1 spnego.opt ${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \ ${.ALLSRC:M*.asn1} spnego_asn1 Modified: user/obrien/krb5bld/kerberos5/lib/libhdb/Makefile ============================================================================== --- user/obrien/krb5bld/kerberos5/lib/libhdb/Makefile Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/lib/libhdb/Makefile Thu May 31 23:22:00 2012 (r236370) @@ -84,8 +84,6 @@ GEN= asn1_Salt.x \ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} hdb_asn1_files \ hdb_asn1-template.[ch]* -ASN1_COMPILE= asn1_compile - ${GEN}: hdb.asn1 ${ASN1_COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1 Modified: user/obrien/krb5bld/kerberos5/lib/libhx509/Makefile ============================================================================== --- user/obrien/krb5bld/kerberos5/lib/libhx509/Makefile Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/lib/libhx509/Makefile Thu May 31 23:22:00 2012 (r236370) @@ -269,8 +269,6 @@ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx INCS+= ocsp_asn1.h pkcs10_asn1.h crmf_asn1.h -ASN1_COMPILE= asn1_compile - ${GEN_OCSP}: ocsp.asn1 ocsp.opt ${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \ ${.ALLSRC:M*.asn1} ocsp_asn1 Modified: user/obrien/krb5bld/kerberos5/libexec/kdigest/Makefile ============================================================================== --- user/obrien/krb5bld/kerberos5/libexec/kdigest/Makefile Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/libexec/kdigest/Makefile Thu May 31 23:22:00 2012 (r236370) @@ -14,7 +14,7 @@ SRCS= kdigest.c \ kdigest-commands.h kdigest-commands.h: kdigest-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in c o kdigest-commands.${ext}: kdigest-commands.h Modified: user/obrien/krb5bld/kerberos5/usr.bin/hxtool/Makefile ============================================================================== --- user/obrien/krb5bld/kerberos5/usr.bin/hxtool/Makefile Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/usr.bin/hxtool/Makefile Thu May 31 23:22:00 2012 (r236370) @@ -11,7 +11,7 @@ LDADD= -lhx509 -lroken -lasn1 -lcrypto - SRCS= hxtool.c hxtool-commands.c hxtool-commands.h hxtool-commands.h: hxtool-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in c o hxtool-commands.${ext}: hxtool-commands.h Modified: user/obrien/krb5bld/kerberos5/usr.bin/kadmin/Makefile ============================================================================== --- user/obrien/krb5bld/kerberos5/usr.bin/kadmin/Makefile Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/usr.bin/kadmin/Makefile Thu May 31 23:22:00 2012 (r236370) @@ -39,7 +39,7 @@ LDFLAGS=${LDAPLDFLAGS} .include kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in o c kadmin-commands.${ext}: kadmin-commands.h Modified: user/obrien/krb5bld/kerberos5/usr.bin/kcc/Makefile ============================================================================== --- user/obrien/krb5bld/kerberos5/usr.bin/kcc/Makefile Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/usr.bin/kcc/Makefile Thu May 31 23:22:00 2012 (r236370) @@ -20,7 +20,7 @@ SRCS= kcc.c \ copy_cred_cache.c kcc-commands.h: kcc-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in c o kcc-commands.${ext}: kcc-commands.h Modified: user/obrien/krb5bld/kerberos5/usr.sbin/iprop-log/Makefile ============================================================================== --- user/obrien/krb5bld/kerberos5/usr.sbin/iprop-log/Makefile Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/usr.sbin/iprop-log/Makefile Thu May 31 23:22:00 2012 (r236370) @@ -14,7 +14,7 @@ LDADD= -lkadm5srv -lhdb -lkrb5 -lasn1 -l ${LIBVERS} -ledit iprop-commands.h: iprop-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in c o iprop-commands.${ext}: iprop-commands.h Modified: user/obrien/krb5bld/kerberos5/usr.sbin/ktutil/Makefile ============================================================================== --- user/obrien/krb5bld/kerberos5/usr.sbin/ktutil/Makefile Thu May 31 23:15:58 2012 (r236369) +++ user/obrien/krb5bld/kerberos5/usr.sbin/ktutil/Makefile Thu May 31 23:22:00 2012 (r236370) @@ -25,7 +25,7 @@ LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lrok .include ktutil-commands.h: ${KRB5DIR}/admin/ktutil-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in c o ktutil-commands.${ext}: ktutil-commands.h