update to x509if autogenerate the exports conformance file and create a small makefile since i am tired of typing that long command line every time

svn path=/trunk/; revision=12555

8 files changed, 11 insertions, 6 deletions

diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf
index 81bbe08f38..646cc35c1b 100644
--- a/asn1/cmip/cmip.cnf
+++ b/asn1/cmip/cmip.cnf
@@ -6,7 +6,7 @@
 #.MODULE_IMPORT
 InformationFramework x509if
 
-#.INCLUDE ../x509if/x509if_exp.cnf
+#.INCLUDE ../x509if/x509if-exp.cnf
 
 #.EXPORTS
 CMIPAbortInfo
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf
index 3b645eedac..cacf1b30a8 100644
--- a/asn1/cms/cms.cnf
+++ b/asn1/cms/cms.cnf
@@ -8,7 +8,7 @@ AuthenticationFramework x509af
 InformationFramework x509if
 
 #.INCLUDE ../x509af/x509af_exp.cnf
-#.INCLUDE ../x509if/x509if_exp.cnf
+#.INCLUDE ../x509if/x509if-exp.cnf
 
 #.EXPORTS
 ContentInfo
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index 5ae60f7dcf..37a4d6d46d 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -9,7 +9,7 @@ CertificateExtensions x509ce
 SelectedAttributeTypes x509sat
 
 #.INCLUDE ../x509ce/x509ce_exp.cnf
-#.INCLUDE ../x509if/x509if_exp.cnf
+#.INCLUDE ../x509if/x509if-exp.cnf
 #.INCLUDE ../x509sat/x509sat_exp.cnf
 
 #.EXPORTS
diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf
index 7ea62e0dd5..94c8a16ba0 100644
--- a/asn1/x509ce/x509ce.cnf
+++ b/asn1/x509ce/x509ce.cnf
@@ -8,7 +8,7 @@ InformationFramework x509if
 AuthenticationFramework x509af
 SelectedAttributeTypes x509sat
 
-#.INCLUDE ../x509if/x509if_exp.cnf
+#.INCLUDE ../x509if/x509if-exp.cnf
 #.INCLUDE ../x509af/x509af_exp.cnf
 #.INCLUDE ../x509sat/x509sat_exp.cnf
 
diff --git a/asn1/x509if/Makefile b/asn1/x509if/Makefile
new file mode 100755
index 0000000000..5149ca3352
--- /dev/null
+++ b/asn1/x509if/Makefile
@@ -0,0 +1,5 @@
+
+../../epan/dissectors/packet-x509if.c : ../../tools/asn2eth.py InformationFramework.asn packet-x509if-template.c packet-x509if-template.h x509if.cnf ../x509sat/x509sat_exp.cnf
+	python ../../tools/asn2eth.py -X -b -k -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn
+	cp packet-x509if.* ../../epan/dissectors
+
diff --git a/asn1/x509if/x509if_exp.cnf b/asn1/x509if/x509if-exp.cnf
index 32b5ffd1c6..32b5ffd1c6 100644
--- a/asn1/x509if/x509if_exp.cnf
+++ b/asn1/x509if/x509if-exp.cnf
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index c77425b19c..347ec54539 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
 /* ./packet-x509if.c                                                          */
-/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -k -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
 
 /* Input file: packet-x509if-template.c */
 
diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h
index 5c3af5b03b..2c09d4d982 100644
--- a/epan/dissectors/packet-x509if.h
+++ b/epan/dissectors/packet-x509if.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
 /* ./packet-x509if.h                                                          */
-/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
+/* ../../tools/asn2eth.py -X -b -k -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
 
 /* Input file: packet-x509if-template.h */