diff options
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/h248/Makefile | 2 | ||||
-rw-r--r-- | asn1/h450/Makefile | 3 | ||||
-rw-r--r-- | asn1/inap/Makefile | 4 | ||||
-rw-r--r-- | asn1/nbap/Makefile | 6 | ||||
-rw-r--r-- | asn1/ranap/Makefile | 6 | ||||
-rw-r--r-- | asn1/rnsap/Makefile | 8 | ||||
-rw-r--r-- | asn1/sabp/Makefile | 8 | ||||
-rw-r--r-- | asn1/snmp/Makefile | 2 | ||||
-rw-r--r-- | asn1/t38/Makefile | 6 |
9 files changed, 28 insertions, 17 deletions
diff --git a/asn1/h248/Makefile b/asn1/h248/Makefile index 7728ca74a5..3f84079e02 100644 --- a/asn1/h248/Makefile +++ b/asn1/h248/Makefile @@ -10,7 +10,7 @@ $(DISSECTOR_FILES): ../../tools/asn2wrs.py h248v3.asn packet-h248-template.c pac python ../../tools/asn2wrs.py -b -e -p h248 -c h248.cnf -s packet-h248-template h248v3.asn clean: - rm -f parsetab.py $(DISSECTOR_FILES) *-fn.c *-ett.c *-hf.c + rm -f parsetab.py $(DISSECTOR_FILES) *-fn.c *-ett.c *-hf.c copy_files copy_files: generate_dissector cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/h450/Makefile b/asn1/h450/Makefile index 08029d5bbf..4769142b14 100644 --- a/asn1/h450/Makefile +++ b/asn1/h450/Makefile @@ -1,5 +1,6 @@ # $Id$ +PROTOCOL_NAME=h450 H450_FILES=packet-$(PROTOCOL_NAME).c H450_ROS_FILES=packet-$(PROTOCOL_NAME)-ros.c packet-$(PROTOCOL_NAME)-ros.h DISSECTOR_FILES=$(H450_FILES) $(H450_ROS_FILES) @@ -11,7 +12,7 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(H450_FILES): ../../tools/asn2wrs.py $(H450_ASN) $(H450_OP_ASN) packet-h450-template.c packet-h450-template.h h450.cnf +$(H450_FILES): ../../tools/asn2wrs.py $(H450_ASN) $(H450_OP_ASN) packet-h450-template.c h450.cnf python ../../tools/asn2wrs.py -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(H450_ASN) $(H450_OP_ASN) $(H450_ROS_FILES): ../../tools/asn2wrs.py $(H450_ROS_ASN) packet-$(PROTOCOL_NAME)-ros-template.c $(PROTOCOL_NAME)-ros.cnf diff --git a/asn1/inap/Makefile b/asn1/inap/Makefile index 5960e481ce..4f7ee2e516 100644 --- a/asn1/inap/Makefile +++ b/asn1/inap/Makefile @@ -1,6 +1,6 @@ # $Id$ -DISSECTOR_FILES=packet-inap.c packet-inap.h +PROTOCOL_NAME=inap DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h ROS_ASN= ../ros/Remote-Operations-Information-Objects.asn 1248_1_ASN_FILES= IN-object-identifiers.asn IN-common-datatypes.asn @@ -14,7 +14,7 @@ all: generate_dissector generate_dissector: $(DISSECTOR_FILES) $(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN_FILE_LIST) packet-inap-template.c packet-inap-template.h inap.cnf - python ../../tools/asn2wrs.py -b -X -e -p inap -c inap.cnf -s packet-inap-template $(ASN_FILE_LIST) + python ../../tools/asn2wrs.py -b -X -e -p $(PROTOCOL_NAME) -c inap.cnf -s packet-inap-template $(ASN_FILE_LIST) clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/nbap/Makefile b/asn1/nbap/Makefile index 6919a2007c..53faa2ecd9 100644 --- a/asn1/nbap/Makefile +++ b/asn1/nbap/Makefile @@ -1,13 +1,15 @@ # $Id$ +PROTOCOL_NAME=nbap DISSECTOR_FILES=packet-nbap.c +NBAP_ASN=NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2wrs.py nbap.asn packet-nbap-template.c nbap.cnf - python ../../tools/asn2wrs.py -p nbap -c nbap.cnf -s packet-nbap-template NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(NBAP_ASN) packet-nbap-template.c nbap.cnf + python ../../tools/asn2wrs.py -p $(PROTOCOL_NAME) -c nbap.cnf -s packet-nbap-template $(NBAP_ASN) clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/ranap/Makefile b/asn1/ranap/Makefile index 3aa5e1e4b8..31e8aed6ba 100644 --- a/asn1/ranap/Makefile +++ b/asn1/ranap/Makefile @@ -1,13 +1,15 @@ # $Id$ +PROTOCOL_NAME=ranap DISSECTOR_FILES=packet-ranap.c packet-ranap.h +RANAP_ASN=RANAP-CommonDataTypes.asn RANAP-Constants.asn RANAP-Containers.asn RANAP-IEs.asn RANAP-PDU-Contents.asn RANAP-PDU-Descriptions.asn all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2wrs.py ranap.asn packet-ranap-template.c packet-ranap-template.h ranap.cnf - python ../../tools/asn2wrs.py -p ranap -c ranap.cnf -s packet-ranap-template RANAP-CommonDataTypes.asn RANAP-Constants.asn RANAP-Containers.asn RANAP-IEs.asn RANAP-PDU-Contents.asn RANAP-PDU-Descriptions.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(RANAP_ASN) packet-ranap-template.c packet-ranap-template.h ranap.cnf + python ../../tools/asn2wrs.py -p ranap -c ranap.cnf -s packet-ranap-template $(RANAP_ASN) clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/rnsap/Makefile b/asn1/rnsap/Makefile index 09ea4a3248..731254408c 100644 --- a/asn1/rnsap/Makefile +++ b/asn1/rnsap/Makefile @@ -1,13 +1,15 @@ # $Id$ -DISSECTOR_FILES=packet-rnsap.c +PROTOCOL_NAME=rnsap +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c +RNSAP_ASN=RNSAP-CommonDataTypes.asn RNSAP-Constants.asn RNSAP-Containers.asn RNSAP-IEs.asn RNSAP-PDU-Contents.asn RNSAP-PDU-Descriptions.asn all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2wrs.py rnsap.asn packet-rnsap-template.c rnsap.cnf - python ../../tools/asn2wrs.py -p rnsap -c rnsap.cnf -s packet-rnsap-template RNSAP-CommonDataTypes.asn RNSAP-Constants.asn RNSAP-Containers.asn RNSAP-IEs.asn RNSAP-PDU-Contents.asn RNSAP-PDU-Descriptions.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(RNSAP_ASN) packet-rnsap-template.c rnsap.cnf + python ../../tools/asn2wrs.py -p $(PROTOCOL_NAME) -c rnsap.cnf -s packet-rnsap-template $(RNSAP_ASN) clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/sabp/Makefile b/asn1/sabp/Makefile index d6f1d951c1..fc09925c1c 100644 --- a/asn1/sabp/Makefile +++ b/asn1/sabp/Makefile @@ -1,13 +1,15 @@ # $Id$ -DISSECTOR_FILES=packet-sabp.c +PROTOCOL_NAME=sabp +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c +SABP_ASN=SABP-CommonDataTypes.asn SABP-Constants.asn SABP-Containers.asn SABP-IEs.asn SABP-PDU-Contents.asn SABP-PDU-Descriptions.asn all: generate_dissector generate_dissector: $(DISSECTOR_FILES) -$(DISSECTOR_FILES): ../../tools/asn2wrs.py sabp.asn packet-sabp-template.c sabp.cnf - python ../../tools/asn2wrs.py -p sabp -c sabp.cnf -s packet-sabp-template SABP-CommonDataTypes.asn SABP-Constants.asn SABP-Containers.asn SABP-IEs.asn SABP-PDU-Contents.asn SABP-PDU-Descriptions.asn +$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SABP_ASN) packet-sabp-template.c sabp.cnf + python ../../tools/asn2wrs.py -p $(PROTOCOL_NAME) -c sabp.cnf -s packet-sabp-template $(SABP_ASN) clean: rm -f parsetab.py $(DISSECTOR_FILES) diff --git a/asn1/snmp/Makefile b/asn1/snmp/Makefile index d61e7d56a8..4691f5dcd0 100644 --- a/asn1/snmp/Makefile +++ b/asn1/snmp/Makefile @@ -11,7 +11,7 @@ $(DISSECTOR_FILES): ../../tools/asn2wrs.py snmp.asn packet-snmp-template.c packe python ../../tools/asn2wrs.py -b -e -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn clean: - rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) + rm -f parsetab.py parsetab.pyc $(DISSECTOR_FILES) copy_files generate_dissector test_compile copy_files: generate_dissector cp $(DISSECTOR_FILES) ../../epan/dissectors diff --git a/asn1/t38/Makefile b/asn1/t38/Makefile index a64f77deb4..95ca7afc77 100644 --- a/asn1/t38/Makefile +++ b/asn1/t38/Makefile @@ -1,13 +1,15 @@ # $Id$ -DISSECTOR_FILES=packet-t38.c packet-t38.h +PROTOCOL_NAME=t38 +DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h +T38_ASN=T38\(2002\).asn all: generate_dissector generate_dissector: $(DISSECTOR_FILES) $(DISSECTOR_FILES): ../../tools/asn2wrs.py packet-t38-template.c packet-t38-template.h t38.cnf - python ../../tools/asn2wrs.py -p t38 -c t38.cnf -s packet-t38-template T38(2002).asn + python ../../tools/asn2wrs.py -p $(PROTOCOL_NAME) -c t38.cnf -s packet-t38-template $(T38_ASN) clean: rm -f parsetab.py $(DISSECTOR_FILES) |