diff options
Diffstat (limited to 'plugins/stats_tree')
| -rw-r--r-- | plugins/stats_tree/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | plugins/stats_tree/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/stats_tree/pinfo_stats_tree.h | 2 | ||||
| -rw-r--r-- | plugins/stats_tree/stats_tree_plugin.c | 8 |
4 files changed, 8 insertions, 12 deletions
diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt index dff44ee105..92172c72d3 100644 --- a/plugins/stats_tree/CMakeLists.txt +++ b/plugins/stats_tree/CMakeLists.txt @@ -39,13 +39,9 @@ set_source_files_properties( COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) -add_plugin_library(stats_tree) +add_plugin_library(stats_tree epan) -install(TARGETS stats_tree - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(stats_tree epan) file(GLOB PLUGIN_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am index 91f4bd7bc7..513cd2b7fa 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/stats_tree/Makefile.am @@ -37,7 +37,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = stats_tree.la +epan_plugin_LTLIBRARIES = stats_tree.la stats_tree_la_SOURCES = \ $(SRC_FILES) \ diff --git a/plugins/stats_tree/pinfo_stats_tree.h b/plugins/stats_tree/pinfo_stats_tree.h index a2bc0a1ce4..ef8952ca5a 100644 --- a/plugins/stats_tree/pinfo_stats_tree.h +++ b/plugins/stats_tree/pinfo_stats_tree.h @@ -23,5 +23,3 @@ */ extern void register_pinfo_stat_trees(void); - -WS_DLL_PUBLIC void plugin_register_tap_listener(void); diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/stats_tree/stats_tree_plugin.c index b2d685e332..ad82f105c9 100644 --- a/plugins/stats_tree/stats_tree_plugin.c +++ b/plugins/stats_tree/stats_tree_plugin.c @@ -30,15 +30,17 @@ #include "ws_symbol_export.h" #include <epan/stats_tree.h> - #include "pinfo_stats_tree.h" WS_DLL_PUBLIC_DEF const gchar plugin_version[] = "0.0.1"; WS_DLL_PUBLIC_DEF const gchar plugin_release[] = VERSION_RELEASE; -WS_DLL_PUBLIC_DEF void plugin_register_tap_listener(void) +WS_DLL_PUBLIC_DEF void plugin_register(void) { - register_pinfo_stat_trees(); + static tap_plugin plug; + + plug.register_tap_listener = register_pinfo_stat_trees; + tap_register_plugin(&plug); } /* |