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, 22 insertions, 56 deletions

diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index 659865cc44..4256a6d0db 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -18,7 +18,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 $(top_srcdir)/Makefile.am.inc
 
 AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan $(WS_CPPFLAGS) \
@@ -26,6 +25,27 @@ AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan $(WS_CPPFLAGS) \
 
 noinst_LTLIBRARIES = libftypes.la
 
+libftypes_la_SOURCES = \
+	ftypes.c	\
+	ftype-bytes.c	\
+	ftype-double.c	\
+	ftype-ieee-11073-float.c	\
+	ftype-integer.c	\
+	ftype-ipv4.c	\
+	ftype-ipv6.c	\
+	ftype-guid.c	\
+	ftype-none.c	\
+	ftype-pcre.c	\
+	ftype-protocol.c	\
+	ftype-string.c	\
+	ftype-time.c	\
+	ftypes.h	\
+	ftypes-int.h
+
+EXTRA_DIST = \
+	.editorconfig		\
+	CMakeLists.txt
+
 CLEANFILES = \
 	libftypes.a	\
 	libftypes.la	\
@@ -34,14 +54,7 @@ CLEANFILES = \
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
-libftypes_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES)
-
-EXTRA_DIST = \
-	.editorconfig		\
-	Makefile.common		\
-	CMakeLists.txt
-
 checkapi:
 	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \
 	-sourcedir=$(srcdir) \
-	$(NONGENERATED_C_FILES)
+	$(libftypes_la_SOURCES)
diff --git a/epan/ftypes/Makefile.common b/epan/ftypes/Makefile.common
deleted file mode 100644
index b8b9042c9e..0000000000
--- a/epan/ftypes/Makefile.common
+++ /dev/null
@@ -1,47 +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.
-
-# C source files that are part of the display filter source; this includes only
-# .c files, not YACC or Lex or... files (as Makefile.nmake maps this list
-# into a list of object files by replacing ".c" with ".obj") or files
-# generated from YACC or Lex files (as Automake doesn't want them in
-# _SOURCES variables).
-NONGENERATED_C_FILES = \
-	ftypes.c	\
-	ftype-bytes.c	\
-	ftype-double.c	\
-	ftype-ieee-11073-float.c	\
-	ftype-integer.c	\
-	ftype-ipv4.c	\
-	ftype-ipv6.c	\
-	ftype-guid.c	\
-	ftype-none.c	\
-	ftype-pcre.c	\
-	ftype-protocol.c	\
-	ftype-string.c	\
-	ftype-time.c
-
-# Header files that are not generated from other files
-NONGENERATED_HEADER_FILES = \
-	ftypes.h	\
-	ftypes-int.h