aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/x420
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2007-06-25 19:40:37 +0000
committerStephen Fisher <steve@stephen-fisher.com>2007-06-25 19:40:37 +0000
commitd88d1ee31bd1c66fed49547cbadfd1fa187e3b82 (patch)
treeacd58c3881cd1392c3c2bee41cd5158c9794a7dc /asn1/x420
parentde9f69f58a9d8b95ec38d63841963aee46ec581a (diff)
From Stig Bjorlykke:
This patch fixes building x420 with ftbp on Unix platform and adds ftbp.asn to the tarball. svn path=/trunk/; revision=22190
Diffstat (limited to 'asn1/x420')
-rw-r--r--asn1/x420/Makefile6
-rw-r--r--asn1/x420/Makefile.nmake2
2 files changed, 5 insertions, 3 deletions
diff --git a/asn1/x420/Makefile b/asn1/x420/Makefile
index 5fe5006adb..0b06e127bc 100644
--- a/asn1/x420/Makefile
+++ b/asn1/x420/Makefile
@@ -2,12 +2,14 @@
DISSECTOR_FILES=packet-x420.c packet-x420.h
+ASN_FILE_LIST=x420.asn ftbp.asn
+
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)
diff --git a/asn1/x420/Makefile.nmake b/asn1/x420/Makefile.nmake
index 955a907bea..6c9dd271eb 100644
--- a/asn1/x420/Makefile.nmake
+++ b/asn1/x420/Makefile.nmake
@@ -15,7 +15,7 @@ all: generate_dissector
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