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>

31 files changed, 31 insertions, 548 deletions

diff --git a/plugins/Makefile.am.inc b/plugins/Makefile.am.inc
index 62c8ae1002..5a0326223a 100644
--- a/plugins/Makefile.am.inc
+++ b/plugins/Makefile.am.inc
@@ -22,7 +22,7 @@
 
 LIBS = @PLUGIN_LIBS@
 
-PLUGIN_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+PLUGIN_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) -DPLUGIN_VERSION=\"$(PLUGIN_VERSION)\"
 
 PLUGIN_CFLAGS =
 
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index 5c9bda7f79..d81ed2e767 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = docsis
 
+PLUGIN_VERSION = 0.0.5
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -49,7 +51,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = docsis.la
 
 docsis_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/docsis/moduleinfo.h b/plugins/docsis/moduleinfo.h
deleted file mode 100644
index a3d8c257b7..0000000000
--- a/plugins/docsis/moduleinfo.h
+++ /dev/null
@@ -1,40 +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 "docsis"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.0.5"
-
diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am
index b2d76ddc2b..a924abbdec 100644
--- a/plugins/ethercat/Makefile.am
+++ b/plugins/ethercat/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = ethercat
 
+PLUGIN_VERSION = 0.1.1
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -56,7 +58,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = ethercat.la
 
 ethercat_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/ethercat/moduleinfo.h b/plugins/ethercat/moduleinfo.h
deleted file mode 100644
index 181918e462..0000000000
--- a/plugins/ethercat/moduleinfo.h
+++ /dev/null
@@ -1,45 +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 "ethercat"
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-/*#define VERSION "0.0.6"   * first version */
-/*#define VERSION "0.0.7"   * new dissector for mailbox inserted */
-/*#define VERSION "0.0.9"   * nv-protocol inserted */
-/*#define VERSION "0.0.10"  */
-/*#define VERSION "0.0.11"  * support of AoE protocol */
-/*#define VERSION "0.0.12"  * port to Wireshark */
-/*#define VERSION "0.1.0"   * First version integrated into the Wireshark sources*/
-#define VERSION "0.1.1"    /* Added the ability for sub dissectors to decode the data section of EtherCAT using heuristics */
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index dd7a262f2c..c87bc8f915 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = gryphon
 
+PLUGIN_VERSION = 0.0.4
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -45,7 +47,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = gryphon.la
 
 gryphon_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/gryphon/moduleinfo.h b/plugins/gryphon/moduleinfo.h
deleted file mode 100644
index d427137545..0000000000
--- a/plugins/gryphon/moduleinfo.h
+++ /dev/null
@@ -1,40 +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 "gryphon"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.0.4"
-
diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index 98bd1e874d..a2e499a871 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = irda
 
+PLUGIN_VERSION = 0.0.6
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -47,7 +49,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = irda.la
 
 irda_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/irda/moduleinfo.h b/plugins/irda/moduleinfo.h
deleted file mode 100644
index e4840447f0..0000000000
--- a/plugins/irda/moduleinfo.h
+++ /dev/null
@@ -1,40 +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 "irda"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.0.6"
-
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"
-
diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am
index 9b85bb0b67..bd88fd1c2b 100644
--- a/plugins/opcua/Makefile.am
+++ b/plugins/opcua/Makefile.am
@@ -25,6 +25,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = opcua
 
+PLUGIN_VERSION = 1.1.0
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -69,7 +71,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = opcua.la
 
 opcua_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/opcua/moduleinfo.h b/plugins/opcua/moduleinfo.h
deleted file mode 100644
index 6f429e098c..0000000000
--- a/plugins/opcua/moduleinfo.h
+++ /dev/null
@@ -1,40 +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 "opcua"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "1.1.0"
-
diff --git a/plugins/pluginifdemo/Makefile.am b/plugins/pluginifdemo/Makefile.am
index 00cabbb9af..f1e4edf608 100644
--- a/plugins/pluginifdemo/Makefile.am
+++ b/plugins/pluginifdemo/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = pluginifdemo
 
+PLUGIN_VERSION = 0.0.1
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -45,7 +47,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = pluginifdemo.la
 
 pluginifdemo_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/pluginifdemo/moduleinfo.h b/plugins/pluginifdemo/moduleinfo.h
deleted file mode 100644
index b1b10a58dc..0000000000
--- a/plugins/pluginifdemo/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 "pluginifdemo"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.0.1"
diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am
index 9344616791..e638ecedfd 100644
--- a/plugins/profinet/Makefile.am
+++ b/plugins/profinet/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = profinet
 
+PLUGIN_VERSION = 0.2.4
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -55,7 +57,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = profinet.la
 
 profinet_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/profinet/moduleinfo.h b/plugins/profinet/moduleinfo.h
