diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-10-15 12:21:30 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-10-15 12:21:30 +0000 |
| commit | cbffbc775d2288ed95edb26249557b8f74af21fb (patch) | |
| tree | 33a26db5f9611a30c36ff2aa114f7d3b7fca7bde /asn1 | |
| parent | b4ed21c3e601473865b5b4faa927dd6e0f8706f2 (diff) | |
| download | wireshark-cbffbc775d2288ed95edb26249557b8f74af21fb.tar.gz wireshark-cbffbc775d2288ed95edb26249557b8f74af21fb.tar.bz2 wireshark-cbffbc775d2288ed95edb26249557b8f74af21fb.zip | |
use the -E asn2wrs option to create exported cnf file
svn path=/trunk/; revision=23182
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/Makefile.inc | 12 | ||||
| -rw-r--r-- | asn1/Makefile.inc.nmake | 16 |
2 files changed, 26 insertions, 2 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/ diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake index 04bf2e0c4d..7ca91b2438 100644 --- a/asn1/Makefile.inc.nmake +++ b/asn1/Makefile.inc.nmake @@ -36,7 +36,7 @@ generate_export: $(EXPORT_FILES) PROTO_OPT = -p $(PROTOCOL_NAME) !ENDIF -$(DISSECTOR_FILES) $(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CNF) !IFDEF PYTHON $(PYTHON) "../../tools/asn2wrs.py" \ $(A2W_FLAGS) \ @@ -49,6 +49,20 @@ $(DISSECTOR_FILES) $(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_ @exit 1 !ENDIF +!IFDEF EXPORT_FILES +$(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) +!IFDEF PYTHON + $(PYTHON) "../../tools/asn2wrs.py" \ + -E $(A2W_FLAGS) \ + $(PROTO_OPT) \ + -c $(PROTOCOL_NAME).cnf \ + $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE) +!ELSE + @echo Error: You need Python to use asn2wrs.py + @exit 1 +!ENDIF +!ENDIF + clean: rm -f parsetab.py \ parsetab.pyc \ |