Remove Makefile.common files

Now that nmake build system has been removed they are not needed anymore.

Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
Reviewed-on: https://code.wireshark.org/review/16050
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

2 files changed, 41 insertions, 69 deletions

diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index ec98924550..a3fa4c6042 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -1,5 +1,4 @@
 # Makefile.am
-# Automake file for MATE Wireshark plugin
 #
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
@@ -18,12 +17,51 @@
 # 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.
-#
 
-include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 include ../Makefile.am.inc
 
+# the name of the plugin
+PLUGIN_NAME = mate
+
+#
+# Files generated by Flex.
+#
+FLEX_GENERATED_C_FILES = \
+	mate_parser.c
+
+FLEX_GENERATED_HEADER_FILES = \
+	mate_parser_lex.h
+
+#
+# Files generated by Lemon.
+#
+LEMON_GENERATED_C_FILES = \
+	mate_grammar.c
+
+LEMON_GENERATED_HEADER_FILES = \
+	mate_grammar.h
+
+# Non-generated sources to be scanned for registration routines
+NONGENERATED_REGISTER_C_FILES = \
+	packet-mate.c
+
+# Non-generated sources
+NONGENERATED_C_FILES = \
+	$(NONGENERATED_REGISTER_C_FILES) \
+	mate_setup.c \
+	mate_runtime.c \
+	mate_util.c
+
+# Headers.
+CLEAN_HEADER_FILES = \
+	mate.h	\
+	mate_util.h
+
+HEADER_FILES = \
+	$(FLEX_GENERATED_HEADER_FILES) \
+	$(CLEAN_HEADER_FILES)
+
 #
 # XXX - how to make this apply only to clean files?
 #
@@ -71,7 +109,6 @@ MAINTAINERCLEANFILES = \
 EXTRA_DIST = \
 	mate_grammar.lemon	\
 	mate_parser.l		\
-	Makefile.common		\
 	plugin.rc.in		\
 	CMakeLists.txt		\
 	examples/call.mate	\
diff --git a/plugins/mate/Makefile.common b/plugins/mate/Makefile.common
deleted file mode 100644
index 4395d23acb..0000000000
--- a/plugins/mate/Makefile.common
+++ /dev/null
@@ -1,65 +0,0 @@
-# Makefile.common for mate plugin
-#     Contains the stuff from Makefile.am and Makefile.nmake that is
-#     a) common to both files and
-#     b) portable between both files
-#
-# 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.
-
-# the name of the plugin
-PLUGIN_NAME = mate
-
-#
-# Files generated by Flex.
-#
-FLEX_GENERATED_C_FILES = \
-	mate_parser.c
-
-FLEX_GENERATED_HEADER_FILES = \
-	mate_parser_lex.h
-
-#
-# Files generated by Lemon.
-#
-LEMON_GENERATED_C_FILES = \
-	mate_grammar.c
-
-LEMON_GENERATED_HEADER_FILES = \
-	mate_grammar.h
-
-# Non-generated sources to be scanned for registration routines
-NONGENERATED_REGISTER_C_FILES = \
-	packet-mate.c
-
-# Non-generated sources
-NONGENERATED_C_FILES = \
-	$(NONGENERATED_REGISTER_C_FILES) \
-	mate_setup.c \
-	mate_runtime.c \
-	mate_util.c
-
-# Headers.
-CLEAN_HEADER_FILES = \
-	mate.h	\
-	mate_util.h
-
-HEADER_FILES = \
-	$(FLEX_GENERATED_HEADER_FILES) \
-	$(CLEAN_HEADER_FILES)
-
-include ../Makefile.common.inc