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, 64 insertions, 92 deletions

diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index 39cda1e095..4bae2791c1 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -1,5 +1,4 @@
 # Makefile.am
-# Automake file for DOCSIS plugin
 #
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
@@ -18,12 +17,74 @@
 # 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 = docsis
+
+# Non-generated sources to be scanned for registration routines
+NONGENERATED_REGISTER_C_FILES = \
+	packet-bintrngreq.c \
+	packet-bpkmattr.c \
+	packet-bpkmreq.c \
+	packet-bpkmrsp.c \
+	packet-cmctrlreq.c \
+	packet-cmctrlrsp.c \
+	packet-cmstatus.c \
+	packet-intrngreq.c \
+	packet-dbcreq.c \
+	packet-dbcrsp.c \
+	packet-dbcack.c \
+	packet-dccack.c \
+	packet-dccreq.c \
+	packet-dccrsp.c \
+	packet-dcd.c \
+	packet-dpvreq.c \
+	packet-dpvrsp.c \
+	packet-docsis.c \
+	packet-dsaack.c \
+	packet-dsareq.c \
+	packet-dsarsp.c \
+	packet-dscack.c \
+	packet-dscreq.c \
+	packet-dscrsp.c \
+	packet-dsdreq.c \
+	packet-dsdrsp.c \
+	packet-macmgmt.c \
+	packet-map.c \
+	packet-mdd.c \
+	packet-ocd.c \
+	packet-regack.c \
+	packet-regreq.c \
+	packet-regreqmp.c \
+	packet-regrsp.c \
+	packet-regrspmp.c \
+	packet-rngreq.c \
+	packet-rngrsp.c \
+	packet-sync.c \
+	packet-tlv.c \
+	packet-tlv-cmctrl.c \
+	packet-type29ucd.c \
+	packet-type35ucd.c \
+	packet-uccreq.c \
+	packet-uccrsp.c \
+	packet-ucd.c \
+	packet-vendor.c
+
+# Non-generated sources
+NONGENERATED_C_FILES = \
+	$(NONGENERATED_REGISTER_C_FILES)
+
+# Headers.
+CLEAN_HEADER_FILES =	\
+	packet-tlv.h
+
+HEADER_FILES = \
+	$(FLEX_GENERATED_HEADER_FILES) \
+	$(CLEAN_HEADER_FILES)
+
 plugin_LTLIBRARIES = docsis.la
 
 docsis_la_SOURCES = \
@@ -47,7 +108,6 @@ MAINTAINERCLEANFILES = \
 	plugin.c
 
 EXTRA_DIST = \
-	Makefile.common		\
 	plugin.rc.in		\
 	README			\
 	CMakeLists.txt
diff --git a/plugins/docsis/Makefile.common b/plugins/docsis/Makefile.common
deleted file mode 100644
index 0e3085904a..0000000000
--- a/plugins/docsis/Makefile.common
+++ /dev/null
@@ -1,88 +0,0 @@
-# Makefile.common for DOCSIS 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 = docsis
-
-# Non-generated sources to be scanned for registration routines
-NONGENERATED_REGISTER_C_FILES = \
-	packet-bintrngreq.c \
-	packet-bpkmattr.c \
-	packet-bpkmreq.c \
-	packet-bpkmrsp.c \
-	packet-cmctrlreq.c \
-	packet-cmctrlrsp.c \
-	packet-cmstatus.c \
-	packet-intrngreq.c \
-	packet-dbcreq.c \
-	packet-dbcrsp.c \
-	packet-dbcack.c \
-	packet-dccack.c \
-	packet-dccreq.c \
-	packet-dccrsp.c \
-	packet-dcd.c \
-	packet-dpvreq.c \
-	packet-dpvrsp.c \
-	packet-docsis.c \
-	packet-dsaack.c \
-	packet-dsareq.c \
-	packet-dsarsp.c \
-	packet-dscack.c \
-	packet-dscreq.c \
-	packet-dscrsp.c \
-	packet-dsdreq.c \
-	packet-dsdrsp.c \
-	packet-macmgmt.c \
-	packet-map.c \
-	packet-mdd.c \
-	packet-ocd.c \
-	packet-regack.c \
-	packet-regreq.c \
-	packet-regreqmp.c \
-	packet-regrsp.c \
-	packet-regrspmp.c \
-	packet-rngreq.c \
-	packet-rngrsp.c \
-	packet-sync.c \
-	packet-tlv.c \
-	packet-tlv-cmctrl.c \
-	packet-type29ucd.c \
-	packet-type35ucd.c \
-	packet-uccreq.c \
-	packet-uccrsp.c \
-	packet-ucd.c \
-	packet-vendor.c
-
-# Non-generated sources
-NONGENERATED_C_FILES = \
-	$(NONGENERATED_REGISTER_C_FILES)
-
-# Headers.
-CLEAN_HEADER_FILES =	\
-	packet-tlv.h
-
-HEADER_FILES = \
-	$(FLEX_GENERATED_HEADER_FILES) \
-	$(CLEAN_HEADER_FILES)
-
-include ../Makefile.common.inc