Author: obrien
Date: Fri Jun 1 21:26:28 2012
New Revision: 236422
URL: http://svn.freebsd.org/changeset/base/236422
Log:
Centralize the specification of the krb5 build tools.
Modified:
head/kerberos5/Makefile.inc
head/kerberos5/lib/libasn1/Makefile
head/kerberos5/lib/libgssapi_spnego/Makefile
head/kerberos5/lib/libhdb/Makefile
head/kerberos5/lib/libhx509/Makefile
head/kerberos5/lib/libroken/Makefile
head/kerberos5/lib/libvers/Makefile
head/kerberos5/libexec/kdigest/Makefile
head/kerberos5/tools/slc/Makefile
head/kerberos5/usr.bin/hxtool/Makefile
head/kerberos5/usr.bin/kadmin/Makefile
head/kerberos5/usr.bin/kcc/Makefile
head/kerberos5/usr.sbin/iprop-log/Makefile
head/kerberos5/usr.sbin/ktutil/Makefile
Modified: head/kerberos5/Makefile.inc
==============================================================================
--- head/kerberos5/Makefile.inc Fri Jun 1 21:22:46 2012 (r236421)
+++ head/kerberos5/Makefile.inc Fri Jun 1 21:26:28 2012 (r236422)
@@ -46,3 +46,7 @@ CLEANFILES+= ${_ET}.h ${_ET}.c
.endfor
.endif # defined(SRCS)
+
+ASN1_COMPILE= asn1_compile
+MAKE_ROKEN= make-roken
+SLC= slc
Modified: head/kerberos5/lib/libasn1/Makefile
==============================================================================
--- head/kerberos5/lib/libasn1/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/lib/libasn1/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -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: head/kerberos5/lib/libgssapi_spnego/Makefile
==============================================================================
--- head/kerberos5/lib/libgssapi_spnego/Makefile Fri Jun 1 21:22:46
2012 (r236421)
+++ head/kerberos5/lib/libgssapi_spnego/Makefile Fri Jun 1 21:26:28
2012 (r236422)
@@ -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: head/kerberos5/lib/libhdb/Makefile
==============================================================================
--- head/kerberos5/lib/libhdb/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/lib/libhdb/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -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: head/kerberos5/lib/libhx509/Makefile
==============================================================================
--- head/kerberos5/lib/libhx509/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/lib/libhx509/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -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: head/kerberos5/lib/libroken/Makefile
==============================================================================
--- head/kerberos5/lib/libroken/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/lib/libroken/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -82,8 +82,6 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I.
CLEANFILES= roken.h
-MAKE_ROKEN= make-roken
-
roken.h:
${MAKE_ROKEN} > ${.TARGET}
Modified: head/kerberos5/lib/libvers/Makefile
==============================================================================
--- head/kerberos5/lib/libvers/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/lib/libvers/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -7,8 +7,6 @@ CFLAGS+=-I. -I${KRB5DIR}/lib/roken
CLEANFILES= roken.h
-MAKE_ROKEN= make-roken
-
roken.h:
${MAKE_ROKEN} > ${.TARGET}
Modified: head/kerberos5/libexec/kdigest/Makefile
==============================================================================
--- head/kerberos5/libexec/kdigest/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/libexec/kdigest/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -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: head/kerberos5/tools/slc/Makefile
==============================================================================
--- head/kerberos5/tools/slc/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/tools/slc/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -15,7 +15,7 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5D
CLEANFILES= roken.h
roken.h:
- make-roken > ${.TARGET}
+ ${MAKE_ROKEN} > ${.TARGET}
# ${.OBJDIR}/../make-roken/make-roken > ${.TARGET}
Modified: head/kerberos5/usr.bin/hxtool/Makefile
==============================================================================
--- head/kerberos5/usr.bin/hxtool/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/usr.bin/hxtool/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -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: head/kerberos5/usr.bin/kadmin/Makefile
==============================================================================
--- head/kerberos5/usr.bin/kadmin/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/usr.bin/kadmin/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -39,7 +39,7 @@ LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
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: head/kerberos5/usr.bin/kcc/Makefile
==============================================================================
--- head/kerberos5/usr.bin/kcc/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/usr.bin/kcc/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -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: head/kerberos5/usr.sbin/iprop-log/Makefile
==============================================================================
--- head/kerberos5/usr.sbin/iprop-log/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/usr.sbin/iprop-log/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -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: head/kerberos5/usr.sbin/ktutil/Makefile
==============================================================================
--- head/kerberos5/usr.sbin/ktutil/Makefile Fri Jun 1 21:22:46 2012
(r236421)
+++ head/kerberos5/usr.sbin/ktutil/Makefile Fri Jun 1 21:26:28 2012
(r236422)
@@ -25,7 +25,7 @@ LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lrok
.include <bsd.prog.mk>
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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
