From 2948183cecb2c3c741ea780cb8088a16f6c94ea3 Mon Sep 17 00:00:00 2001 From: obrien Date: Fri, 1 Jun 2012 21:26:28 +0000 Subject: Centralize the specification of the krb5 build tools. --- kerberos5/Makefile.inc | 4 ++++ kerberos5/lib/libasn1/Makefile | 2 -- kerberos5/lib/libgssapi_spnego/Makefile | 2 -- kerberos5/lib/libhdb/Makefile | 2 -- kerberos5/lib/libhx509/Makefile | 2 -- kerberos5/lib/libroken/Makefile | 2 -- kerberos5/lib/libvers/Makefile | 2 -- kerberos5/libexec/kdigest/Makefile | 2 +- kerberos5/tools/slc/Makefile | 2 +- kerberos5/usr.bin/hxtool/Makefile | 2 +- kerberos5/usr.bin/kadmin/Makefile | 2 +- kerberos5/usr.bin/kcc/Makefile | 2 +- kerberos5/usr.sbin/iprop-log/Makefile | 2 +- kerberos5/usr.sbin/ktutil/Makefile | 2 +- 14 files changed, 11 insertions(+), 19 deletions(-) (limited to 'kerberos5') diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 5dc86c2..51cfe34 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -46,3 +46,7 @@ CLEANFILES+= ${_ET}.h ${_ET}.c .endfor .endif # defined(SRCS) + +ASN1_COMPILE= asn1_compile +MAKE_ROKEN= make-roken +SLC= slc diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile index 529e557..94c79db 100644 --- a/kerberos5/lib/libasn1/Makefile +++ b/kerberos5/lib/libasn1/Makefile @@ -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 diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile index 77e5258..00d299e 100644 --- a/kerberos5/lib/libgssapi_spnego/Makefile +++ b/kerberos5/lib/libgssapi_spnego/Makefile @@ -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 diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index ce8189e..87a72dd 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -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 diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile index 3fa707e..469950a 100644 --- a/kerberos5/lib/libhx509/Makefile +++ b/kerberos5/lib/libhx509/Makefile @@ -269,8 +269,6 @@ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} ocsp_asn1_files \ 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 diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index 29e3082..cf9368b 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -82,8 +82,6 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= roken.h -MAKE_ROKEN= make-roken - roken.h: ${MAKE_ROKEN} > ${.TARGET} diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile index a08ddb4..cef5a88 100644 --- a/kerberos5/lib/libvers/Makefile +++ b/kerberos5/lib/libvers/Makefile @@ -7,8 +7,6 @@ CFLAGS+=-I. -I${KRB5DIR}/lib/roken CLEANFILES= roken.h -MAKE_ROKEN= make-roken - roken.h: ${MAKE_ROKEN} > ${.TARGET} diff --git a/kerberos5/libexec/kdigest/Makefile b/kerberos5/libexec/kdigest/Makefile index b4d7d55..c88e3b9 100644 --- a/kerberos5/libexec/kdigest/Makefile +++ b/kerberos5/libexec/kdigest/Makefile @@ -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 diff --git a/kerberos5/tools/slc/Makefile b/kerberos5/tools/slc/Makefile index c6f0d35..6e909d9 100644 --- a/kerberos5/tools/slc/Makefile +++ b/kerberos5/tools/slc/Makefile @@ -15,7 +15,7 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I${KRB5DIR}/lib/vers -I. CLEANFILES= roken.h roken.h: - make-roken > ${.TARGET} + ${MAKE_ROKEN} > ${.TARGET} # ${.OBJDIR}/../make-roken/make-roken > ${.TARGET} diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile index 92268c0..c8ebf9a 100644 --- a/kerberos5/usr.bin/hxtool/Makefile +++ b/kerberos5/usr.bin/hxtool/Makefile @@ -11,7 +11,7 @@ LDADD= -lhx509 -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} ${LIBVERS} -ledit 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 diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index 637ce7f..c04ad36 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -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 diff --git a/kerberos5/usr.bin/kcc/Makefile b/kerberos5/usr.bin/kcc/Makefile index f1d053c..3da43d7 100644 --- a/kerberos5/usr.bin/kcc/Makefile +++ b/kerberos5/usr.bin/kcc/Makefile @@ -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 diff --git a/kerberos5/usr.sbin/iprop-log/Makefile b/kerberos5/usr.sbin/iprop-log/Makefile index 2ff4b8b..176012a 100644 --- a/kerberos5/usr.sbin/iprop-log/Makefile +++ b/kerberos5/usr.sbin/iprop-log/Makefile @@ -14,7 +14,7 @@ LDADD= -lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \ ${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 diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index 0b258a3..f7d340f 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -25,7 +25,7 @@ LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \ .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 -- cgit v1.1