diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-12-15 00:49:31 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-12-17 11:47:17 +0000 |
| commit | f3444ed0f9c1d6e48b4b383afdd2b9fca9a8966c (patch) | |
| tree | 8d89d4c03d412d5f9d5b245f96ca68236b668e59 /plugins/mate | |
| parent | ee8ca2e1d793e039bdd7304ad3c2c0cb42a69624 (diff) | |
plugins: Remove moduleinfo.h
Micro version bump for mate to homogenize it between CMake and autotools.
The cmake macro doesn't handle the "a" suffix and it doesn't seem worth
implementing.
Change-Id: Ib022c6aa170623b83a9700e4fa098c60a9cddfab
Reviewed-on: https://code.wireshark.org/review/24847
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'plugins/mate')
| -rw-r--r-- | plugins/mate/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugins/mate/Makefile.am | 3 | ||||
| -rw-r--r-- | plugins/mate/mate.h | 1 | ||||
| -rw-r--r-- | plugins/mate/moduleinfo.h | 39 |
4 files changed, 3 insertions, 42 deletions
diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt index 509145447f..da7451b3e3 100644 --- a/plugins/mate/CMakeLists.txt +++ b/plugins/mate/CMakeLists.txt @@ -22,7 +22,7 @@ include(WiresharkPlugin) # Plugin name and version info (major minor micro extra) -set_module_info(mate 1 0 0 1) +set_module_info(mate 1 0 1 0) set(DISSECTOR_SRC packet-mate.c diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 3f8b1af82c..0d425aa293 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -24,6 +24,8 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = mate +PLUGIN_VERSION = 1.0.1 + BUILT_SOURCES = \ plugin.c \ $(LEMON_GENERATED_HEADER_FILES) \ @@ -77,7 +79,6 @@ HEADER_FILES = \ epan_plugin_LTLIBRARIES = mate.la mate_la_SOURCES = \ - moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h index 48999114ab..5e538dfa32 100644 --- a/plugins/mate/mate.h +++ b/plugins/mate/mate.h @@ -28,7 +28,6 @@ #include "config.h" -#include "moduleinfo.h" #include <gmodule.h> #include <stdio.h> diff --git a/plugins/mate/moduleinfo.h b/plugins/mate/moduleinfo.h deleted file mode 100644 index 24282471ea..0000000000 --- a/plugins/mate/moduleinfo.h +++ /dev/null @@ -1,39 +0,0 @@ -/* moduleinfo.h - * - * Module info header for wireshark plugins. - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* Included *after* config.h, in order to re-define these macros */ - -#ifdef PACKAGE -#undef PACKAGE -#endif - -/* Name of package */ -#define PACKAGE "mate" - -#ifdef VERSION -#undef VERSION -#endif - -/* Version number of package */ -#define VERSION "1.0.0a" - |