diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-04-06 20:22:19 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-04-06 20:22:19 +0000 |
| commit | 176c3040901dcae94e0d2e1fc0b58f75bc4a4fab (patch) | |
| tree | ce15c2ed38445061fb6d6c487d944a245d2e43ea /asn1/pkcs12 | |
| parent | b3ca18378d513290e23876d50446a164536750c6 (diff) | |
Try to fix Bug 4648 - pkcs12 ASN1 generated dissector differs from epan/dissectors version.
It's a pain to get these circular dependencies right.
svn path=/trunk/; revision=32409
Diffstat (limited to 'asn1/pkcs12')
| -rw-r--r-- | asn1/pkcs12/Makefile.common | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/asn1/pkcs12/Makefile.common b/asn1/pkcs12/Makefile.common index 5942c4aca8..7bcb22af22 100644 --- a/asn1/pkcs12/Makefile.common +++ b/asn1/pkcs12/Makefile.common @@ -45,10 +45,11 @@ SRC_FILES = \ A2W_FLAGS= -b -e +# Note the order here is important, cms needs at least x509af-exp to be generated first EXTRA_CNF= \ - ../cms/cms-exp.cnf \ - ../x509if/x509if-exp.cnf \ - ../x509af/x509af-exp.cnf + ../x509if/x509if-exp.cnf \ + ../x509af/x509af-exp.cnf \ + ../cms/cms-exp.cnf ../cms/cms-exp.cnf: (cd ../cms && $(MAKE_CNF_EXPORT)) |