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, 16 insertions, 58 deletions

diff --git a/echld/Makefile.am b/echld/Makefile.am
index 7107813843..53d9360f3f 100644
--- a/echld/Makefile.am
+++ b/echld/Makefile.am
@@ -18,30 +18,24 @@
 # 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 = -DWS_BUILD_DLL $(INCLUDEDIRS) $(WS_CPPFLAGS) \
 	$(GLIB_CFLAGS)
 
-# Optional objects that I know how to build. These will be
-# linked into libechld.
-echld_optional_objects = $(LIBECHLD_SRC)
-
 lib_LTLIBRARIES = libechld.la
 
-libechld_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
-
 libechld_la_SOURCES = \
-	$(LIBECHLD_SRC)		\
-	$(LIBECHLD_INCLUDES)
-
-libechld_la_DEPENDENCIES = \
-	../caputils/libcaputils.a	\
-	../epan/libwireshark.la		\
-	../wiretap/libwiretap.la	\
-	../wsutil/libwsutil.la
+	echld-util.c	\
+	dispatcher.c	\
+	child.c		\
+	parent.c	\
+	common.c	\
+	echld-int.h	\
+	echld-util.h	\
+	echld.h
 
+libechld_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
 
 libechld_la_LIBADD =			\
 	../caputils/libcaputils.a	\
@@ -50,9 +44,14 @@ libechld_la_LIBADD =			\
 	../wiretap/libwiretap.la	\
 	@GLIB_LIBS@
 
+libechld_la_DEPENDENCIES = \
+	../caputils/libcaputils.a	\
+	../epan/libwireshark.la		\
+	../wiretap/libwiretap.la	\
+	../wsutil/libwsutil.la
+
 EXTRA_DIST = \
-	CMakeLists.txt	\
-	Makefile.common
+	CMakeLists.txt
 
 CLEANFILES = \
 	libechld.a	\
diff --git a/echld/Makefile.common b/echld/Makefile.common
deleted file mode 100644
index d281f7d1ca..0000000000
--- a/echld/Makefile.common
+++ /dev/null
@@ -1,41 +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 libechld 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).
-LIBECHLD_SRC = 	\
-	echld-util.c \
-	dispatcher.c \
-	child.c \
-	parent.c \
-	common.c
-
-# Header files that are not generated from other files
-LIBECHLD_INCLUDES = \
-	echld-int.h \
-	echld-util.h \
-	echld.h
-