Use register_dissector_files in the plugins dissectors

svn path=/trunk/; revision=30435

13 files changed, 36 insertions, 301 deletions

diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt
index b7c9b8fd53..85e3a813fd 100644
--- a/plugins/docsis/CMakeLists.txt
+++ b/plugins/docsis/CMakeLists.txt
@@ -66,31 +66,9 @@ set(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt
index 164b34724a..7e378acfb4 100644
--- a/plugins/ethercat/CMakeLists.txt
+++ b/plugins/ethercat/CMakeLists.txt
@@ -38,31 +38,9 @@ set(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt
index 670d997e5a..dddf7b9087 100644
--- a/plugins/gryphon/CMakeLists.txt
+++ b/plugins/gryphon/CMakeLists.txt
@@ -32,31 +32,9 @@ set(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt
index 1c3e1f7bf5..fc8dea25c2 100644
--- a/plugins/irda/CMakeLists.txt
+++ b/plugins/irda/CMakeLists.txt
@@ -34,31 +34,9 @@ set(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt
index 57239210e0..2399a7ccf2 100644
--- a/plugins/m2m/CMakeLists.txt
+++ b/plugins/m2m/CMakeLists.txt
@@ -37,31 +37,9 @@ set(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt
index 51f4241b9b..88d6fad103 100644
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/mate/CMakeLists.txt
@@ -51,31 +51,9 @@ set(PLUGIN_FILES
 	${DISSECTOR_SUPPORT_SRC}
 )
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt
index 10ab3acd98..b984ae857e 100644
--- a/plugins/opcua/CMakeLists.txt
+++ b/plugins/opcua/CMakeLists.txt
@@ -45,31 +45,9 @@ set(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then
-#                echo Making plugin.c with python ;
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir)
-#                    plugin $(DISSECTOR_SRC) ;
-#        else
-#                echo Making plugin.c with shell script ;
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir)
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ;
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt
index 3a9412d670..5bacab562a 100644
--- a/plugins/profinet/CMakeLists.txt
+++ b/plugins/profinet/CMakeLists.txt
@@ -44,31 +44,9 @@ set(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/sercosiii/CMakeLists.txt b/plugins/sercosiii/CMakeLists.txt
index 630a25d3bf..d81958cc7f 100644
--- a/plugins/sercosiii/CMakeLists.txt
+++ b/plugins/sercosiii/CMakeLists.txt
@@ -43,31 +43,9 @@ set(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt
index c7e68610e3..f1fda94382 100644
--- a/plugins/stats_tree/CMakeLists.txt
+++ b/plugins/stats_tree/CMakeLists.txt
@@ -26,7 +26,6 @@ set(TAP_SRC
 	pinfo_stats_tree.c
 )
 
-
 # todo
 # Do I need any of this or is this handled by type MODULE?
 # asn1_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt
index 445dcdc5df..3be624eeb8 100644
--- a/plugins/unistim/CMakeLists.txt
+++ b/plugins/unistim/CMakeLists.txt
@@ -32,31 +32,9 @@ set(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt
index 3745be5846..6dd6092f1c 100644
--- a/plugins/wimax/CMakeLists.txt
+++ b/plugins/wimax/CMakeLists.txt
@@ -77,31 +77,9 @@ set(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo
diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt
index 5d593bc31f..d24831c053 100644
--- a/plugins/wimaxasncp/CMakeLists.txt
+++ b/plugins/wimaxasncp/CMakeLists.txt
@@ -36,31 +36,9 @@ add_lex_files(PLUGIN_FILES
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_CUSTOM_COMMAND(
-# FIXME: Only the Python stuff has been implemented
-#        Make this into a MACRO, to avoid duplication with epan/
-#plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-#    $(top_srcdir)/tools/make-dissector-reg.py
-#        @if test -n "$(PYTHON)"; then \
-#                echo Making plugin.c with python ; \
-#                $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-#                    plugin $(DISSECTOR_SRC) ; \
-#        else \
-#                echo Making plugin.c with shell script ; \
-#                $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-#                    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-#        fi
-
-    OUTPUT plugin.c
-    COMMAND ${PYTHON_EXECUTABLE}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      plugin
-      ${DISSECTOR_SRC}
-    DEPENDS
-      ${DISSECTOR_SRC}
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
-      ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
+register_dissector_files(plugin.c
+	plugin
+	${DISSECTOR_SRC}
 )
 
 # todo