summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-18 19:12:00 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-18 19:12:00 +0200
commitadc84e12865115f15df01676b2040d9e06cafa2c (patch)
tree89a45b9c706b25cff55575e7f2760b9424ae5486
parentddfc4380adc46a7c004ebc35da32e491ea39184a (diff)
parentc9d7ebcc0e0ed4de6c5252ed005f89fc473f6dc1 (diff)
downloadsamba-adc84e12865115f15df01676b2040d9e06cafa2c.tar.gz
samba-adc84e12865115f15df01676b2040d9e06cafa2c.tar.bz2
samba-adc84e12865115f15df01676b2040d9e06cafa2c.zip
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit 3cff5bc25ad894bef6ed65566d9d692968092760)
-rw-r--r--source4/heimdal_build/config.mk46
1 files changed, 23 insertions, 23 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 78b26093e5..ea9deb6ada 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -557,33 +557,33 @@ compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \
./heimdal_build/replace.ho
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/hdb/hdb.asn1 hdb_asn1 $(heimdalsrcdir)/lib/hdb |
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/gssapi/spnego/spnego.asn1 spnego_asn1 $(heimdalsrcdir)/lib/gssapi --sequence=MechTypeList |
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/gssapi/mech/gssapi.asn1 gssapi_asn1 $(heimdalsrcdir)/lib/gssapi|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/asn1/k5.asn1 krb5_asn1 $(heimdalsrcdir)/lib/asn1 --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/asn1/digest.asn1 digest_asn1 $(heimdalsrcdir)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/asn1/pkcs8.asn1 pkcs8_asn1 $(heimdalsrcdir)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/asn1/pkcs9.asn1 pkcs9_asn1 $(heimdalsrcdir)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/asn1/pkcs12.asn1 pkcs12_asn1 $(heimdalsrcdir)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/asn1/rfc2459.asn1 rfc2459_asn1 $(heimdalsrcdir)/lib/asn1 --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/asn1/pkinit.asn1 pkinit_asn1 $(heimdalsrcdir)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/asn1/CMS.asn1 cms_asn1 $(heimdalsrcdir)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/hx509/ocsp.asn1 ocsp_asn1 $(heimdalsrcdir)/lib/hx509 --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/asn1/kx509.asn1 kx509_asn1 $(heimdalsrcdir)/lib/asn1|
-mkinclude perl_path_wrapper.sh asn1_deps.pl $(heimdalsrcdir)/lib/hx509/pkcs10.asn1 pkcs10_asn1 $(heimdalsrcdir)/lib/hx509 --preserve-binary=CertificationRequestInfo|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/hdb/hdb.asn1 hdb_asn1 heimdal//lib/hdb |
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/gssapi/spnego/spnego.asn1 spnego_asn1 heimdal//lib/gssapi --sequence=MechTypeList |
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/gssapi/mech/gssapi.asn1 gssapi_asn1 heimdal//lib/gssapi|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/asn1/k5.asn1 krb5_asn1 heimdal//lib/asn1 --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/asn1/digest.asn1 digest_asn1 heimdal//lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/asn1/pkcs8.asn1 pkcs8_asn1 heimdal//lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/asn1/pkcs9.asn1 pkcs9_asn1 heimdal//lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/asn1/pkcs12.asn1 pkcs12_asn1 heimdal//lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/asn1/rfc2459.asn1 rfc2459_asn1 heimdal//lib/asn1 --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/asn1/pkinit.asn1 pkinit_asn1 heimdal//lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/asn1/CMS.asn1 cms_asn1 heimdal//lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/hx509/ocsp.asn1 ocsp_asn1 heimdal//lib/hx509 --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/asn1/kx509.asn1 kx509_asn1 heimdal//lib/asn1|
+mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal//lib/hx509/pkcs10.asn1 pkcs10_asn1 heimdal//lib/hx509 --preserve-binary=CertificationRequestInfo|
#
# Ensure to update ./static_deps.mk when you add a new entry here!
#
-mkinclude perl_path_wrapper.sh et_deps.pl $(heimdalsrcdir)/lib/asn1/asn1_err.et $(heimdalsrcdir)/lib/asn1|
-mkinclude perl_path_wrapper.sh et_deps.pl $(heimdalsrcdir)/lib/hdb/hdb_err.et $(heimdalsrcdir)/lib/hdb|
-mkinclude perl_path_wrapper.sh et_deps.pl $(heimdalsrcdir)/lib/krb5/heim_err.et $(heimdalsrcdir)/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl $(heimdalsrcdir)/lib/krb5/k524_err.et $(heimdalsrcdir)/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl $(heimdalsrcdir)/lib/krb5/krb_err.et $(heimdalsrcdir)/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl $(heimdalsrcdir)/lib/krb5/krb5_err.et $(heimdalsrcdir)/lib/krb5|
-mkinclude perl_path_wrapper.sh et_deps.pl $(heimdalsrcdir)/lib/gssapi/krb5/gkrb5_err.et $(heimdalsrcdir)/lib/gssapi|
-mkinclude perl_path_wrapper.sh et_deps.pl $(heimdalsrcdir)/lib/hx509/hx509_err.et $(heimdalsrcdir)/lib/hx509|
-mkinclude perl_path_wrapper.sh et_deps.pl $(heimdalsrcdir)/lib/wind/wind_err.et $(heimdalsrcdir)/lib/wind|
+mkinclude perl_path_wrapper.sh et_deps.pl heimdal//lib/asn1/asn1_err.et heimdal//lib/asn1|
+mkinclude perl_path_wrapper.sh et_deps.pl heimdal//lib/hdb/hdb_err.et heimdal//lib/hdb|
+mkinclude perl_path_wrapper.sh et_deps.pl heimdal//lib/krb5/heim_err.et heimdal//lib/krb5|
+mkinclude perl_path_wrapper.sh et_deps.pl heimdal//lib/krb5/k524_err.et heimdal//lib/krb5|
+mkinclude perl_path_wrapper.sh et_deps.pl heimdal//lib/krb5/krb_err.et heimdal//lib/krb5|
+mkinclude perl_path_wrapper.sh et_deps.pl heimdal//lib/krb5/krb5_err.et heimdal//lib/krb5|
+mkinclude perl_path_wrapper.sh et_deps.pl heimdal//lib/gssapi/krb5/gkrb5_err.et heimdal//lib/gssapi|
+mkinclude perl_path_wrapper.sh et_deps.pl heimdal//lib/hx509/hx509_err.et heimdal//lib/hx509|
+mkinclude perl_path_wrapper.sh et_deps.pl heimdal//lib/wind/wind_err.et heimdal//lib/wind|
clean::
@-rm -f bin/compile_et bin/asn1_compile