aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/Makefile.inc
diff options
context:
space:
mode:
authorkukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7>2007-10-15 12:21:30 +0000
committerkukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7>2007-10-15 12:21:30 +0000
commit4f80a600aa6acb84118f6e4770294c3835b49b17 (patch)
tree33a26db5f9611a30c36ff2aa114f7d3b7fca7bde /asn1/Makefile.inc
parent41fc3889c1a7b87834559b282a9b7aac6f96f4f7 (diff)
use the -E asn2wrs option to create exported cnf file
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23182 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/Makefile.inc')
-rw-r--r--asn1/Makefile.inc12
1 files changed, 11 insertions, 1 deletions
diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc
index 261aa3567f..078d180b27 100644
--- a/asn1/Makefile.inc
+++ b/asn1/Makefile.inc
@@ -29,7 +29,7 @@ generate_export: $(EXPORT_FILES)
PROTO_OPT ?= -p $(PROTOCOL_NAME)
-$(DISSECTOR_FILES) $(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
+$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CNF)
python $(top_srcdir)/tools/asn2wrs.py \
$(A2W_FLAGS) \
$(PROTO_OPT) \
@@ -38,6 +38,16 @@ $(DISSECTOR_FILES) $(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES)
-D $(srcdir) \
$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
+ifdef EXPORT_FILES
+$(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
+ python $(top_srcdir)/tools/asn2wrs.py \
+ -E $(A2W_FLAGS) \
+ $(PROTO_OPT) \
+ -c $(srcdir)/$(PROTOCOL_NAME).cnf \
+ -D $(srcdir) \
+ $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
+endif
+
copy_files: generate_dissector
cp $(DISSECTOR_FILES) $(top_srcdir)/epan/dissectors/