aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1/x2ap
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/asn1/x2ap')
-rw-r--r--epan/dissectors/asn1/x2ap/Makefile.am29
-rw-r--r--epan/dissectors/asn1/x2ap/Makefile.common44
2 files changed, 26 insertions, 47 deletions
diff --git a/epan/dissectors/asn1/x2ap/Makefile.am b/epan/dissectors/asn1/x2ap/Makefile.am
index 11932c53a4..d61faef3c3 100644
--- a/epan/dissectors/asn1/x2ap/Makefile.am
+++ b/epan/dissectors/asn1/x2ap/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 = x2ap
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ X2AP-CommonDataTypes.asn \
+ X2AP-Constants.asn \
+ X2AP-Containers.asn \
+ X2AP-IEs.asn \
+ X2AP-PDU-Contents.asn \
+ X2AP-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/x2ap/Makefile.common b/epan/dissectors/asn1/x2ap/Makefile.common
deleted file mode 100644
index 8b45e8fa4f..0000000000
--- a/epan/dissectors/asn1/x2ap/Makefile.common
+++ /dev/null
@@ -1,44 +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 = x2ap
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- X2AP-CommonDataTypes.asn \
- X2AP-Constants.asn \
- X2AP-Containers.asn \
- X2AP-IEs.asn \
- X2AP-PDU-Contents.asn \
- X2AP-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 =