diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-16 13:59:40 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-16 13:59:40 +0000 |
| commit | ca597cab1c373f288bdc581611ebd11bce25c8cd (patch) | |
| tree | 1bc554069aa8a26b7fc84961ac447b8fe7d120b4 /asn1/Makefile.inc | |
| parent | 0dd0c47e7ffc23eff584344fcf32d902c2e3b9c4 (diff) | |
- Fix svn:ignore for all directories
- gsmmap: uncomment -s option in gsmmap.cnf
- Fix cyclic dependencies:
+ Remove EXPORT_CNF from dependencies for cnf files
+ Replace all INCLUDE ...-exp.cnf with IMPORT ...-exp.cnf
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23202 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/Makefile.inc')
| -rw-r--r-- | asn1/Makefile.inc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc index 7b574a7226..2582fece7c 100644 --- a/asn1/Makefile.inc +++ b/asn1/Makefile.inc @@ -29,7 +29,7 @@ generate_export: $(EXPORT_FILES) PROTO_OPT ?= -p $(PROTOCOL_NAME) -$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CNF) +$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) python $(top_srcdir)/tools/asn2wrs.py \ $(A2W_FLAGS) \ $(PROTO_OPT) \ @@ -38,15 +38,13 @@ $(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(I -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 +$(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) + 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) copy_files: generate_dissector cp $(DISSECTOR_FILES) $(top_srcdir)/epan/dissectors/ @@ -56,5 +54,5 @@ CLEANFILES = \ parsetab.pyc \ $(DISSECTOR_FILES) \ *-exp.cnf \ - packet-*-{dis-tab,ettarr,ett,fn,hfarr,hf,table*,val}.[hc] + packet-*-{dis-tab,ettarr,ett,fn,hfarr,hf,table*,val,exp}.[hc] |