aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2007-10-07 20:11:09 +0000
committerJörg Mayer <jmayer@loplof.de>2007-10-07 20:11:09 +0000
commit6168303813a4d5c7e66881cda72f19b683ba1fbc (patch)
tree354c2e60ce4f40000c9a354a46c4c7235364a7a2 /asn1
parent4a5f7e88a7f9972f9e853c9a6750ec5f795c088b (diff)
Swap order of external and local sources
svn path=/trunk/; revision=23084
Diffstat (limited to 'asn1')
-rw-r--r--asn1/Makefile.inc2
-rw-r--r--asn1/Makefile.inc.nmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/asn1/Makefile.inc b/asn1/Makefile.inc
index a5900c0563..0de7664fc4 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) \
- $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST)
+ $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST)
copy_files: generate_dissector
cp $(DISSECTOR_FILES) $(top_srcdir)/epan/dissectors/
diff --git a/asn1/Makefile.inc.nmake b/asn1/Makefile.inc.nmake
index 00fc8d49c6..4c3e995250 100644
--- a/asn1/Makefile.inc.nmake
+++ b/asn1/Makefile.inc.nmake
@@ -41,7 +41,7 @@ $(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
$(PROTO_OPT) \
-c $(PROTOCOL_NAME).cnf \
-s packet-$(PROTOCOL_NAME)-template \
- $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST)
+ $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST)
!ELSE
@echo Error: You need Python to use asn2wrs.py
@exit 1