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, 45 insertions, 66 deletions

diff --git a/epan/dissectors/asn1/p7/Makefile.am b/epan/dissectors/asn1/p7/Makefile.am
index 11932c53a4..6b45925bb8 100644
--- a/epan/dissectors/asn1/p7/Makefile.am
+++ b/epan/dissectors/asn1/p7/Makefile.am
@@ -16,7 +16,49 @@
 # 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.preinc
-include Makefile.common
 include ../Makefile.inc
+
+PROTOCOL_NAME=p7
+
+EXPORT_FILES = \
+	$(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+	MSAbstractService.asn \
+	MSGeneralAttributeTypes.asn \
+	MSAccessProtocol.asn \
+	MSUpperBounds.asn
+
+# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn
+# files do not exist for all protocols: Please add/remove as required.
+EXTRA_DIST = \
+	$(EXTRA_DIST_COMMON) \
+	$(ASN_FILE_LIST) \
+	packet-$(PROTOCOL_NAME)-template.c \
+	packet-$(PROTOCOL_NAME)-template.h \
+	$(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+	$(EXTRA_DIST) \
+	$(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS = -b -L -C
+
+EXTRA_CNF = \
+	$(builddir)/../p1/p1-exp.cnf \
+	$(builddir)/../ros/ros-exp.cnf \
+	$(builddir)/../rtse/rtse.cnf
+
+EXPORT_DEPENDS = \
+	$(builddir)/../p1/p1-exp.cnf
+
+$(builddir)/../p1/p1-exp.cnf:
+	(cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../ros/ros-exp.cnf:
+	(cd $(builddir)/../ros && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../rtse/rtse-exp.cnf:
+	(cd $(builddir)/../rtse && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/p7/Makefile.common b/epan/dissectors/asn1/p7/Makefile.common
deleted file mode 100644
index 1588cbedbc..0000000000
--- a/epan/dissectors/asn1/p7/Makefile.common
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.
-
-
-PROTOCOL_NAME=p7
-
-EXPORT_FILES = \
-	$(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
-	MSAbstractService.asn \
-	MSGeneralAttributeTypes.asn \
-	MSAccessProtocol.asn \
-	MSUpperBounds.asn
-
-# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn
-# files do not exist for all protocols: Please add/remove as required.
-EXTRA_DIST = \
-	$(EXTRA_DIST_COMMON) \
-	$(ASN_FILE_LIST) \
-	packet-$(PROTOCOL_NAME)-template.c \
-	packet-$(PROTOCOL_NAME)-template.h \
-	$(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
-	$(EXTRA_DIST) \
-	$(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS = -b -L -C
-
-EXTRA_CNF = \
-	$(builddir)/../p1/p1-exp.cnf \
-	$(builddir)/../ros/ros-exp.cnf \
-	$(builddir)/../rtse/rtse.cnf
-
-EXPORT_DEPENDS = \
-	$(builddir)/../p1/p1-exp.cnf
-
-$(builddir)/../p1/p1-exp.cnf:
-	(cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../ros/ros-exp.cnf:
-	(cd $(builddir)/../ros && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../rtse/rtse-exp.cnf:
-	(cd $(builddir)/../rtse && $(MAKE_CNF_EXPORT))