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, 25 insertions, 53 deletions

diff --git a/extcap/Makefile.am b/extcap/Makefile.am
index 81bcd2b549..7c3bdba14b 100644
--- a/extcap/Makefile.am
+++ b/extcap/Makefile.am
@@ -19,7 +19,6 @@
 # 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 ../Makefile.am.inc
 
 AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
@@ -28,17 +27,20 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 EXTRA_DIST = \
-	.editorconfig	\
-	Makefile.common
+	.editorconfig
 
 extcap_PROGRAMS = \
 	@androiddump_bin@	\
 	@randpktdump_bin@	\
-	@sshdump_bin@	\
+	@sshdump_bin@		\
 	@ciscodump_bin@
 
 EXTRA_PROGRAMS = androiddump randpktdump sshdump ciscodump
 
+androiddump_SOURCES = \
+	androiddump.c	\
+	extcap-base.c
+
 if ENABLE_STATIC
 androiddump_LDFLAGS = -Wl,-static -all-static
 else
@@ -51,6 +53,10 @@ androiddump_LDADD = \
 	../wsutil/libwsutil.la		\
 	@GLIB_LIBS@
 
+randpktdump_SOURCES = \
+	randpktdump.c	\
+	extcap-base.c
+
 if ENABLE_STATIC
 	randpktdump_LDFLAGS = -Wl,-static -all-static
 else
@@ -59,11 +65,16 @@ endif
 
 # Libraries and plugin flags with which to link randpktdump.
 randpktdump_LDADD = \
-	../randpkt_core/librandpkt_core.a \
+	../randpkt_core/librandpkt_core.a	\
 	../wiretap/libwiretap.la	\
 	../wsutil/libwsutil.la		\
 	@GLIB_LIBS@
 
+sshdump_SOURCES = \
+	sshdump.c	\
+	extcap-base.c	\
+	ssh-base.c
+
 if ENABLE_STATIC
 	sshdump_LDFLAGS = -Wl,-static -all-static
 else
@@ -77,6 +88,11 @@ sshdump_LDADD = \
 	@GLIB_LIBS@			\
 	@LIBSSH_LIBS@
 
+ciscodump_SOURCES = \
+	ciscodump.c	\
+	extcap-base.c	\
+	ssh-base.c
+
 if ENABLE_STATIC
 	ciscodump_LDFLAGS = -Wl,-static -all-static
 else
@@ -89,3 +105,7 @@ ciscodump_LDADD = \
 	../wsutil/libwsutil.la		\
 	@GLIB_LIBS@			\
 	@LIBSSH_LIBS@
+
+noinst_HEADERS = \
+	extcap-base.h	\
+	ssh-base.h
diff --git a/extcap/Makefile.common b/extcap/Makefile.common
deleted file mode 100644
index 0d795b783e..0000000000
--- a/extcap/Makefile.common
+++ /dev/null
@@ -1,48 +0,0 @@
-# Makefile.common
-#     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.
-
-# androiddump specifics
-androiddump_SOURCES =	\
-	androiddump.c	\
-	extcap-base.c
-
-# randpktdump specifics
-randpktdump_SOURCES =	\
-	randpktdump.c	\
-	extcap-base.c
-
-# sshdump specifics
-sshdump_SOURCES =	\
-	sshdump.c	\
-	extcap-base.c \
-	ssh-base.c
-
-# ciscodump specifics
-ciscodump_SOURCES =	\
-	ciscodump.c	\
-	extcap-base.c	\
-	ssh-base.c
-
-noinst_HEADERS = \
-	extcap-base.h	\
-	ssh-base.h