Fix up the asn/q932 Makefile as per Tomas Kukosa's suggestion - and make

it a lot more like the Makefile.nmake file.  Also, use $(PROTOCOL_NAME)
in a couple of places in Makefile.nmake where it wasn't being used
before.

(It might be interesting to see whether we can use a template for these
Makefiles, and just tweak some variables at the beginning.)

That lets us get a Q.932 ROS dissector with the right file name and with
"q932.ros" rather than "q932-ros" as the dissector name; do that.

svn path=/trunk/; revision=21625

4 files changed, 34 insertions, 34 deletions

diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c
index e25745952b..2df8165b6c 100644
--- a/epan/dissectors/packet-q932-ros.c
+++ b/epan/dissectors/packet-q932-ros.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* ./packet-q932-ros.c                                                        */
-/* ../../tools/asn2wrs.py -b -T -e -p q932-ros -c q932-ros.cnf -s packet-q932-ros-template q932-ros.asn */
+/* ../../tools/asn2wrs.py -b -T -e -p q932.ros -c q932-ros.cnf -o q932-ros -s packet-q932-ros-template q932-ros.asn */
 
 /* Input file: packet-q932-ros-template.c */
 
@@ -46,8 +46,8 @@
 #include "packet-q932-ros.h"
 
 #define PNAME  "Q.932 Operations Service Element"
-#define PSNAME "Q932-ROS"
-#define PFNAME "q932-ros"
+#define PSNAME "Q932.ROS"
+#define PFNAME "q932.ros"
 
 /* Initialize the protocol and registered fields */
 int proto_rose = -1;
