From Stig Bjorlykke:

This patch fixes building x420 with ftbp on Unix platform and adds
ftbp.asn to the tarball.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22190 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/Makefile.am b/asn1/Makefile.am
index 5021c8fc71636e4a4f9accd15e8ba3655d0e84c6..8cd8c5792365e401673dc545c144b77944d8ec93 100644 (file)
--- a/asn1/Makefile.am
+++ b/asn1/Makefile.am
@@ -418,6 +418,7 @@ EXTRA_DIST = \
        x420/packet-x420-template.c     \
        x420/packet-x420-template.h     \
        x420/x420.asn   \
        x420/packet-x420-template.c     \
        x420/packet-x420-template.h     \
        x420/x420.asn   \

+       x420/ftbp.asn   \

        x420/x420.cnf   \
        x420/x420-exp.cnf       \
        x509af/AuthenticationFramework.asn      \
        x420/x420.cnf   \
        x420/x420-exp.cnf       \
        x509af/AuthenticationFramework.asn      \

diff --git a/asn1/x420/Makefile b/asn1/x420/Makefile
index 5fe5006adb880744fe4b349583a29fb5a2e49a52..0b06e127bc9357c0325e31aeaae42b50252ae3e5 100644 (file)
--- a/asn1/x420/Makefile
+++ b/asn1/x420/Makefile
@@ -2,12 +2,14 @@
 
 DISSECTOR_FILES=packet-x420.c packet-x420.h
 
 
 DISSECTOR_FILES=packet-x420.c packet-x420.h
 

+ASN_FILE_LIST=x420.asn ftbp.asn
+

 all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 
 all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 

-$(DISSECTOR_FILES): ../../tools/asn2wrs.py x420.asn packet-x420-template.c packet-x420-template.h x420.cnf
-       python ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template  x420.asn
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN_FILE_LIST) packet-x420-template.c packet-x420-template.h x420.cnf
+       python ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template $(ASN_FILE_LIST) 

 
 clean:
        rm -f parsetab.py $(DISSECTOR_FILES)
 
 clean:
        rm -f parsetab.py $(DISSECTOR_FILES)

diff --git a/asn1/x420/Makefile.nmake b/asn1/x420/Makefile.nmake
index 955a907bea6c320ae126c3875e3926ffa91067c8..6c9dd271ebb67008dd6351b10f97f8aeea6dc35e 100644 (file)
--- a/asn1/x420/Makefile.nmake
+++ b/asn1/x420/Makefile.nmake
@@ -15,7 +15,7 @@ all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 
 
 generate_dissector: $(DISSECTOR_FILES)
 

-$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN_FILE_LIST) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf

 !IFDEF PYTHON
        $(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(ASN_FILE_LIST)
 !ELSE
 !IFDEF PYTHON
        $(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(ASN_FILE_LIST)
 !ELSE