From a16d401b25c85ffb7fde6c46b51cb7048112f885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 21 Jun 2016 05:06:23 +0100 Subject: Remove Makefile.common files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- epan/dissectors/asn1/m3ap/Makefile.am | 29 +++++++++++++++++--- epan/dissectors/asn1/m3ap/Makefile.common | 44 ------------------------------- 2 files changed, 26 insertions(+), 47 deletions(-) delete mode 100644 epan/dissectors/asn1/m3ap/Makefile.common (limited to 'epan/dissectors/asn1/m3ap') diff --git a/epan/dissectors/asn1/m3ap/Makefile.am b/epan/dissectors/asn1/m3ap/Makefile.am index 11932c53a4..e6618acecc 100644 --- a/epan/dissectors/asn1/m3ap/Makefile.am +++ b/epan/dissectors/asn1/m3ap/Makefile.am @@ -16,7 +16,30 @@ # 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 = m3ap + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = \ + M3AP-CommonDataTypes.asn \ + M3AP-Constants.asn \ + M3AP-Containers.asn \ + M3AP-IEs.asn \ + M3AP-PDU-Contents.asn \ + M3AP-PDU-Descriptions.asn + +EXTRA_DIST = \ + $(EXTRA_DIST_COMMON) \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS = + +EXTRA_CNF = diff --git a/epan/dissectors/asn1/m3ap/Makefile.common b/epan/dissectors/asn1/m3ap/Makefile.common deleted file mode 100644 index 1ad1d93891..0000000000 --- a/epan/dissectors/asn1/m3ap/Makefile.common +++ /dev/null @@ -1,44 +0,0 @@ -# Wireshark - Network traffic analyzer -# By Gerald Combs -# 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 = m3ap - -EXT_ASN_FILE_LIST = - -ASN_FILE_LIST = \ - M3AP-CommonDataTypes.asn \ - M3AP-Constants.asn \ - M3AP-Containers.asn \ - M3AP-IEs.asn \ - M3AP-PDU-Contents.asn \ - M3AP-PDU-Descriptions.asn - -EXTRA_DIST = \ - $(EXTRA_DIST_COMMON) \ - $(ASN_FILE_LIST) \ - packet-$(PROTOCOL_NAME)-template.c \ - $(PROTOCOL_NAME).cnf - -SRC_FILES = \ - $(EXTRA_DIST) \ - $(EXT_ASN_FILE_LIST) - -A2W_FLAGS = - -EXTRA_CNF = -- cgit v1.2.3