Don't generate the conformance file for exported types when building the

[obnox/wireshark/wip.git] / asn1 / pkcs12 / Makefile.common

diff --git a/asn1/pkcs12/Makefile.common b/asn1/pkcs12/Makefile.common
index abedcd4bc8f1cf0581435e274a224a36ed56c7c0..ba2578f669e4b606ae47cd10e770004796c854be 100644 (file)
--- a/asn1/pkcs12/Makefile.common
+++ b/asn1/pkcs12/Makefile.common
@@ -22,11 +22,6 @@
 
 PROTOCOL_NAME=pkcs12
 
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
-       packet-$(PROTOCOL_NAME).h
-
-NEED_PACKET_PROTO_H = 1
-
 EXT_ASN_FILE_LIST =
 
 ASN_FILE_LIST = $(PROTOCOL_NAME).asn
@@ -44,19 +39,20 @@ SRC_FILES = \
        $(EXTRA_DIST) \
        $(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -e
+A2W_FLAGS= -b
 
+# 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
+       $(builddir)/../x509if/x509if-exp.cnf  \
+       $(builddir)/../x509af/x509af-exp.cnf \
+       $(builddir)/../cms/cms-exp.cnf
 
-../cms/cms-exp.cnf:
-       (cd ../cms && $(MAKE_CNF_EXPORT))
+$(builddir)/../cms/cms-exp.cnf:
+       (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
 
-../x509af/x509af-exp.cnf:
-       (cd ../x509af && $(MAKE_CNF_EXPORT))
+$(builddir)/../x509af/x509af-exp.cnf:
+       (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
 
-../x509if/x509if-exp.cnf:
-       (cd ../x509if && $(MAKE_CNF_EXPORT))
+$(builddir)/../x509if/x509if-exp.cnf:
+       (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))