@@ -726,95 +726,95 @@ void proto_register_rose(void) {
 /*--- Included file: packet-q932-ros-hfarr.c ---*/
 #line 1 "packet-q932-ros-hfarr.c"
     { &hf_q932_ros_RoseAPDU_PDU,
-      { "RoseAPDU", "q932-ros.RoseAPDU",
+      { "RoseAPDU", "q932.ros.RoseAPDU",
         FT_UINT32, BASE_DEC, VALS(q932_ros_RoseAPDU_vals), 0,
         "q932_ros.RoseAPDU", HFILL }},
     { &hf_q932_ros_local,
-      { "local", "q932-ros.local",
+      { "local", "q932.ros.local",
         FT_INT32, BASE_DEC, NULL, 0,
         "q932_ros.T_local", HFILL }},
     { &hf_q932_ros_global,
-      { "global", "q932-ros.global",
+      { "global", "q932.ros.global",
         FT_OID, BASE_NONE, NULL, 0,
         "q932_ros.T_global", HFILL }},
     { &hf_q932_ros_invoke,
-      { "invoke", "q932-ros.invoke",
+      { "invoke", "q932.ros.invoke",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.Invoke", HFILL }},
     { &hf_q932_ros_returnResult,
-      { "returnResult", "q932-ros.returnResult",
+      { "returnResult", "q932.ros.returnResult",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.ReturnResult", HFILL }},
     { &hf_q932_ros_returnError,
-      { "returnError", "q932-ros.returnError",
+      { "returnError", "q932.ros.returnError",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.ReturnError", HFILL }},
     { &hf_q932_ros_reject,
-      { "reject", "q932-ros.reject",
+      { "reject", "q932.ros.reject",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.Reject", HFILL }},
     { &hf_q932_ros_invokeId,
-      { "invokeId", "q932-ros.invokeId",
+      { "invokeId", "q932.ros.invokeId",
         FT_UINT32, BASE_DEC, VALS(q932_ros_InvokeId_vals), 0,
         "q932_ros.InvokeId", HFILL }},
     { &hf_q932_ros_linkedId,
-      { "linkedId", "q932-ros.linkedId",
+      { "linkedId", "q932.ros.linkedId",
         FT_UINT32, BASE_DEC, VALS(q932_ros_T_linkedId_vals), 0,
         "q932_ros.T_linkedId", HFILL }},
     { &hf_q932_ros_linkedIdPresent,
-      { "present", "q932-ros.present",
+      { "present", "q932.ros.present",
         FT_UINT32, BASE_DEC, VALS(q932_ros_InvokeId_vals), 0,
         "q932_ros.InvokeId", HFILL }},
     { &hf_q932_ros_absent,
-      { "absent", "q932-ros.absent",
+      { "absent", "q932.ros.absent",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.NULL", HFILL }},
     { &hf_q932_ros_opcode,
-      { "opcode", "q932-ros.opcode",
+      { "opcode", "q932.ros.opcode",
         FT_UINT32, BASE_DEC, VALS(q932_ros_Code_vals), 0,
         "q932_ros.Code", HFILL }},
     { &hf_q932_ros_argument,
-      { "argument", "q932-ros.argument",
+      { "argument", "q932.ros.argument",
         FT_BYTES, BASE_HEX, NULL, 0,
         "q932_ros.InvokeArgument", HFILL }},
     { &hf_q932_ros_result,
-      { "result", "q932-ros.result",
+      { "result", "q932.ros.result",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.T_result", HFILL }},
     { &hf_q932_ros_resultArgument,
-      { "result", "q932-ros.result",
+      { "result", "q932.ros.result",
         FT_BYTES, BASE_HEX, NULL, 0,
         "q932_ros.ResultArgument", HFILL }},
     { &hf_q932_ros_errcode,
-      { "errcode", "q932-ros.errcode",
+      { "errcode", "q932.ros.errcode",
         FT_UINT32, BASE_DEC, VALS(q932_ros_Code_vals), 0,
         "q932_ros.Code", HFILL }},
     { &hf_q932_ros_parameter,
-      { "parameter", "q932-ros.parameter",
+      { "parameter", "q932.ros.parameter",
         FT_BYTES, BASE_HEX, NULL, 0,
         "q932_ros.T_parameter", HFILL }},
     { &hf_q932_ros_problem,
-      { "problem", "q932-ros.problem",
+      { "problem", "q932.ros.problem",
         FT_UINT32, BASE_DEC, VALS(q932_ros_T_problem_vals), 0,
         "q932_ros.T_problem", HFILL }},
     { &hf_q932_ros_general,
-      { "general", "q932-ros.general",
+      { "general", "q932.ros.general",
         FT_INT32, BASE_DEC, VALS(q932_ros_GeneralProblem_vals), 0,
         "q932_ros.GeneralProblem", HFILL }},
     { &hf_q932_ros_invokeProblem,
-      { "invoke", "q932-ros.invoke",
+      { "invoke", "q932.ros.invoke",
         FT_INT32, BASE_DEC, VALS(q932_ros_InvokeProblem_vals), 0,
         "q932_ros.InvokeProblem", HFILL }},
     { &hf_q932_ros_returnResultProblem,
-      { "returnResult", "q932-ros.returnResult",
+      { "returnResult", "q932.ros.returnResult",
         FT_INT32, BASE_DEC, VALS(q932_ros_ReturnResultProblem_vals), 0,
         "q932_ros.ReturnResultProblem", HFILL }},
     { &hf_q932_ros_returnErrorProblem,
-      { "returnError", "q932-ros.returnError",
+      { "returnError", "q932.ros.returnError",
         FT_INT32, BASE_DEC, VALS(q932_ros_ReturnErrorProblem_vals), 0,
         "q932_ros.ReturnErrorProblem", HFILL }},
     { &hf_q932_ros_present,
-      { "present", "q932-ros.present",
+      { "present", "q932.ros.present",
         FT_INT32, BASE_DEC, NULL, 0,
         "q932_ros.INTEGER", HFILL }},
 
diff --git a/epan/dissectors/packet-q932-ros.h b/epan/dissectors/packet-q932-ros.h
index 32a90c3191..85218e6ddc 100644
--- a/epan/dissectors/packet-q932-ros.h
+++ b/epan/dissectors/packet-q932-ros.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* ./packet-q932-ros.h                                                        */
-/* ../../tools/asn2wrs.py -b -T -e -p q932-ros -c q932-ros.cnf -s packet-q932-ros-template q932-ros.asn */
+/* ../../tools/asn2wrs.py -b -T -e -p q932.ros -c q932-ros.cnf -o q932-ros -s packet-q932-ros-template q932-ros.asn */
 
 /* Input file: packet-q932-ros-template.h */
 
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index 1204f64c90..31b748222c 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -1095,10 +1095,10 @@ void proto_register_q932(void) {
   proto_register_subtree_array(ett, array_length(ett));
 
   /* Register dissector tables */
-  q932_rose_ctx.arg_global_dissector_table = register_dissector_table("q932-ros.global.arg", "Q.932 Operation Argument (global opcode)", FT_STRING, BASE_NONE);
-  q932_rose_ctx.res_global_dissector_table = register_dissector_table("q932-ros.global.res", "Q.932 Operation Result (global opcode)", FT_STRING, BASE_NONE);
-  q932_rose_ctx.arg_local_dissector_table = register_dissector_table("q932-ros.local.arg", "Q.932 Operation Argument (local opcode)", FT_UINT32, BASE_HEX); 
-  q932_rose_ctx.res_local_dissector_table = register_dissector_table("q932-ros.local.res", "Q.932 Operation Result (local opcode)", FT_UINT32, BASE_HEX); 
+  q932_rose_ctx.arg_global_dissector_table = register_dissector_table("q932.ros.global.arg", "Q.932 Operation Argument (global opcode)", FT_STRING, BASE_NONE);
+  q932_rose_ctx.res_global_dissector_table = register_dissector_table("q932.ros.global.res", "Q.932 Operation Result (global opcode)", FT_STRING, BASE_NONE);
+  q932_rose_ctx.arg_local_dissector_table = register_dissector_table("q932.ros.local.arg", "Q.932 Operation Argument (local opcode)", FT_UINT32, BASE_HEX); 
+  q932_rose_ctx.res_local_dissector_table = register_dissector_table("q932.ros.local.res", "Q.932 Operation Result (local opcode)", FT_UINT32, BASE_HEX); 
 }
 
 /*--- proto_reg_handoff_q932 ------------------------------------------------*/
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index a3849cbb87..e3b902bf5e 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -2912,15 +2912,15 @@ void proto_reg_handoff_qsig(void) {
 
   data_handle = find_dissector("data");
 
-  if (find_dissector_table("q932-ros.local.arg")) {
+  if (find_dissector_table("q932.ros.local.arg")) {
     for (op=0; op<array_length(qsig_tab); op++) {
       if (qsig_tab[op].arg_dissector) {
         qsig_op_handle = create_dissector_handle(qsig_tab[op].arg_dissector, proto_qsig);
-        dissector_add("q932-ros.local.arg", op, qsig_op_handle);
+        dissector_add("q932.ros.local.arg", op, qsig_op_handle);
       }
       if (qsig_tab[op].res_dissector) {
         qsig_op_handle = create_dissector_handle(qsig_tab[op].res_dissector, proto_qsig);
-        dissector_add("q932-ros.local.res", op, qsig_op_handle);
+        dissector_add("q932.ros.local.res", op, qsig_op_handle);
       }
     }
   }