diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-04-06 20:22:19 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-04-06 20:22:19 +0000 |
| commit | 435cee1738898c136aa15056721fa876d6dc26cd (patch) | |
| tree | ce15c2ed38445061fb6d6c487d944a245d2e43ea /asn1 | |
| parent | 5a4b1edf4cbe3398defe97107ffb3ab46e50c98b (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32409 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
| -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)) |