diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-09 19:40:59 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-09 19:40:59 +0000 |
| commit | 03a3853329332fc9284f0317d175ed3f47e26472 (patch) | |
| tree | b0719c4ac23d19bcafc00daeb33ba55605604422 | |
| parent | d568c38d4c7ffa752f22b4aff653c55be007346e (diff) | |
Fix order of external files (without affecting other protos).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23121 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | asn1/Makefile.inc | 2 | ||||
| -rw-r--r-- | asn1/cmip/Makefile.common | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc index 0de7664fc4..1e090ec291 100644 --- a/asn1/Makefile.inc +++ b/asn1/Makefile.inc @@ -34,7 +34,7 @@ $(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) -c $(srcdir)/$(PROTOCOL_NAME).cnf \ -s $(srcdir)/packet-$(PROTOCOL_NAME)-template \ -D $(srcdir) \ - $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) + $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE) copy_files: generate_dissector cp $(DISSECTOR_FILES) $(top_srcdir)/epan/dissectors/ diff --git a/asn1/cmip/Makefile.common b/asn1/cmip/Makefile.common index 4be89d1eee..25354a6b70 100644 --- a/asn1/cmip/Makefile.common +++ b/asn1/cmip/Makefile.common @@ -27,10 +27,10 @@ DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \ NEED_PACKET_PROTO_H = 1 -EXT_ASN_FILE_LIST = \ +EXT_ASN_FILE_LIST_LATE = \ + ../x721/Attribute-ASN1Module.asn \ ../ros/Remote-Operations-Information-Objects.asn \ - ../ros/Remote-Operations-Generic-ROS-PDUs.asn \ - ../x721/Attribute-ASN1Module.asn + ../ros/Remote-Operations-Generic-ROS-PDUs.asn ASN_FILE_LIST = \ CMIP-1.asn \ |