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

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

diff --git a/asn1/cms/Makefile.common b/asn1/cms/Makefile.common
index bafa638a88f5a94359284d57194a42bb87784ea9..35b9a4737b1e0a592a33ffb1eeb0ce757c302336 100644 (file)
--- a/asn1/cms/Makefile.common
+++ b/asn1/cms/Makefile.common
@@ -22,21 +22,17 @@
 
 PROTOCOL_NAME=cms
 
-DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
-       packet-$(PROTOCOL_NAME).h
-
-NEED_PACKET_PROTO_H = 1
-
 EXPORT_FILES = \
        $(PROTOCOL_NAME)-exp.cnf
 
 EXT_ASN_FILE_LIST =
 
-ASN_FILE_LIST = CryptographicMessageSyntax.asn
+ASN_FILE_LIST = CryptographicMessageSyntax.asn AttributeCertificateVersion1.asn
 
 # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn
-# files do not exist # for all protocols: Please add/remove as required.
+# files do not exist for all protocols: Please add/remove as required.
 EXTRA_DIST = \
+       Makefile.nmake \
        $(ASN_FILE_LIST) \
        packet-$(PROTOCOL_NAME)-template.c \
        packet-$(PROTOCOL_NAME)-template.h \
@@ -46,15 +42,23 @@ SRC_FILES = \
        $(EXTRA_DIST) \
        $(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b -X -T -e
+A2W_FLAGS= -b -C
 
 EXTRA_CNF= \
-       ../x509af/x509af-exp.cnf \
-       ../x509if/x509if-exp.cnf
+       $(builddir)/../x509af/x509af-exp.cnf \
+       $(builddir)/../x509ce/x509ce-exp.cnf \
+       $(builddir)/../x509if/x509if-exp.cnf \
+       $(builddir)/../x509sat/x509sat-exp.cnf
+
+$(builddir)/../x509af/x509af-exp.cnf:
+       (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+       (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
 
-../x509af/x509af-exp.cnf:
-       (cd ../x509af && $(MAKE_CNF_EXPORT))
+$(builddir)/../x509if/x509if-exp.cnf:
+       (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
 
-../x509if/x509if-exp.cnf:
-       (cd ../x509if && $(MAKE_CNF_EXPORT))
+$(builddir)/../x509sat/x509sat-exp.cnf:
+       (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))