deleted file mode 100644
index b06a9aa943..0000000000
--- a/plugins/profinet/moduleinfo.h
+++ /dev/null
@@ -1,40 +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 "profinet"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.2.4"
-
diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am
index 394fb4fa86..7bb578b133 100644
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/stats_tree/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = stats_tree
 
+PLUGIN_VERSION = 0.0.1
+
 # Non-generated sources
 NONGENERATED_C_FILES = \
 	$(NONGENERATED_REGISTER_C_FILES) \
diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/stats_tree/stats_tree_plugin.c
index ad82f105c9..d2c1df9df2 100644
--- a/plugins/stats_tree/stats_tree_plugin.c
+++ b/plugins/stats_tree/stats_tree_plugin.c
@@ -32,7 +32,7 @@
 #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_version[] = PLUGIN_VERSION;
 WS_DLL_PUBLIC_DEF const gchar plugin_release[] = VERSION_RELEASE;
 
 WS_DLL_PUBLIC_DEF void plugin_register(void)
diff --git a/plugins/transum/Makefile.am b/plugins/transum/Makefile.am
index 67fc910037..cf787e6592 100644
--- a/plugins/transum/Makefile.am
+++ b/plugins/transum/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = transum
 
+PLUGIN_VERSION = 2.0.2
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -50,7 +52,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = transum.la
 
 transum_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/transum/moduleinfo.h b/plugins/transum/moduleinfo.h
deleted file mode 100644
index 0050ecad1d..0000000000
--- a/plugins/transum/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 "transum"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "2.0.2"
diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am
index 45f519a932..0142166151 100644
--- a/plugins/unistim/Makefile.am
+++ b/plugins/unistim/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = unistim
 
+PLUGIN_VERSION = 0.0.2
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -54,7 +56,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = unistim.la
 
 unistim_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/unistim/moduleinfo.h b/plugins/unistim/moduleinfo.h
deleted file mode 100644
index 62a3d592db..0000000000
--- a/plugins/unistim/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 "unistim"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.0.2"
diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am
index 91b0e8483c..82474f0053 100644
--- a/plugins/wimax/Makefile.am
+++ b/plugins/wimax/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = wimax
 
+PLUGIN_VERSION = 1.2.0
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -94,7 +96,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = wimax.la
 
 wimax_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/wimax/moduleinfo.h b/plugins/wimax/moduleinfo.h
deleted file mode 100644
index 0c598d2ffc..0000000000
--- a/plugins/wimax/moduleinfo.h
+++ /dev/null
@@ -1,48 +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 "wimax"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-
-#define stringiz1(x) #x
-#define stringize(x) stringiz1(x)
-
-#ifndef BUILD_NUMBER
-#define BUILD_NUMBER 0
-#endif
-
-#define VERSION "1.2." stringize(BUILD_NUMBER)
-
diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am
index 3dd83f5394..e7216f5b4d 100644
--- a/plugins/wimaxasncp/Makefile.am
+++ b/plugins/wimaxasncp/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = wimaxasncp
 
+PLUGIN_VERSION = 0.0.1
+
 BUILT_SOURCES = \
 	plugin.c \
 	$(LEMON_GENERATED_HEADER_FILES) \
@@ -64,7 +66,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = wimaxasncp.la
 
 wimaxasncp_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/wimaxasncp/moduleinfo.h b/plugins/wimaxasncp/moduleinfo.h
deleted file mode 100644
index fc898aef62..0000000000
--- a/plugins/wimaxasncp/moduleinfo.h
+++ /dev/null
@@ -1,41 +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 "wimaxasncp"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.0.1"
-
-
diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am
index 1f1a2f1ae5..d6208fea98 100644
--- a/plugins/wimaxmacphy/Makefile.am
+++ b/plugins/wimaxmacphy/Makefile.am
@@ -24,6 +24,8 @@ include ../Makefile.am.inc
 # the name of the plugin
 PLUGIN_NAME = wimaxmacphy
 
+PLUGIN_VERSION = 0.0.1
+
 BUILT_SOURCES = \
 	plugin.c
 
@@ -45,7 +47,6 @@ HEADER_FILES = \
 epan_plugin_LTLIBRARIES = wimaxmacphy.la
 
 wimaxmacphy_la_SOURCES = \
-	moduleinfo.h \
 	$(SRC_FILES)	\
 	$(HEADER_FILES)
 
diff --git a/plugins/wimaxmacphy/moduleinfo.h b/plugins/wimaxmacphy/moduleinfo.h
deleted file mode 100644
index 730d26dc2e..0000000000
--- a/plugins/wimaxmacphy/moduleinfo.h
+++ /dev/null
@@ -1,41 +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 "wimaxmacphy"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.0.1"
-
-