abstract out depenecy tracking for tools

This commit is contained in:
Love Hornquist Astrand
2009-09-16 05:40:55 -07:00
parent 6505961801
commit 3d7488398a
5 changed files with 24 additions and 16 deletions

View File

@@ -70,13 +70,21 @@ AM_CONDITIONAL(CROSS_COMPILE, test "${cross_compiling}" = yes)
if test "${cross_compiling}" != yes ; then
ASN1_COMPILE="\$(top_builddir)/lib/asn1/asn1_compile\$(EXEEXT)"
SLC="\$(top_builddir)/lib/sl/slc"
ASN1_COMPILE_DEP="\$(ASN1_COMPILE_DEP)"
SLC_DEP="\$(SLC)"
else
ASN1_COMPILE="asn1_compile"
SLC="slc"
ASN1_COMPILE_DEP=
SLC_DEP=
fi
AC_SUBST([ASN1_COMPILE])
AC_SUBST([ASN1_COMPILE_DEP])
AC_SUBST([SLC])
AC_SUBST([SLC_DEP])
dnl ---

View File

@@ -595,34 +595,34 @@ $(gen_files_rfc2459) rfc2459_asn1.hx: rfc2459_asn1_files
$(gen_files_cms) cms_asn1.hx: cms_asn1_files
$(gen_files_test) test_asn1.hx: test_asn1_files
rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1
rfc2459_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/rfc2459.asn1
$(ASN1_COMPILE) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)
cms_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/cms.asn1 $(srcdir)/cms.opt
cms_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/cms.asn1 $(srcdir)/cms.opt
$(ASN1_COMPILE) --option-file=$(srcdir)/cms.opt $(srcdir)/cms.asn1 cms_asn1 || (rm -f cms_asn1_files ; exit 1)
krb5_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/krb5.asn1 $(srcdir)/krb5.opt
krb5_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/krb5.asn1 $(srcdir)/krb5.opt
$(ASN1_COMPILE) --option-file=$(srcdir)/krb5.opt $(srcdir)/krb5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
pkinit_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkinit.asn1
pkinit_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/pkinit.asn1
$(ASN1_COMPILE) $(srcdir)/pkinit.asn1 pkinit_asn1 || (rm -f pkinit_asn1_files ; exit 1)
pkcs8_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs8.asn1
pkcs8_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/pkcs8.asn1
$(ASN1_COMPILE) $(srcdir)/pkcs8.asn1 pkcs8_asn1 || (rm -f pkcs8_asn1_files ; exit 1)
pkcs9_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs9.asn1
pkcs9_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/pkcs9.asn1
$(ASN1_COMPILE) $(srcdir)/pkcs9.asn1 pkcs9_asn1 || (rm -f pkcs9_asn1_files ; exit 1)
pkcs12_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/pkcs12.asn1
pkcs12_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/pkcs12.asn1
$(ASN1_COMPILE) $(srcdir)/pkcs12.asn1 pkcs12_asn1 || (rm -f pkcs12_asn1_files ; exit 1)
digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1
digest_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/digest.asn1
$(ASN1_COMPILE) $(srcdir)/digest.asn1 digest_asn1 || (rm -f digest_asn1_files ; exit 1)
kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1
kx509_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/kx509.asn1
$(ASN1_COMPILE) $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1)
test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1
test_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/test.asn1
$(ASN1_COMPILE) --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1)
EXTRA_DIST = \

View File

@@ -261,10 +261,10 @@ CLEANFILES = $(BUILT_SOURCES) \
$(spnego_files) spnego_asn1.hx: spnego_asn1_files
$(gssapi_files) gssapi_asn1.hx: gssapi_asn1_files
spnego_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/spnego/spnego.asn1 $(srcdir)/spnego/spnego.opt
spnego_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/spnego/spnego.asn1 $(srcdir)/spnego/spnego.opt
$(ASN1_COMPILE) --option-file=$(srcdir)/spnego/spnego.opt $(srcdir)/spnego/spnego.asn1 spnego_asn1
gssapi_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/mech/gssapi.asn1
gssapi_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/mech/gssapi.asn1
$(ASN1_COMPILE) $(srcdir)/mech/gssapi.asn1 gssapi_asn1
$(srcdir)/krb5/gsskrb5-private.h:

View File

@@ -108,7 +108,7 @@ $(srcdir)/hdb-private.h:
$(gen_files_hdb) hdb_asn1.h: hdb_asn1_files
hdb_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1
hdb_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/hdb.asn1
$(ASN1_COMPILE) $(srcdir)/hdb.asn1 hdb_asn1
$(libhdb_la_OBJECTS): hdb_asn1.h hdb_err.h

View File

@@ -114,13 +114,13 @@ $(gen_files_ocsp) ocsp_asn1.h: ocsp_asn1_files
$(gen_files_pkcs10) pkcs10_asn1.h: pkcs10_asn1_files
$(gen_files_crmf) crmf_asn1.h: crmf_asn1_files
ocsp_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/ocsp.asn1
ocsp_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/ocsp.asn1
$(ASN1_COMPILE) --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData $(srcdir)/ocsp.asn1 ocsp_asn1 || (rm -f ocsp_asn1_files ; exit 1)
pkcs10_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/pkcs10.asn1
pkcs10_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/pkcs10.asn1
$(ASN1_COMPILE) --preserve-binary=CertificationRequestInfo $(srcdir)/pkcs10.asn1 pkcs10_asn1 || (rm -f pkcs10_asn1_files ; exit 1)
crmf_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/crmf.asn1
crmf_asn1_files: $(ASN1_COMPILE_DEP) $(srcdir)/crmf.asn1
$(ASN1_COMPILE) $(srcdir)/crmf.asn1 crmf_asn1 || (rm -f crmf_asn1_files ; exit 1)
$(libhx509_la_OBJECTS): $(srcdir)/hx509-protos.h $(srcdir)/hx509-private.h $(srcdir)/hx_locl.h