Fix for http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1014

provided by markdrago@mail.com.

Me: Patch template files instead and regenerate the dissector files.
    Fix Makefiles to use the correct asn filenames.

svn path=/trunk/; revision=18866

6 files changed, 8 insertions, 8 deletions

diff --git a/asn1/h225/Makefile b/asn1/h225/Makefile
index c9666803cd..d74e169907 100644
--- a/asn1/h225/Makefile
+++ b/asn1/h225/Makefile
@@ -6,8 +6,8 @@ all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py h225.asn packet-h225-template.c packet-h225-template.h h225.cnf 
-	python ../../tools/asn2wrs.py -e -p h225 -c h225.cnf -s packet-h225-template h225.asn
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py H323-MESSAGES.asn packet-h225-template.c packet-h225-template.h h225.cnf 
+	python ../../tools/asn2wrs.py -e -p h225 -c h225.cnf -s packet-h225-template H323-MESSAGES.asn
 
 clean:
 	rm -f parsetab.py $(DISSECTOR_FILES)
diff --git a/asn1/h225/h225-exp.cnf b/asn1/h225/h225-exp.cnf
index 53f2afa27b..ab3249cbce 100644
--- a/asn1/h225/h225-exp.cnf
+++ b/asn1/h225/h225-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# .\h225-exp.cnf
+# ./h225-exp.cnf
 # ../../tools/asn2wrs.py -e -p h225 -c h225.cnf -s packet-h225-template H323-MESSAGES.asn
 
 #.MODULE
diff --git a/asn1/h225/packet-h225-template.h b/asn1/h225/packet-h225-template.h
index e41d69fd84..d62e6abee7 100644
--- a/asn1/h225/packet-h225-template.h
+++ b/asn1/h225/packet-h225-template.h
@@ -76,7 +76,7 @@ typedef struct _h225_packet_info {
  * libwireshark.dll, we need a special declaration.
  */
 
-#include "packet-per.h"
+#include <epan/dissectors/packet-per.h>
 
 #include "packet-h225-exp.h" 
 
diff --git a/asn1/h245/Makefile b/asn1/h245/Makefile
index 523d9e2c13..3f61a599a6 100644
--- a/asn1/h245/Makefile
+++ b/asn1/h245/Makefile
@@ -6,8 +6,8 @@ all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py packet-h245-template.c packet-h245-template.h h245.cnf
-	python ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template h245.asn
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py packet-h245-template.c packet-h245-template.h h245.cnf MULTIMEDIA-SYSTEM-CONTROL.asn
+	python ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template MULTIMEDIA-SYSTEM-CONTROL.asn
 
 clean:
 	rm -f parsetab.py $(DISSECTOR_FILES)
diff --git a/asn1/h245/h245-exp.cnf b/asn1/h245/h245-exp.cnf
index b4f22f844b..a764991462 100644
--- a/asn1/h245/h245-exp.cnf
+++ b/asn1/h245/h245-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# .\h245-exp.cnf
+# ./h245-exp.cnf
 # ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template MULTIMEDIA-SYSTEM-CONTROL.asn
 
 #.MODULE
diff --git a/asn1/h245/packet-h245-template.h b/asn1/h245/packet-h245-template.h
index 0470beece9..59390ddff2 100644
--- a/asn1/h245/packet-h245-template.h
+++ b/asn1/h245/packet-h245-template.h
@@ -113,7 +113,7 @@ struct _h223_mux_element {
 };
 
 #include <epan/packet_info.h>
-#include "packet-per.h"
+#include <epan/dissectors/packet-per.h>
 
 typedef void (*h223_set_mc_handle_t) ( packet_info* pinfo, guint8 mc, h223_mux_element* me );
 extern void h245_set_h223_set_mc_handle( h223_set_mc_handle_t handle );