aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/asn1')
-rw-r--r--epan/dissectors/asn1/HI2Operations/Makefile.am28
-rw-r--r--epan/dissectors/asn1/HI2Operations/Makefile.common43
-rw-r--r--epan/dissectors/asn1/Makefile.am3
-rw-r--r--epan/dissectors/asn1/Makefile.inc5
-rw-r--r--epan/dissectors/asn1/Makefile.preinc24
-rw-r--r--epan/dissectors/asn1/acp133/Makefile.am48
-rw-r--r--epan/dissectors/asn1/acp133/Makefile.common63
-rw-r--r--epan/dissectors/asn1/acse/Makefile.am34
-rw-r--r--epan/dissectors/asn1/acse/Makefile.common49
-rw-r--r--epan/dissectors/asn1/ansi_map/Makefile.am31
-rw-r--r--epan/dissectors/asn1/ansi_map/Makefile.common46
-rw-r--r--epan/dissectors/asn1/ansi_tcap/Makefile.am28
-rw-r--r--epan/dissectors/asn1/ansi_tcap/Makefile.common43
-rw-r--r--epan/dissectors/asn1/atn-cm/Makefile.am24
-rw-r--r--epan/dissectors/asn1/atn-cm/Makefile.common39
-rw-r--r--epan/dissectors/asn1/atn-cpdlc/Makefile.am24
-rw-r--r--epan/dissectors/asn1/atn-cpdlc/Makefile.common39
-rw-r--r--epan/dissectors/asn1/atn-ulcs/Makefile.am25
-rw-r--r--epan/dissectors/asn1/atn-ulcs/Makefile.common40
-rw-r--r--epan/dissectors/asn1/c1222/Makefile.am27
-rw-r--r--epan/dissectors/asn1/c1222/Makefile.common42
-rw-r--r--epan/dissectors/asn1/camel/Makefile.am53
-rw-r--r--epan/dissectors/asn1/camel/Makefile.common68
-rw-r--r--epan/dissectors/asn1/cdt/Makefile.am27
-rw-r--r--epan/dissectors/asn1/cdt/Makefile.common42
-rw-r--r--epan/dissectors/asn1/charging_ase/Makefile.am25
-rw-r--r--epan/dissectors/asn1/charging_ase/Makefile.common40
-rw-r--r--epan/dissectors/asn1/cmip/Makefile.am43
-rw-r--r--epan/dissectors/asn1/cmip/Makefile.common58
-rw-r--r--epan/dissectors/asn1/cmp/Makefile.am33
-rw-r--r--epan/dissectors/asn1/cmp/Makefile.common48
-rw-r--r--epan/dissectors/asn1/cms/Makefile.am50
-rw-r--r--epan/dissectors/asn1/cms/Makefile.common65
-rw-r--r--epan/dissectors/asn1/credssp/Makefile.am29
-rw-r--r--epan/dissectors/asn1/credssp/Makefile.common44
-rw-r--r--epan/dissectors/asn1/crmf/Makefile.am33
-rw-r--r--epan/dissectors/asn1/crmf/Makefile.common48
-rw-r--r--epan/dissectors/asn1/dap/Makefile.am67
-rw-r--r--epan/dissectors/asn1/dap/Makefile.common82
-rw-r--r--epan/dissectors/asn1/disp/Makefile.am53
-rw-r--r--epan/dissectors/asn1/disp/Makefile.common68
-rw-r--r--epan/dissectors/asn1/dop/Makefile.am54
-rw-r--r--epan/dissectors/asn1/dop/Makefile.common69
-rw-r--r--epan/dissectors/asn1/dsp/Makefile.am46
-rw-r--r--epan/dissectors/asn1/dsp/Makefile.common61
-rw-r--r--epan/dissectors/asn1/ess/Makefile.am39
-rw-r--r--epan/dissectors/asn1/ess/Makefile.common54
-rw-r--r--epan/dissectors/asn1/ftam/Makefile.am34
-rw-r--r--epan/dissectors/asn1/ftam/Makefile.common49
-rw-r--r--epan/dissectors/asn1/goose/Makefile.am26
-rw-r--r--epan/dissectors/asn1/goose/Makefile.common41
-rw-r--r--epan/dissectors/asn1/gprscdr/Makefile.am45
-rw-r--r--epan/dissectors/asn1/gprscdr/Makefile.common60
-rw-r--r--epan/dissectors/asn1/gsm_map/Makefile.am79
-rw-r--r--epan/dissectors/asn1/gsm_map/Makefile.common94
-rw-r--r--epan/dissectors/asn1/h225/Makefile.am38
-rw-r--r--epan/dissectors/asn1/h225/Makefile.common53
-rw-r--r--epan/dissectors/asn1/h235/Makefile.am34
-rw-r--r--epan/dissectors/asn1/h235/Makefile.common49
-rw-r--r--epan/dissectors/asn1/h245/Makefile.am28
-rw-r--r--epan/dissectors/asn1/h245/Makefile.common43
-rw-r--r--epan/dissectors/asn1/h248/Makefile.am32
-rw-r--r--epan/dissectors/asn1/h248/Makefile.common47
-rw-r--r--epan/dissectors/asn1/h282/Makefile.am24
-rw-r--r--epan/dissectors/asn1/h282/Makefile.common39
-rw-r--r--epan/dissectors/asn1/h283/Makefile.am24
-rw-r--r--epan/dissectors/asn1/h283/Makefile.common39
-rw-r--r--epan/dissectors/asn1/h323/Makefile.am30
-rw-r--r--epan/dissectors/asn1/h323/Makefile.common45
-rw-r--r--epan/dissectors/asn1/h450-ros/Makefile.am36
-rw-r--r--epan/dissectors/asn1/h450-ros/Makefile.common51
-rw-r--r--epan/dissectors/asn1/h450/Makefile.am58
-rw-r--r--epan/dissectors/asn1/h450/Makefile.common73
-rw-r--r--epan/dissectors/asn1/h460/Makefile.am48
-rw-r--r--epan/dissectors/asn1/h460/Makefile.common64
-rw-r--r--epan/dissectors/asn1/h501/Makefile.am32
-rw-r--r--epan/dissectors/asn1/h501/Makefile.common47
-rw-r--r--epan/dissectors/asn1/hnbap/Makefile.am29
-rw-r--r--epan/dissectors/asn1/hnbap/Makefile.common44
-rw-r--r--epan/dissectors/asn1/idmp/Makefile.am39
-rw-r--r--epan/dissectors/asn1/idmp/Makefile.common54
-rw-r--r--epan/dissectors/asn1/ilp/Makefile.am25
-rw-r--r--epan/dissectors/asn1/ilp/Makefile.common40
-rw-r--r--epan/dissectors/asn1/inap/Makefile.am66
-rw-r--r--epan/dissectors/asn1/inap/Makefile.common81
-rw-r--r--epan/dissectors/asn1/isdn-sup/Makefile.am49
-rw-r--r--epan/dissectors/asn1/isdn-sup/Makefile.common64
-rw-r--r--epan/dissectors/asn1/kerberos/Makefile.am30
-rw-r--r--epan/dissectors/asn1/kerberos/Makefile.common45
-rw-r--r--epan/dissectors/asn1/lcsap/Makefile.am40
-rw-r--r--epan/dissectors/asn1/lcsap/Makefile.common55
-rw-r--r--epan/dissectors/asn1/ldap/Makefile.am29
-rw-r--r--epan/dissectors/asn1/ldap/Makefile.common44
-rw-r--r--epan/dissectors/asn1/logotypecertextn/Makefile.am31
-rw-r--r--epan/dissectors/asn1/logotypecertextn/Makefile.common46
-rw-r--r--epan/dissectors/asn1/lpp/Makefile.am28
-rw-r--r--epan/dissectors/asn1/lpp/Makefile.common43
-rw-r--r--epan/dissectors/asn1/lppa/Makefile.am29
-rw-r--r--epan/dissectors/asn1/lppa/Makefile.common44
-rw-r--r--epan/dissectors/asn1/lppe/Makefile.am28
-rw-r--r--epan/dissectors/asn1/lppe/Makefile.common43
-rw-r--r--epan/dissectors/asn1/lte-rrc/Makefile.am31
-rw-r--r--epan/dissectors/asn1/lte-rrc/Makefile.common46
-rw-r--r--epan/dissectors/asn1/m3ap/Makefile.am29
-rw-r--r--epan/dissectors/asn1/m3ap/Makefile.common44
-rw-r--r--epan/dissectors/asn1/mms/Makefile.am31
-rw-r--r--epan/dissectors/asn1/mms/Makefile.common46
-rw-r--r--epan/dissectors/asn1/mpeg-audio/Makefile.am26
-rw-r--r--epan/dissectors/asn1/mpeg-audio/Makefile.common41
-rw-r--r--epan/dissectors/asn1/mpeg-pes/Makefile.am26
-rw-r--r--epan/dissectors/asn1/mpeg-pes/Makefile.common41
-rw-r--r--epan/dissectors/asn1/nbap/Makefile.am30
-rw-r--r--epan/dissectors/asn1/nbap/Makefile.common45
-rw-r--r--epan/dissectors/asn1/novell_pkis/Makefile.am19
-rw-r--r--epan/dissectors/asn1/novell_pkis/Makefile.common34
-rw-r--r--epan/dissectors/asn1/ns_cert_exts/Makefile.am24
-rw-r--r--epan/dissectors/asn1/ns_cert_exts/Makefile.common39
-rw-r--r--epan/dissectors/asn1/ocsp/Makefile.am35
-rw-r--r--epan/dissectors/asn1/ocsp/Makefile.common50
-rw-r--r--epan/dissectors/asn1/p1/Makefile.am60
-rw-r--r--epan/dissectors/asn1/p1/Makefile.common75
-rw-r--r--epan/dissectors/asn1/p22/Makefile.am65
-rw-r--r--epan/dissectors/asn1/p22/Makefile.common80
-rw-r--r--epan/dissectors/asn1/p7/Makefile.am48
-rw-r--r--epan/dissectors/asn1/p7/Makefile.common63
-rw-r--r--epan/dissectors/asn1/p772/Makefile.am43
-rw-r--r--epan/dissectors/asn1/p772/Makefile.common58
-rw-r--r--epan/dissectors/asn1/pcap/Makefile.am29
-rw-r--r--epan/dissectors/asn1/pcap/Makefile.common44
-rw-r--r--epan/dissectors/asn1/pkcs1/Makefile.am31
-rw-r--r--epan/dissectors/asn1/pkcs1/Makefile.common46
-rw-r--r--epan/dissectors/asn1/pkcs12/Makefile.am40
-rw-r--r--epan/dissectors/asn1/pkcs12/Makefile.common55
-rw-r--r--epan/dissectors/asn1/pkinit/Makefile.am31
-rw-r--r--epan/dissectors/asn1/pkinit/Makefile.common46
-rw-r--r--epan/dissectors/asn1/pkix1explicit/Makefile.am29
-rw-r--r--epan/dissectors/asn1/pkix1explicit/Makefile.common44
-rw-r--r--epan/dissectors/asn1/pkix1implicit/Makefile.am35
-rw-r--r--epan/dissectors/asn1/pkix1implicit/Makefile.common51
-rw-r--r--epan/dissectors/asn1/pkixac/Makefile.am37
-rw-r--r--epan/dissectors/asn1/pkixac/Makefile.common52
-rw-r--r--epan/dissectors/asn1/pkixproxy/Makefile.am27
-rw-r--r--epan/dissectors/asn1/pkixproxy/Makefile.common42
-rw-r--r--epan/dissectors/asn1/pkixqualified/Makefile.am39
-rw-r--r--epan/dissectors/asn1/pkixqualified/Makefile.common54
-rw-r--r--epan/dissectors/asn1/pkixtsp/Makefile.am31
-rw-r--r--epan/dissectors/asn1/pkixtsp/Makefile.common46
-rw-r--r--epan/dissectors/asn1/pres/Makefile.am32
-rw-r--r--epan/dissectors/asn1/pres/Makefile.common47
-rw-r--r--epan/dissectors/asn1/q932-ros/Makefile.am33
-rw-r--r--epan/dissectors/asn1/q932-ros/Makefile.common48
-rw-r--r--epan/dissectors/asn1/q932/Makefile.am32
-rw-r--r--epan/dissectors/asn1/q932/Makefile.common47
-rw-r--r--epan/dissectors/asn1/qsig/Makefile.am58
-rw-r--r--epan/dissectors/asn1/qsig/Makefile.common73
-rw-r--r--epan/dissectors/asn1/ranap/Makefile.am30
-rw-r--r--epan/dissectors/asn1/ranap/Makefile.common45
-rw-r--r--epan/dissectors/asn1/rnsap/Makefile.am29
-rw-r--r--epan/dissectors/asn1/rnsap/Makefile.common44
-rw-r--r--epan/dissectors/asn1/ros/Makefile.am40
-rw-r--r--epan/dissectors/asn1/ros/Makefile.common55
-rw-r--r--epan/dissectors/asn1/rrc/Makefile.am29
-rw-r--r--epan/dissectors/asn1/rrc/Makefile.common44
-rw-r--r--epan/dissectors/asn1/rrlp/Makefile.am27
-rw-r--r--epan/dissectors/asn1/rrlp/Makefile.common42
-rw-r--r--epan/dissectors/asn1/rtse/Makefile.am29
-rw-r--r--epan/dissectors/asn1/rtse/Makefile.common44
-rw-r--r--epan/dissectors/asn1/rua/Makefile.am29
-rw-r--r--epan/dissectors/asn1/rua/Makefile.common44
-rw-r--r--epan/dissectors/asn1/s1ap/Makefile.am33
-rw-r--r--epan/dissectors/asn1/s1ap/Makefile.common48
-rw-r--r--epan/dissectors/asn1/sabp/Makefile.am29
-rw-r--r--epan/dissectors/asn1/sabp/Makefile.common44
-rw-r--r--epan/dissectors/asn1/sbc-ap/Makefile.am31
-rw-r--r--epan/dissectors/asn1/sbc-ap/Makefile.common46
-rw-r--r--epan/dissectors/asn1/smrse/Makefile.am27
-rw-r--r--epan/dissectors/asn1/smrse/Makefile.common42
-rw-r--r--epan/dissectors/asn1/snmp/Makefile.am27
-rw-r--r--epan/dissectors/asn1/snmp/Makefile.common42
-rw-r--r--epan/dissectors/asn1/spnego/Makefile.am26
-rw-r--r--epan/dissectors/asn1/spnego/Makefile.common41
-rw-r--r--epan/dissectors/asn1/sv/Makefile.am25
-rw-r--r--epan/dissectors/asn1/sv/Makefile.common40
-rw-r--r--epan/dissectors/asn1/t124/Makefile.am29
-rw-r--r--epan/dissectors/asn1/t124/Makefile.common43
-rw-r--r--epan/dissectors/asn1/t125/Makefile.am26
-rw-r--r--epan/dissectors/asn1/t125/Makefile.common41
-rw-r--r--epan/dissectors/asn1/t38/Makefile.am29
-rw-r--r--epan/dissectors/asn1/t38/Makefile.common44
-rw-r--r--epan/dissectors/asn1/tcap/Makefile.am34
-rw-r--r--epan/dissectors/asn1/tcap/Makefile.common49
-rw-r--r--epan/dissectors/asn1/tetra/Makefile.am27
-rw-r--r--epan/dissectors/asn1/tetra/Makefile.common42
-rw-r--r--epan/dissectors/asn1/ulp/Makefile.am26
-rw-r--r--epan/dissectors/asn1/ulp/Makefile.common41
-rw-r--r--epan/dissectors/asn1/wlancertextn/Makefile.am27
-rw-r--r--epan/dissectors/asn1/wlancertextn/Makefile.common42
-rw-r--r--epan/dissectors/asn1/x2ap/Makefile.am29
-rw-r--r--epan/dissectors/asn1/x2ap/Makefile.common44
-rw-r--r--epan/dissectors/asn1/x509af/Makefile.am41
-rw-r--r--epan/dissectors/asn1/x509af/Makefile.common56
-rw-r--r--epan/dissectors/asn1/x509ce/Makefile.am49
-rw-r--r--epan/dissectors/asn1/x509ce/Makefile.common64
-rw-r--r--epan/dissectors/asn1/x509if/Makefile.am35
-rw-r--r--epan/dissectors/asn1/x509if/Makefile.common50
-rw-r--r--epan/dissectors/asn1/x509sat/Makefile.am38
-rw-r--r--epan/dissectors/asn1/x509sat/Makefile.common53
-rw-r--r--epan/dissectors/asn1/x721/Makefile.am19
-rw-r--r--epan/dissectors/asn1/x721/Makefile.common33
209 files changed, 3279 insertions, 5464 deletions
diff --git a/epan/dissectors/asn1/HI2Operations/Makefile.am b/epan/dissectors/asn1/HI2Operations/Makefile.am
index 11932c53a4..12f84db8ac 100644
--- a/epan/dissectors/asn1/HI2Operations/Makefile.am
+++ b/epan/dissectors/asn1/HI2Operations/Makefile.am
@@ -16,7 +16,29 @@
# 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=HI2Operations
+
+ASN_FILE_LIST = \
+ HI2Operations_ver11.asn \
+ UmtsHI2Operations.asn \
+ TS101909201.asn \
+ PCESP.asn \
+ EN301040.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 \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/HI2Operations/Makefile.common b/epan/dissectors/asn1/HI2Operations/Makefile.common
deleted file mode 100644
index a6fbd42636..0000000000
--- a/epan/dissectors/asn1/HI2Operations/Makefile.common
+++ /dev/null
@@ -1,43 +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=HI2Operations
-
-ASN_FILE_LIST = \
- HI2Operations_ver11.asn \
- UmtsHI2Operations.asn \
- TS101909201.asn \
- PCESP.asn \
- EN301040.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 \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS= -b
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/Makefile.am b/epan/dissectors/asn1/Makefile.am
index 8628cf6683..0f59acce02 100644
--- a/epan/dissectors/asn1/Makefile.am
+++ b/epan/dissectors/asn1/Makefile.am
@@ -134,8 +134,7 @@ DIST_SUBDIRS = $(SUBDIRS) $(DONT_BUILD_SUBDIRS)
EXTRA_DIST = \
CMakeLists.txt \
- Makefile.inc \
- Makefile.preinc
+ Makefile.inc
MAINTAINERCLEANFILES = \
Makefile.in
diff --git a/epan/dissectors/asn1/Makefile.inc b/epan/dissectors/asn1/Makefile.inc
index 77d7c9515d..c6a82df6ac 100644
--- a/epan/dissectors/asn1/Makefile.inc
+++ b/epan/dissectors/asn1/Makefile.inc
@@ -18,6 +18,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+MAKE_CNF_EXPORT = $(MAKE) generate_export
+
+EXTRA_DIST_COMMON = \
+ CMakeLists.txt
+
DISSECTOR = $(top_srcdir)/epan/dissectors/packet-$(PROTOCOL_NAME).c
# This header file need not exist/get generated. It is only used when cleaning.
DISSECTOR_HEADER=$(top_srcdir)/epan/dissectors/packet-$(PROTOCOL_NAME).h
diff --git a/epan/dissectors/asn1/Makefile.preinc b/epan/dissectors/asn1/Makefile.preinc
deleted file mode 100644
index 8bd5481e61..0000000000
--- a/epan/dissectors/asn1/Makefile.preinc
+++ /dev/null
@@ -1,24 +0,0 @@
-# To be included into the asn1 Makefiles
-#
-# 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.
-
-MAKE_CNF_EXPORT = $(MAKE) generate_export
-
-EXTRA_DIST_COMMON = \
- CMakeLists.txt
diff --git a/epan/dissectors/asn1/acp133/Makefile.am b/epan/dissectors/asn1/acp133/Makefile.am
index 11932c53a4..558a0037f2 100644
--- a/epan/dissectors/asn1/acp133/Makefile.am
+++ b/epan/dissectors/asn1/acp133/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=acp133
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).asn \
+ MHSDirectoryObjectsAndAttributes.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
+
+EXTRA_CNF= \
+ $(builddir)/../p1/p1-exp.cnf \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509ce/x509ce-exp.cnf \
+ $(builddir)/../x509if/x509if-exp.cnf \
+ $(builddir)/../x509sat/x509sat-exp.cnf
+
+$(builddir)/../p1/p1-exp.cnf:
+ (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509sat/x509sat-exp.cnf:
+ (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/acp133/Makefile.common b/epan/dissectors/asn1/acp133/Makefile.common
deleted file mode 100644
index 886d43d666..0000000000
--- a/epan/dissectors/asn1/acp133/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=acp133
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).asn \
- MHSDirectoryObjectsAndAttributes.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
-
-EXTRA_CNF= \
- $(builddir)/../p1/p1-exp.cnf \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509ce/x509ce-exp.cnf \
- $(builddir)/../x509if/x509if-exp.cnf \
- $(builddir)/../x509sat/x509sat-exp.cnf
-
-$(builddir)/../p1/p1-exp.cnf:
- (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
- (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/acse/Makefile.am b/epan/dissectors/asn1/acse/Makefile.am
index 11932c53a4..8dbaf573b3 100644
--- a/epan/dissectors/asn1/acse/Makefile.am
+++ b/epan/dissectors/asn1/acse/Makefile.am
@@ -16,7 +16,35 @@
# 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=acse
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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 -C
+
+EXTRA_CNF= \
+ $(builddir)/../x509if/x509if-exp.cnf
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/acse/Makefile.common b/epan/dissectors/asn1/acse/Makefile.common
deleted file mode 100644
index 80f9cba0b9..0000000000
--- a/epan/dissectors/asn1/acse/Makefile.common
+++ /dev/null
@@ -1,49 +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=acse
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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 -C
-
-EXTRA_CNF= \
- $(builddir)/../x509if/x509if-exp.cnf
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/ansi_map/Makefile.am b/epan/dissectors/asn1/ansi_map/Makefile.am
index 11932c53a4..455ea17807 100644
--- a/epan/dissectors/asn1/ansi_map/Makefile.am
+++ b/epan/dissectors/asn1/ansi_map/Makefile.am
@@ -16,7 +16,32 @@
# 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=ansi_map
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
+
+EXTRA_CNF= \
+ $(builddir)/../gsm_map/gsm_map-exp.cnf
+
+$(builddir)/../gsm_map/gsm_map-exp.cnf:
+ (cd $(builddir)/../gsm_map && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/ansi_map/Makefile.common b/epan/dissectors/asn1/ansi_map/Makefile.common
deleted file mode 100644
index 864622a504..0000000000
--- a/epan/dissectors/asn1/ansi_map/Makefile.common
+++ /dev/null
@@ -1,46 +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=ansi_map
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
-
-EXTRA_CNF= \
- $(builddir)/../gsm_map/gsm_map-exp.cnf
-
-$(builddir)/../gsm_map/gsm_map-exp.cnf:
- (cd $(builddir)/../gsm_map && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/ansi_tcap/Makefile.am b/epan/dissectors/asn1/ansi_tcap/Makefile.am
index 11932c53a4..9bc2142d8c 100644
--- a/epan/dissectors/asn1/ansi_tcap/Makefile.am
+++ b/epan/dissectors/asn1/ansi_tcap/Makefile.am
@@ -16,7 +16,29 @@
# 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=ansi_tcap
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ TCAP-Remote-Operations-Information-Objects.asn \
+ TCAPPackage.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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/ansi_tcap/Makefile.common b/epan/dissectors/asn1/ansi_tcap/Makefile.common
deleted file mode 100644
index e3019ac740..0000000000
--- a/epan/dissectors/asn1/ansi_tcap/Makefile.common
+++ /dev/null
@@ -1,43 +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=ansi_tcap
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- TCAP-Remote-Operations-Information-Objects.asn \
- TCAPPackage.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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/atn-cm/Makefile.am b/epan/dissectors/asn1/atn-cm/Makefile.am
index 11932c53a4..929f455929 100644
--- a/epan/dissectors/asn1/atn-cm/Makefile.am
+++ b/epan/dissectors/asn1/atn-cm/Makefile.am
@@ -16,7 +16,25 @@
# 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 = atn-cm
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = $(PROTOCOL_NAME).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)
+
+# ASN1 PER unaligned encoding
+A2W_FLAGS= -u -L
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/atn-cm/Makefile.common b/epan/dissectors/asn1/atn-cm/Makefile.common
deleted file mode 100644
index 166e01523b..0000000000
--- a/epan/dissectors/asn1/atn-cm/Makefile.common
+++ /dev/null
@@ -1,39 +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 = atn-cm
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = $(PROTOCOL_NAME).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)
-
-# ASN1 PER unaligned encoding
-A2W_FLAGS= -u -L
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/atn-cpdlc/Makefile.am b/epan/dissectors/asn1/atn-cpdlc/Makefile.am
index 11932c53a4..2d423b2b51 100644
--- a/epan/dissectors/asn1/atn-cpdlc/Makefile.am
+++ b/epan/dissectors/asn1/atn-cpdlc/Makefile.am
@@ -16,7 +16,25 @@
# 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 = atn-cpdlc
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = $(PROTOCOL_NAME).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)
+
+# ASN1 PER unaligned encoding
+A2W_FLAGS= -u -L
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/atn-cpdlc/Makefile.common b/epan/dissectors/asn1/atn-cpdlc/Makefile.common
deleted file mode 100644
index 192bf4515c..0000000000
--- a/epan/dissectors/asn1/atn-cpdlc/Makefile.common
+++ /dev/null
@@ -1,39 +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 = atn-cpdlc
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = $(PROTOCOL_NAME).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)
-
-# ASN1 PER unaligned encoding
-A2W_FLAGS= -u -L
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/atn-ulcs/Makefile.am b/epan/dissectors/asn1/atn-ulcs/Makefile.am
index 11932c53a4..aed3896fd4 100644
--- a/epan/dissectors/asn1/atn-ulcs/Makefile.am
+++ b/epan/dissectors/asn1/atn-ulcs/Makefile.am
@@ -16,7 +16,26 @@
# 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 = atn-ulcs
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = $(PROTOCOL_NAME).asn
+
+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)
+
+# default behavoiur ASN1 PER encoding
+A2W_FLAGS= -u -L
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/atn-ulcs/Makefile.common b/epan/dissectors/asn1/atn-ulcs/Makefile.common
deleted file mode 100644
index 4687c12069..0000000000
--- a/epan/dissectors/asn1/atn-ulcs/Makefile.common
+++ /dev/null
@@ -1,40 +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 = atn-ulcs
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = $(PROTOCOL_NAME).asn
-
-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)
-
-# default behavoiur ASN1 PER encoding
-A2W_FLAGS= -u -L
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/c1222/Makefile.am b/epan/dissectors/asn1/c1222/Makefile.am
index 11932c53a4..8b641ce41f 100644
--- a/epan/dissectors/asn1/c1222/Makefile.am
+++ b/epan/dissectors/asn1/c1222/Makefile.am
@@ -16,7 +16,28 @@
# 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 = c1222
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/c1222/Makefile.common b/epan/dissectors/asn1/c1222/Makefile.common
deleted file mode 100644
index d8047ea696..0000000000
--- a/epan/dissectors/asn1/c1222/Makefile.common
+++ /dev/null
@@ -1,42 +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 = c1222
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/camel/Makefile.am b/epan/dissectors/asn1/camel/Makefile.am
index 11932c53a4..827a6cd878 100644
--- a/epan/dissectors/asn1/camel/Makefile.am
+++ b/epan/dissectors/asn1/camel/Makefile.am
@@ -16,7 +16,54 @@
# 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=camel
+
+EXT_ASN_FILE_LIST_LATE = \
+ ../ros/Remote-Operations-Information-Objects.asn \
+ ../ros/Remote-Operations-Generic-ROS-PDUs.asn
+
+ASN_FILE_LIST = \
+ CAP-object-identifiers.asn \
+ CAP-classes.asn \
+ CAP-datatypes.asn \
+ CAP-errorcodes.asn \
+ CAP-errortypes.asn \
+ CAP-operationcodes.asn \
+ CAP-GPRS-ReferenceNumber.asn \
+ CAP-gsmSCF-gsmSRF-ops-args.asn \
+ CAP-gsmSSF-gsmSCF-ops-args.asn \
+ CAP-gprsSSF-gsmSCF-ops-args.asn \
+ CAP-SMS-ops-args.asn \
+ CAP-U-ABORT-Data.asn \
+ CamelV2diff.asn
+
+INCLUDED_ASN_FILE_LIST = \
+ TCAPMessages.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) \
+ $(INCLUDED_ASN_FILE_LIST) \
+ packet-$(PROTOCOL_NAME)-template.c \
+ packet-$(PROTOCOL_NAME)-template.h \
+ $(PROTOCOL_NAME).asn \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b -L
+
+EXTRA_CNF=$(builddir)/../inap/inap-exp.cnf \
+ $(builddir)/../gsm_map/gsm_map-exp.cnf
+
+$(builddir)/../gsm_map/gsm_map-exp.cnf:
+ (cd $(builddir)/../gsm_map && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../inap/inap-exp.cnf:
+ (cd $(builddir)/../inap && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/camel/Makefile.common b/epan/dissectors/asn1/camel/Makefile.common
deleted file mode 100644
index fe996c3d39..0000000000
--- a/epan/dissectors/asn1/camel/Makefile.common
+++ /dev/null
@@ -1,68 +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=camel
-
-EXT_ASN_FILE_LIST_LATE = \
- ../ros/Remote-Operations-Information-Objects.asn \
- ../ros/Remote-Operations-Generic-ROS-PDUs.asn
-
-ASN_FILE_LIST = \
- CAP-object-identifiers.asn \
- CAP-classes.asn \
- CAP-datatypes.asn \
- CAP-errorcodes.asn \
- CAP-errortypes.asn \
- CAP-operationcodes.asn \
- CAP-GPRS-ReferenceNumber.asn \
- CAP-gsmSCF-gsmSRF-ops-args.asn \
- CAP-gsmSSF-gsmSCF-ops-args.asn \
- CAP-gprsSSF-gsmSCF-ops-args.asn \
- CAP-SMS-ops-args.asn \
- CAP-U-ABORT-Data.asn \
- CamelV2diff.asn
-
-INCLUDED_ASN_FILE_LIST = \
- TCAPMessages.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) \
- $(INCLUDED_ASN_FILE_LIST) \
- packet-$(PROTOCOL_NAME)-template.c \
- packet-$(PROTOCOL_NAME)-template.h \
- $(PROTOCOL_NAME).asn \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS= -b -L
-
-EXTRA_CNF=$(builddir)/../inap/inap-exp.cnf \
- $(builddir)/../gsm_map/gsm_map-exp.cnf
-
-$(builddir)/../gsm_map/gsm_map-exp.cnf:
- (cd $(builddir)/../gsm_map && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../inap/inap-exp.cnf:
- (cd $(builddir)/../inap && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/cdt/Makefile.am b/epan/dissectors/asn1/cdt/Makefile.am
index 11932c53a4..fb24d3797d 100644
--- a/epan/dissectors/asn1/cdt/Makefile.am
+++ b/epan/dissectors/asn1/cdt/Makefile.am
@@ -16,7 +16,28 @@
# 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=cdt
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/cdt/Makefile.common b/epan/dissectors/asn1/cdt/Makefile.common
deleted file mode 100644
index 6a6c895cfc..0000000000
--- a/epan/dissectors/asn1/cdt/Makefile.common
+++ /dev/null
@@ -1,42 +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=cdt
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/charging_ase/Makefile.am b/epan/dissectors/asn1/charging_ase/Makefile.am
index 11932c53a4..403b7bd23a 100644
--- a/epan/dissectors/asn1/charging_ase/Makefile.am
+++ b/epan/dissectors/asn1/charging_ase/Makefile.am
@@ -16,7 +16,26 @@
# 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=charging_ase
+
+ASN_FILE_LIST = \
+ Tariffing-Data-Types.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
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/charging_ase/Makefile.common b/epan/dissectors/asn1/charging_ase/Makefile.common
deleted file mode 100644
index 8f99baceea..0000000000
--- a/epan/dissectors/asn1/charging_ase/Makefile.common
+++ /dev/null
@@ -1,40 +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=charging_ase
-
-ASN_FILE_LIST = \
- Tariffing-Data-Types.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
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/cmip/Makefile.am b/epan/dissectors/asn1/cmip/Makefile.am
index 11932c53a4..f461417863 100644
--- a/epan/dissectors/asn1/cmip/Makefile.am
+++ b/epan/dissectors/asn1/cmip/Makefile.am
@@ -16,7 +16,44 @@
# 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=cmip
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST_LATE = \
+ ../x721/Attribute-ASN1Module.asn \
+ ../ros/Remote-Operations-Information-Objects.asn \
+ ../ros/Remote-Operations-Generic-ROS-PDUs.asn
+
+ASN_FILE_LIST = \
+ CMIP-1.asn \
+ CMIP-A-ABORT-Information.asn \
+ CMIP-A-ASSOCIATE-Information.asn
+
+INCLUDED_ASN_FILE_LIST = \
+ CMIP.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) \
+ $(INCLUDED_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
+
+EXTRA_CNF= \
+ $(builddir)/../acse/acse-exp.cnf
+
+$(builddir)/../acse/acse-exp.cnf:
+ (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/cmip/Makefile.common b/epan/dissectors/asn1/cmip/Makefile.common
deleted file mode 100644
index 4dd500d97e..0000000000
--- a/epan/dissectors/asn1/cmip/Makefile.common
+++ /dev/null
@@ -1,58 +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=cmip
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST_LATE = \
- ../x721/Attribute-ASN1Module.asn \
- ../ros/Remote-Operations-Information-Objects.asn \
- ../ros/Remote-Operations-Generic-ROS-PDUs.asn
-
-ASN_FILE_LIST = \
- CMIP-1.asn \
- CMIP-A-ABORT-Information.asn \
- CMIP-A-ASSOCIATE-Information.asn
-
-INCLUDED_ASN_FILE_LIST = \
- CMIP.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) \
- $(INCLUDED_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
-
-EXTRA_CNF= \
- $(builddir)/../acse/acse-exp.cnf
-
-$(builddir)/../acse/acse-exp.cnf:
- (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/cmp/Makefile.am b/epan/dissectors/asn1/cmp/Makefile.am
index 11932c53a4..3c1d277b04 100644
--- a/epan/dissectors/asn1/cmp/Makefile.am
+++ b/epan/dissectors/asn1/cmp/Makefile.am
@@ -16,7 +16,34 @@
# 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=cmp
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ CMP.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
+
+EXTRA_CNF= \
+ $(builddir)/../pkix1explicit/pkix1explicit_exp.cnf \
+ $(builddir)/../pkix1implicit/pkix1implicit_exp.cnf \
+ $(builddir)/../crmf/crmf-exp.cnf
+
+$(builddir)/../crmf/crmf-exp.cnf:
+ (cd $(builddir)/../crmf && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/cmp/Makefile.common b/epan/dissectors/asn1/cmp/Makefile.common
deleted file mode 100644
index 6d5b2b5123..0000000000
--- a/epan/dissectors/asn1/cmp/Makefile.common
+++ /dev/null
@@ -1,48 +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=cmp
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- CMP.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
-
-EXTRA_CNF= \
- $(builddir)/../pkix1explicit/pkix1explicit_exp.cnf \
- $(builddir)/../pkix1implicit/pkix1implicit_exp.cnf \
- $(builddir)/../crmf/crmf-exp.cnf
-
-$(builddir)/../crmf/crmf-exp.cnf:
- (cd $(builddir)/../crmf && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/cms/Makefile.am b/epan/dissectors/asn1/cms/Makefile.am
index 11932c53a4..2727640544 100644
--- a/epan/dissectors/asn1/cms/Makefile.am
+++ b/epan/dissectors/asn1/cms/Makefile.am
@@ -16,7 +16,51 @@
# 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=cms
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ CryptographicMessageSyntax.asn \
+ AttributeCertificateVersion1.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 -C
+
+EXTRA_CNF = \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509ce/x509ce-exp.cnf \
+ $(builddir)/../x509if/x509if-exp.cnf \
+ $(builddir)/../x509sat/x509sat-exp.cnf
+
+EXPORT_DEPENDS = \
+ $(builddir)/../x509af/x509af-exp.cnf
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509sat/x509sat-exp.cnf:
+ (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/cms/Makefile.common b/epan/dissectors/asn1/cms/Makefile.common
deleted file mode 100644
index 7f11c5f38b..0000000000
--- a/epan/dissectors/asn1/cms/Makefile.common
+++ /dev/null
@@ -1,65 +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=cms
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- CryptographicMessageSyntax.asn \
- AttributeCertificateVersion1.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 -C
-
-EXTRA_CNF = \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509ce/x509ce-exp.cnf \
- $(builddir)/../x509if/x509if-exp.cnf \
- $(builddir)/../x509sat/x509sat-exp.cnf
-
-EXPORT_DEPENDS = \
- $(builddir)/../x509af/x509af-exp.cnf
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
- (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/credssp/Makefile.am b/epan/dissectors/asn1/credssp/Makefile.am
index 11932c53a4..e6d7142d79 100644
--- a/epan/dissectors/asn1/credssp/Makefile.am
+++ b/epan/dissectors/asn1/credssp/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=credssp
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ CredSSP.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 -C
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/credssp/Makefile.common b/epan/dissectors/asn1/credssp/Makefile.common
deleted file mode 100644
index 5a0d4b7b31..0000000000
--- a/epan/dissectors/asn1/credssp/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=credssp
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- CredSSP.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 -C
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/crmf/Makefile.am b/epan/dissectors/asn1/crmf/Makefile.am
index 11932c53a4..80b54753de 100644
--- a/epan/dissectors/asn1/crmf/Makefile.am
+++ b/epan/dissectors/asn1/crmf/Makefile.am
@@ -16,7 +16,34 @@
# 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=crmf
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ CRMF.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
+
+EXTRA_CNF= \
+ $(builddir)/../cms/cms-exp.cnf
+
+$(builddir)/../cms/cms-exp.cnf:
+ (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/crmf/Makefile.common b/epan/dissectors/asn1/crmf/Makefile.common
deleted file mode 100644
index 4ddd42b476..0000000000
--- a/epan/dissectors/asn1/crmf/Makefile.common
+++ /dev/null
@@ -1,48 +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=crmf
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- CRMF.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
-
-EXTRA_CNF= \
- $(builddir)/../cms/cms-exp.cnf
-
-$(builddir)/../cms/cms-exp.cnf:
- (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/dap/Makefile.am b/epan/dissectors/asn1/dap/Makefile.am
index 11932c53a4..ae9e0d17d1 100644
--- a/epan/dissectors/asn1/dap/Makefile.am
+++ b/epan/dissectors/asn1/dap/Makefile.am
@@ -16,7 +16,68 @@
# 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=dap
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).asn \
+ DirectoryAccessProtocol.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
+
+EXTRA_CNF= \
+ $(builddir)/../acse/acse-exp.cnf \
+ $(builddir)/../dop/dop-exp.cnf \
+ $(builddir)/../disp/disp-exp.cnf \
+ $(builddir)/../dsp/dsp-exp.cnf \
+ $(builddir)/../crmf/crmf-exp.cnf \
+ $(builddir)/../ros/ros-exp.cnf \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509if/x509if-exp.cnf \
+ $(builddir)/../x509sat/x509sat-exp.cnf
+
+$(builddir)/../acse/acse-exp.cnf:
+ (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../dop/dop-exp.cnf:
+ (cd $(builddir)/../dop && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../disp/disp-exp.cnf:
+ (cd $(builddir)/../disp && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../dsp/dsp-exp.cnf:
+ (cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../crmf/crmf-exp.cnf:
+ (cd $(builddir)/../crmf && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../ros/ros-exp.cnf:
+ (cd $(builddir)/../ros && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509sat/x509sat-exp.cnf:
+ (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/dap/Makefile.common b/epan/dissectors/asn1/dap/Makefile.common
deleted file mode 100644
index 0dd19b37d8..0000000000
--- a/epan/dissectors/asn1/dap/Makefile.common
+++ /dev/null
@@ -1,82 +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=dap
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).asn \
- DirectoryAccessProtocol.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
-
-EXTRA_CNF= \
- $(builddir)/../acse/acse-exp.cnf \
- $(builddir)/../dop/dop-exp.cnf \
- $(builddir)/../disp/disp-exp.cnf \
- $(builddir)/../dsp/dsp-exp.cnf \
- $(builddir)/../crmf/crmf-exp.cnf \
- $(builddir)/../ros/ros-exp.cnf \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509if/x509if-exp.cnf \
- $(builddir)/../x509sat/x509sat-exp.cnf
-
-$(builddir)/../acse/acse-exp.cnf:
- (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../dop/dop-exp.cnf:
- (cd $(builddir)/../dop && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../disp/disp-exp.cnf:
- (cd $(builddir)/../disp && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../dsp/dsp-exp.cnf:
- (cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../crmf/crmf-exp.cnf:
- (cd $(builddir)/../crmf && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../ros/ros-exp.cnf:
- (cd $(builddir)/../ros && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
- (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/disp/Makefile.am b/epan/dissectors/asn1/disp/Makefile.am
index 11932c53a4..525e90ae3f 100644
--- a/epan/dissectors/asn1/disp/Makefile.am
+++ b/epan/dissectors/asn1/disp/Makefile.am
@@ -16,7 +16,54 @@
# 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=disp
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
+
+EXPORT_DEPENDS = \
+ $(builddir)/../dop/dop-exp.cnf
+
+EXTRA_CNF = \
+ $(builddir)/../dap/dap-exp.cnf \
+ $(builddir)/../dop/dop-exp.cnf \
+ $(builddir)/../dsp/dsp-exp.cnf \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509if/x509if-exp.cnf
+
+$(builddir)/../dap/dap-exp.cnf:
+ (cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../dop/dop-exp.cnf:
+ (cd $(builddir)/../dop && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../dsp/dsp-exp.cnf:
+ (cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/disp/Makefile.common b/epan/dissectors/asn1/disp/Makefile.common
deleted file mode 100644
index 4bc5cad106..0000000000
--- a/epan/dissectors/asn1/disp/Makefile.common
+++ /dev/null
@@ -1,68 +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=disp
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
-
-EXPORT_DEPENDS = \
- $(builddir)/../dop/dop-exp.cnf
-
-EXTRA_CNF = \
- $(builddir)/../dap/dap-exp.cnf \
- $(builddir)/../dop/dop-exp.cnf \
- $(builddir)/../dsp/dsp-exp.cnf \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509if/x509if-exp.cnf
-
-$(builddir)/../dap/dap-exp.cnf:
- (cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../dop/dop-exp.cnf:
- (cd $(builddir)/../dop && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../dsp/dsp-exp.cnf:
- (cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/dop/Makefile.am b/epan/dissectors/asn1/dop/Makefile.am
index 11932c53a4..aa3783c37e 100644
--- a/epan/dissectors/asn1/dop/Makefile.am
+++ b/epan/dissectors/asn1/dop/Makefile.am
@@ -16,7 +16,55 @@
# 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=dop
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
+
+EXTRA_CNF= \
+ $(builddir)/../dap/dap-exp.cnf \
+ $(builddir)/../dsp/dsp-exp.cnf \
+ $(builddir)/../crmf/crmf-exp.cnf \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509if/x509if-exp.cnf \
+ $(builddir)/../x509sat/x509sat-exp.cnf
+
+$(builddir)/../dap/dap-exp.cnf:
+ (cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../dsp/dsp-exp.cnf:
+ (cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../crmf/crmf-exp.cnf:
+ (cd $(builddir)/../crmf && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509sat/x509sat-exp.cnf:
+ (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/dop/Makefile.common b/epan/dissectors/asn1/dop/Makefile.common
deleted file mode 100644
index f3870c8808..0000000000
--- a/epan/dissectors/asn1/dop/Makefile.common
+++ /dev/null
@@ -1,69 +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=dop
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
-
-EXTRA_CNF= \
- $(builddir)/../dap/dap-exp.cnf \
- $(builddir)/../dsp/dsp-exp.cnf \
- $(builddir)/../crmf/crmf-exp.cnf \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509if/x509if-exp.cnf \
- $(builddir)/../x509sat/x509sat-exp.cnf
-
-$(builddir)/../dap/dap-exp.cnf:
- (cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../dsp/dsp-exp.cnf:
- (cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../crmf/crmf-exp.cnf:
- (cd $(builddir)/../crmf && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
- (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/dsp/Makefile.am b/epan/dissectors/asn1/dsp/Makefile.am
index 11932c53a4..383eeee2dd 100644
--- a/epan/dissectors/asn1/dsp/Makefile.am
+++ b/epan/dissectors/asn1/dsp/Makefile.am
@@ -16,7 +16,47 @@
# 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=dsp
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
+
+EXTRA_CNF = \
+ $(builddir)/../dap/dap-exp.cnf \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509if/x509if-exp.cnf \
+ $(builddir)/../x509sat/x509sat-exp.cnf
+
+$(builddir)/../dap/dap-exp.cnf:
+ (cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509sat/x509sat-exp.cnf:
+ (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/dsp/Makefile.common b/epan/dissectors/asn1/dsp/Makefile.common
deleted file mode 100644
index a1d17bc6a4..0000000000
--- a/epan/dissectors/asn1/dsp/Makefile.common
+++ /dev/null
@@ -1,61 +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=dsp
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
-
-EXTRA_CNF = \
- $(builddir)/../dap/dap-exp.cnf \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509if/x509if-exp.cnf \
- $(builddir)/../x509sat/x509sat-exp.cnf
-
-$(builddir)/../dap/dap-exp.cnf:
- (cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
- (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/ess/Makefile.am b/epan/dissectors/asn1/ess/Makefile.am
index 11932c53a4..b03903c01d 100644
--- a/epan/dissectors/asn1/ess/Makefile.am
+++ b/epan/dissectors/asn1/ess/Makefile.am
@@ -16,7 +16,40 @@
# 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=ess
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ ExtendedSecurityServices.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 -k -C
+
+EXTRA_CNF= \
+ $(builddir)/../cms/cms-exp.cnf \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509ce/x509ce-exp.cnf
+
+$(builddir)/../cms/cms-exp.cnf:
+ (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/ess/Makefile.common b/epan/dissectors/asn1/ess/Makefile.common
deleted file mode 100644
index 3b9f3c5e76..0000000000
--- a/epan/dissectors/asn1/ess/Makefile.common
+++ /dev/null
@@ -1,54 +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=ess
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- ExtendedSecurityServices.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 -k -C
-
-EXTRA_CNF= \
- $(builddir)/../cms/cms-exp.cnf \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509ce/x509ce-exp.cnf
-
-$(builddir)/../cms/cms-exp.cnf:
- (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/ftam/Makefile.am b/epan/dissectors/asn1/ftam/Makefile.am
index 11932c53a4..76de545ba4 100644
--- a/epan/dissectors/asn1/ftam/Makefile.am
+++ b/epan/dissectors/asn1/ftam/Makefile.am
@@ -16,7 +16,35 @@
# 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=ftam
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ ISO8571-FTAM.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
+
+EXTRA_CNF= \
+ $(builddir)/../acse/acse-exp.cnf
+
+$(builddir)/../acse/acse-exp.cnf:
+ (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/ftam/Makefile.common b/epan/dissectors/asn1/ftam/Makefile.common
deleted file mode 100644
index 0f286c3bf2..0000000000
--- a/epan/dissectors/asn1/ftam/Makefile.common
+++ /dev/null
@@ -1,49 +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=ftam
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- ISO8571-FTAM.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
-
-EXTRA_CNF= \
- $(builddir)/../acse/acse-exp.cnf
-
-$(builddir)/../acse/acse-exp.cnf:
- (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/goose/Makefile.am b/epan/dissectors/asn1/goose/Makefile.am
index 11932c53a4..abad1caa7e 100644
--- a/epan/dissectors/asn1/goose/Makefile.am
+++ b/epan/dissectors/asn1/goose/Makefile.am
@@ -16,7 +16,27 @@
# 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=goose
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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 \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/goose/Makefile.common b/epan/dissectors/asn1/goose/Makefile.common
deleted file mode 100644
index d222de6396..0000000000
--- a/epan/dissectors/asn1/goose/Makefile.common
+++ /dev/null
@@ -1,41 +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=goose
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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 \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS= -b
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/gprscdr/Makefile.am b/epan/dissectors/asn1/gprscdr/Makefile.am
index 11932c53a4..9ac1353f26 100644
--- a/epan/dissectors/asn1/gprscdr/Makefile.am
+++ b/epan/dissectors/asn1/gprscdr/Makefile.am
@@ -16,7 +16,46 @@
# 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=gprscdr
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+ASN_FILE_LIST = \
+ GenericChargingDataTypesV1250.asn \
+ GPRSChargingDataTypesV641.asn \
+ GPRSChargingDataTypesV1260.asn
+
+INCLUDED_ASN_FILE_LIST = \
+ 3GPPGenericChargingDataTypes.asn \
+ GPRSChargingDataTypes.asn \
+ GPRSChargingDataTypesV8e0.asn \
+ GPRSChargingDataTypesV9f0.asn \
+ GPRSChargingDataTypesV1171.asn \
+ GenericChargingDataTypes.asn \
+ GenericChargingDataTypesV641.asn \
+ GenericChargingDataTypesV8e0.asn \
+ GenericChargingDataTypesV9f0.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) \
+ $(INCLUDED_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
+
+EXTRA_CNF=$(builddir)/../gsm_map/gsm_map-exp.cnf
+
+$(builddir)/../gsm_map/gsm_map-exp.cnf:
+ (cd $(builddir)/../gsm_map && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/gprscdr/Makefile.common b/epan/dissectors/asn1/gprscdr/Makefile.common
deleted file mode 100644
index 73a9d6876c..0000000000
--- a/epan/dissectors/asn1/gprscdr/Makefile.common
+++ /dev/null
@@ -1,60 +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=gprscdr
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-ASN_FILE_LIST = \
- GenericChargingDataTypesV1250.asn \
- GPRSChargingDataTypesV641.asn \
- GPRSChargingDataTypesV1260.asn
-
-INCLUDED_ASN_FILE_LIST = \
- 3GPPGenericChargingDataTypes.asn \
- GPRSChargingDataTypes.asn \
- GPRSChargingDataTypesV8e0.asn \
- GPRSChargingDataTypesV9f0.asn \
- GPRSChargingDataTypesV1171.asn \
- GenericChargingDataTypes.asn \
- GenericChargingDataTypesV641.asn \
- GenericChargingDataTypesV8e0.asn \
- GenericChargingDataTypesV9f0.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) \
- $(INCLUDED_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
-
-EXTRA_CNF=$(builddir)/../gsm_map/gsm_map-exp.cnf
-
-$(builddir)/../gsm_map/gsm_map-exp.cnf:
- (cd $(builddir)/../gsm_map && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/gsm_map/Makefile.am b/epan/dissectors/asn1/gsm_map/Makefile.am
index 11932c53a4..166f9a3f45 100644
--- a/epan/dissectors/asn1/gsm_map/Makefile.am
+++ b/epan/dissectors/asn1/gsm_map/Makefile.am
@@ -16,7 +16,80 @@
# 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=gsm_map
+
+PROTO_OPT =
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST = \
+ ../ros/Remote-Operations-Information-Objects.asn
+
+DATATYPES_ASN_FILES = \
+ MAP-ExtensionDataTypes.asn \
+ MAP-CommonDataTypes.asn \
+ MAP-SS-DataTypes.asn \
+ MAP-ER-DataTypes.asn \
+ MAP-SM-DataTypes.asn \
+ MAP-OM-DataTypes.asn \
+ MAP-MS-DataTypes.asn \
+ MAP-CH-DataTypes.asn \
+ MAP-LCS-DataTypes.asn \
+ MAP-GR-DataTypes.asn
+
+OPERATIONS_ASN_FILES = \
+ MAP-LocationServiceOperations.asn \
+ MAP-Group-Call-Operations.asn \
+ MAP-ShortMessageServiceOperations.asn \
+ MAP-SupplementaryServiceOperations.asn \
+ MAP-CallHandlingOperations.asn \
+ MAP-OperationAndMaintenanceOperations.asn \
+ MAP-MobileServiceOperations.asn
+
+SS_ASN_FILES = \
+ SS-DataTypes.asn \
+ SS-Operations.asn
+
+PROPRIETARY_ASN_FILES = \
+ Ericsson.asn \
+ Nokia.asn
+
+ASN_FILE_LIST = \
+ MobileDomainDefinitions.asn \
+ MAP-ApplicationContexts.asn \
+ MAP-SS-Code.asn \
+ MAP-BS-Code.asn \
+ MAP-TS-Code.asn \
+ $(DATATYPES_ASN_FILES) \
+ MAP-DialogueInformation.asn \
+ $(OPERATIONS_ASN_FILES) \
+ MAP-Errors.asn \
+ MAP-Protocol.asn \
+ GSMMAP.asn \
+ $(SS_ASN_FILES) \
+ $(PROPRIETARY_ASN_FILES)
+
+INCLUDED_ASN_FILE_LIST = \
+ SS-Errors.asn \
+ SS-Protocol.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) \
+ $(INCLUDED_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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/gsm_map/Makefile.common b/epan/dissectors/asn1/gsm_map/Makefile.common
deleted file mode 100644
index 3a016ccce8..0000000000
--- a/epan/dissectors/asn1/gsm_map/Makefile.common
+++ /dev/null
@@ -1,94 +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=gsm_map
-
-PROTO_OPT =
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST = \
- ../ros/Remote-Operations-Information-Objects.asn
-
-DATATYPES_ASN_FILES = \
- MAP-ExtensionDataTypes.asn \
- MAP-CommonDataTypes.asn \
- MAP-SS-DataTypes.asn \
- MAP-ER-DataTypes.asn \
- MAP-SM-DataTypes.asn \
- MAP-OM-DataTypes.asn \
- MAP-MS-DataTypes.asn \
- MAP-CH-DataTypes.asn \
- MAP-LCS-DataTypes.asn \
- MAP-GR-DataTypes.asn
-
-OPERATIONS_ASN_FILES = \
- MAP-LocationServiceOperations.asn \
- MAP-Group-Call-Operations.asn \
- MAP-ShortMessageServiceOperations.asn \
- MAP-SupplementaryServiceOperations.asn \
- MAP-CallHandlingOperations.asn \
- MAP-OperationAndMaintenanceOperations.asn \
- MAP-MobileServiceOperations.asn
-
-SS_ASN_FILES = \
- SS-DataTypes.asn \
- SS-Operations.asn
-
-PROPRIETARY_ASN_FILES = \
- Ericsson.asn \
- Nokia.asn
-
-ASN_FILE_LIST = \
- MobileDomainDefinitions.asn \
- MAP-ApplicationContexts.asn \
- MAP-SS-Code.asn \
- MAP-BS-Code.asn \
- MAP-TS-Code.asn \
- $(DATATYPES_ASN_FILES) \
- MAP-DialogueInformation.asn \
- $(OPERATIONS_ASN_FILES) \
- MAP-Errors.asn \
- MAP-Protocol.asn \
- GSMMAP.asn \
- $(SS_ASN_FILES) \
- $(PROPRIETARY_ASN_FILES)
-
-INCLUDED_ASN_FILE_LIST = \
- SS-Errors.asn \
- SS-Protocol.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) \
- $(INCLUDED_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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/h225/Makefile.am b/epan/dissectors/asn1/h225/Makefile.am
index 11932c53a4..c9752cc425 100644
--- a/epan/dissectors/asn1/h225/Makefile.am
+++ b/epan/dissectors/asn1/h225/Makefile.am
@@ -16,7 +16,39 @@
# 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 = h225
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ H323-MESSAGES.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=
+
+EXTRA_CNF = \
+ $(builddir)/../h235/h235-exp.cnf \
+ $(builddir)/../h245/h245-exp.cnf
+
+$(builddir)/../h235/h235-exp.cnf:
+ (cd $(builddir)/../h235 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../h245/h245-exp.cnf:
+ (cd $(builddir)/../h245 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h225/Makefile.common b/epan/dissectors/asn1/h225/Makefile.common
deleted file mode 100644
index 5a37c66e6f..0000000000
--- a/epan/dissectors/asn1/h225/Makefile.common
+++ /dev/null
@@ -1,53 +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 = h225
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- H323-MESSAGES.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=
-
-EXTRA_CNF = \
- $(builddir)/../h235/h235-exp.cnf \
- $(builddir)/../h245/h245-exp.cnf
-
-$(builddir)/../h235/h235-exp.cnf:
- (cd $(builddir)/../h235 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../h245/h245-exp.cnf:
- (cd $(builddir)/../h245 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h235/Makefile.am b/epan/dissectors/asn1/h235/Makefile.am
index 11932c53a4..795484a2f4 100644
--- a/epan/dissectors/asn1/h235/Makefile.am
+++ b/epan/dissectors/asn1/h235/Makefile.am
@@ -16,7 +16,35 @@
# 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 = h235
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ H235-SECURITY-MESSAGES.asn \
+ H235-SRTP.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 =
+
+EXTRA_CNF = \
+ $(builddir)/../h225/h225-exp.cnf
+
+$(builddir)/../h225/h225-exp.cnf:
+ (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h235/Makefile.common b/epan/dissectors/asn1/h235/Makefile.common
deleted file mode 100644
index 39ee9c6800..0000000000
--- a/epan/dissectors/asn1/h235/Makefile.common
+++ /dev/null
@@ -1,49 +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 = h235
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- H235-SECURITY-MESSAGES.asn \
- H235-SRTP.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 =
-
-EXTRA_CNF = \
- $(builddir)/../h225/h225-exp.cnf
-
-$(builddir)/../h225/h225-exp.cnf:
- (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h245/Makefile.am b/epan/dissectors/asn1/h245/Makefile.am
index 11932c53a4..cd8a28999c 100644
--- a/epan/dissectors/asn1/h245/Makefile.am
+++ b/epan/dissectors/asn1/h245/Makefile.am
@@ -16,7 +16,29 @@
# 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 = h245
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ MULTIMEDIA-SYSTEM-CONTROL.asn
+
+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 =
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/h245/Makefile.common b/epan/dissectors/asn1/h245/Makefile.common
deleted file mode 100644
index 72fb67151c..0000000000
--- a/epan/dissectors/asn1/h245/Makefile.common
+++ /dev/null
@@ -1,43 +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 = h245
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- MULTIMEDIA-SYSTEM-CONTROL.asn
-
-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 =
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/h248/Makefile.am b/epan/dissectors/asn1/h248/Makefile.am
index 11932c53a4..f9858602b8 100644
--- a/epan/dissectors/asn1/h248/Makefile.am
+++ b/epan/dissectors/asn1/h248/Makefile.am
@@ -16,7 +16,33 @@
# 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=h248
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ h248v3.asn \
+ h248v1support.asn
+
+INCLUDED_ASN_FILE_LIST = \
+ MEGACO.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) \
+ $(INCLUDED_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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/h248/Makefile.common b/epan/dissectors/asn1/h248/Makefile.common
deleted file mode 100644
index ffe3bf087d..0000000000
--- a/epan/dissectors/asn1/h248/Makefile.common
+++ /dev/null
@@ -1,47 +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=h248
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- h248v3.asn \
- h248v1support.asn
-
-INCLUDED_ASN_FILE_LIST = \
- MEGACO.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) \
- $(INCLUDED_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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/h282/Makefile.am b/epan/dissectors/asn1/h282/Makefile.am
index 11932c53a4..b4acfc8c41 100644
--- a/epan/dissectors/asn1/h282/Makefile.am
+++ b/epan/dissectors/asn1/h282/Makefile.am
@@ -16,7 +16,25 @@
# 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 = h282
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ RDC-PROTOCOL.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/h282/Makefile.common b/epan/dissectors/asn1/h282/Makefile.common
deleted file mode 100644
index 9783c28dbe..0000000000
--- a/epan/dissectors/asn1/h282/Makefile.common
+++ /dev/null
@@ -1,39 +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 = h282
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- RDC-PROTOCOL.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/h283/Makefile.am b/epan/dissectors/asn1/h283/Makefile.am
index 11932c53a4..5079bbdc9e 100644
--- a/epan/dissectors/asn1/h283/Makefile.am
+++ b/epan/dissectors/asn1/h283/Makefile.am
@@ -16,7 +16,25 @@
# 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 = h283
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ LCT-PROTOCOL.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/h283/Makefile.common b/epan/dissectors/asn1/h283/Makefile.common
deleted file mode 100644
index fa76367a62..0000000000
--- a/epan/dissectors/asn1/h283/Makefile.common
+++ /dev/null
@@ -1,39 +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 = h283
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- LCT-PROTOCOL.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/h323/Makefile.am b/epan/dissectors/asn1/h323/Makefile.am
index 11932c53a4..d9bb5026e3 100644
--- a/epan/dissectors/asn1/h323/Makefile.am
+++ b/epan/dissectors/asn1/h323/Makefile.am
@@ -16,7 +16,31 @@
# 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 = h323
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ RAS-PROTOCOL-TUNNEL.asn \
+ ROBUSTNESS-DATA.asn
+
+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 =
+
+EXTRA_CNF = \
+ $(builddir)/../h225/h225-exp.cnf
+
+$(builddir)/../h225/h225-exp.cnf:
+ (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h323/Makefile.common b/epan/dissectors/asn1/h323/Makefile.common
deleted file mode 100644
index 269d2695ff..0000000000
--- a/epan/dissectors/asn1/h323/Makefile.common
+++ /dev/null
@@ -1,45 +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 = h323
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- RAS-PROTOCOL-TUNNEL.asn \
- ROBUSTNESS-DATA.asn
-
-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 =
-
-EXTRA_CNF = \
- $(builddir)/../h225/h225-exp.cnf
-
-$(builddir)/../h225/h225-exp.cnf:
- (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h450-ros/Makefile.am b/epan/dissectors/asn1/h450-ros/Makefile.am
index 11932c53a4..08df98f25c 100644
--- a/epan/dissectors/asn1/h450-ros/Makefile.am
+++ b/epan/dissectors/asn1/h450-ros/Makefile.am
@@ -16,7 +16,37 @@
# 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 = h450-ros
+
+# The file needs to use h450 for the filter elements etc
+PROTO_OPT = -p h450.ros
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST = ../ros/Remote-Operations-Information-Objects.asn
+
+ASN_FILE_LIST = Remote-Operations-Apdus.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=
+
+EXTRA_CNF = \
+ $(builddir)/../ros/ros-inv.cnf \
+ $(builddir)/../ros/ros-res.cnf \
+ $(builddir)/../ros/ros-err.cnf \
+ $(builddir)/../ros/ros-rej.cnf
diff --git a/epan/dissectors/asn1/h450-ros/Makefile.common b/epan/dissectors/asn1/h450-ros/Makefile.common
deleted file mode 100644
index 89fbf2e118..0000000000
--- a/epan/dissectors/asn1/h450-ros/Makefile.common
+++ /dev/null
@@ -1,51 +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 = h450-ros
-
-# The file needs to use h450 for the filter elements etc
-PROTO_OPT = -p h450.ros
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST = ../ros/Remote-Operations-Information-Objects.asn
-
-ASN_FILE_LIST = Remote-Operations-Apdus.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=
-
-EXTRA_CNF = \
- $(builddir)/../ros/ros-inv.cnf \
- $(builddir)/../ros/ros-res.cnf \
- $(builddir)/../ros/ros-err.cnf \
- $(builddir)/../ros/ros-rej.cnf
diff --git a/epan/dissectors/asn1/h450/Makefile.am b/epan/dissectors/asn1/h450/Makefile.am
index 11932c53a4..de2b6cf28a 100644
--- a/epan/dissectors/asn1/h450/Makefile.am
+++ b/epan/dissectors/asn1/h450/Makefile.am
@@ -16,7 +16,59 @@
# 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=h450
+
+# need empty -p <proto> option, default is -p $(PROTOCOL_NAME)
+PROTO_OPT =
+
+EXT_ASN_FILE_LIST =
+
+H450_ASN = \
+ H4501-Supplementary-ServiceAPDU-Structure.asn \
+ Addressing-Data-Elements.asn \
+ H225-generic-parameters-definition.asn \
+ Manufacturer-specific-service-extension-definition.asn \
+ H4501-General-Error-List.asn
+
+H450_OP_ASN = \
+ Call-Transfer-Operations.asn \
+ Call-Diversion-Operations.asn \
+ Call-Hold-Operations.asn \
+ Call-Park-Pickup-Operations.asn \
+ Call-Waiting-Operations.asn \
+ Message-Waiting-Indication-Operations.asn \
+ Name-Operations.asn \
+ Call-Completion-Operations.asn \
+ Call-Offer-Operations.asn \
+ Call-Intrusion-Operations.asn \
+ Common-Information-Operations.asn
+
+ASN_FILE_LIST = \
+ $(H450_ASN) \
+ $(H450_OP_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 \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS=
+
+EXTRA_CNF = \
+ $(builddir)/../h225/h225-exp.cnf \
+ $(builddir)/../h450-ros/h450-ros-exp.cnf
+
+$(builddir)/../h225/h225-exp.cnf:
+ (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../h450-ros/h450-ros-exp.cnf:
+ (cd $(builddir)/../h450-ros && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h450/Makefile.common b/epan/dissectors/asn1/h450/Makefile.common
deleted file mode 100644
index b03b3e352e..0000000000
--- a/epan/dissectors/asn1/h450/Makefile.common
+++ /dev/null
@@ -1,73 +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=h450
-
-# need empty -p <proto> option, default is -p $(PROTOCOL_NAME)
-PROTO_OPT =
-
-EXT_ASN_FILE_LIST =
-
-H450_ASN = \
- H4501-Supplementary-ServiceAPDU-Structure.asn \
- Addressing-Data-Elements.asn \
- H225-generic-parameters-definition.asn \
- Manufacturer-specific-service-extension-definition.asn \
- H4501-General-Error-List.asn
-
-H450_OP_ASN = \
- Call-Transfer-Operations.asn \
- Call-Diversion-Operations.asn \
- Call-Hold-Operations.asn \
- Call-Park-Pickup-Operations.asn \
- Call-Waiting-Operations.asn \
- Message-Waiting-Indication-Operations.asn \
- Name-Operations.asn \
- Call-Completion-Operations.asn \
- Call-Offer-Operations.asn \
- Call-Intrusion-Operations.asn \
- Common-Information-Operations.asn
-
-ASN_FILE_LIST = \
- $(H450_ASN) \
- $(H450_OP_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 \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS=
-
-EXTRA_CNF = \
- $(builddir)/../h225/h225-exp.cnf \
- $(builddir)/../h450-ros/h450-ros-exp.cnf
-
-$(builddir)/../h225/h225-exp.cnf:
- (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../h450-ros/h450-ros-exp.cnf:
- (cd $(builddir)/../h450-ros && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h460/Makefile.am b/epan/dissectors/asn1/h460/Makefile.am
index 11932c53a4..21d0762e23 100644
--- a/epan/dissectors/asn1/h460/Makefile.am
+++ b/epan/dissectors/asn1/h460/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 = h460
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ NUMBER-PORTABILITY.asn \
+ CIRCUIT-STATUS-MAP.asn \
+ CALL-PRIORITY.asn \
+ QOS-MONITORING-REPORT.asn \
+ QOS-MONITORING-EXTENDED-VOIP-REPORT.asn \
+ CALL-PARTY-CATEGORY.asn \
+ MLPP.asn \
+ SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn \
+ SIGNALLING-TRAVERSAL.asn \
+ MEDIA-TRAVERSAL.asn \
+ MESSAGE-BROADCAST.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)
+
+# need empty -p <proto> option, default is -p $(PROTOCOL_NAME)
+PROTO_OPT =
+A2W_FLAGS =
+
+EXTRA_CNF = \
+ $(builddir)/../h225/h225-exp.cnf \
+ $(builddir)/../h235/h235-exp.cnf \
+ $(builddir)/../h245/h245-exp.cnf
+
+$(builddir)/../h225/h225-exp.cnf:
+ (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../h235/h235-exp.cnf:
+ (cd $(builddir)/../h235 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../h245/h245-exp.cnf:
+ (cd $(builddir)/../h245 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h460/Makefile.common b/epan/dissectors/asn1/h460/Makefile.common
deleted file mode 100644
index b65b5bf985..0000000000
--- a/epan/dissectors/asn1/h460/Makefile.common
+++ /dev/null
@@ -1,64 +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 = h460
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- NUMBER-PORTABILITY.asn \
- CIRCUIT-STATUS-MAP.asn \
- CALL-PRIORITY.asn \
- QOS-MONITORING-REPORT.asn \
- QOS-MONITORING-EXTENDED-VOIP-REPORT.asn \
- CALL-PARTY-CATEGORY.asn \
- MLPP.asn \
- SIGNALLING-CHANNEL-SUSPEND-REDIRECT.asn \
- SIGNALLING-TRAVERSAL.asn \
- MEDIA-TRAVERSAL.asn \
- MESSAGE-BROADCAST.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)
-
-# need empty -p <proto> option, default is -p $(PROTOCOL_NAME)
-PROTO_OPT =
-A2W_FLAGS =
-
-EXTRA_CNF = \
- $(builddir)/../h225/h225-exp.cnf \
- $(builddir)/../h235/h235-exp.cnf \
- $(builddir)/../h245/h245-exp.cnf
-
-$(builddir)/../h225/h225-exp.cnf:
- (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../h235/h235-exp.cnf:
- (cd $(builddir)/../h235 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../h245/h245-exp.cnf:
- (cd $(builddir)/../h245 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h501/Makefile.am b/epan/dissectors/asn1/h501/Makefile.am
index 11932c53a4..d3b183b4e5 100644
--- a/epan/dissectors/asn1/h501/Makefile.am
+++ b/epan/dissectors/asn1/h501/Makefile.am
@@ -16,7 +16,33 @@
# 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 = h501
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ H501-MESSAGES.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 = \
+ $(builddir)/../h225/h225-exp.cnf \
+ $(builddir)/../h235/h235-exp.cnf
+
+$(builddir)/../h225/h225-exp.cnf:
+ (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../h235/h235-exp.cnf:
+ (cd $(builddir)/../h235 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/h501/Makefile.common b/epan/dissectors/asn1/h501/Makefile.common
deleted file mode 100644
index d7f9920c73..0000000000
--- a/epan/dissectors/asn1/h501/Makefile.common
+++ /dev/null
@@ -1,47 +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 = h501
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- H501-MESSAGES.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 = \
- $(builddir)/../h225/h225-exp.cnf \
- $(builddir)/../h235/h235-exp.cnf
-
-$(builddir)/../h225/h225-exp.cnf:
- (cd $(builddir)/../h225 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../h235/h235-exp.cnf:
- (cd $(builddir)/../h235 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/hnbap/Makefile.am b/epan/dissectors/asn1/hnbap/Makefile.am
index 11932c53a4..8ab05ad140 100644
--- a/epan/dissectors/asn1/hnbap/Makefile.am
+++ b/epan/dissectors/asn1/hnbap/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 = hnbap
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ HNBAP-CommonDataTypes.asn \
+ HNBAP-Constants.asn \
+ HNBAP-Containers.asn \
+ HNBAP-IEs.asn \
+ HNBAP-PDU-Contents.asn \
+ HNBAP-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/hnbap/Makefile.common b/epan/dissectors/asn1/hnbap/Makefile.common
deleted file mode 100644
index cb2dcf07d4..0000000000
--- a/epan/dissectors/asn1/hnbap/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 = hnbap
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- HNBAP-CommonDataTypes.asn \
- HNBAP-Constants.asn \
- HNBAP-Containers.asn \
- HNBAP-IEs.asn \
- HNBAP-PDU-Contents.asn \
- HNBAP-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/idmp/Makefile.am b/epan/dissectors/asn1/idmp/Makefile.am
index 11932c53a4..57cb77ef57 100644
--- a/epan/dissectors/asn1/idmp/Makefile.am
+++ b/epan/dissectors/asn1/idmp/Makefile.am
@@ -16,7 +16,40 @@
# 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=idmp
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ IDMProtocolSpecification.asn \
+ CommonProtocolSpecification.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
+
+EXTRA_CNF= \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509ce/x509ce-exp.cnf
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/idmp/Makefile.common b/epan/dissectors/asn1/idmp/Makefile.common
deleted file mode 100644
index 8d8caf2bd3..0000000000
--- a/epan/dissectors/asn1/idmp/Makefile.common
+++ /dev/null
@@ -1,54 +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=idmp
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- IDMProtocolSpecification.asn \
- CommonProtocolSpecification.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
-
-EXTRA_CNF= \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509ce/x509ce-exp.cnf
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/ilp/Makefile.am b/epan/dissectors/asn1/ilp/Makefile.am
index 11932c53a4..470109c61d 100644
--- a/epan/dissectors/asn1/ilp/Makefile.am
+++ b/epan/dissectors/asn1/ilp/Makefile.am
@@ -16,7 +16,26 @@
# 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 = ilp
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ ILP.asn \
+ ILP-Components.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/ilp/Makefile.common b/epan/dissectors/asn1/ilp/Makefile.common
deleted file mode 100644
index 0d165c50fa..0000000000
--- a/epan/dissectors/asn1/ilp/Makefile.common
+++ /dev/null
@@ -1,40 +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 = ilp
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- ILP.asn \
- ILP-Components.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/inap/Makefile.am b/epan/dissectors/asn1/inap/Makefile.am
index 11932c53a4..da9f7fda3c 100644
--- a/epan/dissectors/asn1/inap/Makefile.am
+++ b/epan/dissectors/asn1/inap/Makefile.am
@@ -16,7 +16,67 @@
# 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=inap
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST_LATE = \
+ ../ros/Remote-Operations-Information-Objects.asn \
+ ../ros/Remote-Operations-Generic-ROS-PDUs.asn
+
+1248_1_ASN_FILES= \
+ IN-operationcodes.asn \
+ IN-object-identifiers.asn \
+ IN-common-datatypes.asn
+
+1248_2_ASN_FILES= \
+ IN-SSF-SCF-datatypes.asn \
+ IN-SSF-SCF-ops-args.asn
+
+1248_3_ASN_FILES= \
+ IN-SCF-SRF-datatypes.asn \
+ IN-SCF-SRF-ops-args.asn
+
+1248_CLASSES_ASN= \
+ IN-common-classes.asn \
+ IN-SSF-SCF-Classes.asn \
+ IN-SCF-SRF-Classes.asn
+
+ASN_FILE_LIST= \
+ $(1248_CLASSES_ASN) \
+ $(1248_1_ASN_FILES) \
+ $(1248_2_ASN_FILES) \
+ $(1248_3_ASN_FILES) \
+ IN-errorcodes.asn \
+ IN-errortypes.asn
+
+INCLUDED_ASN_FILE_LIST = \
+ inap.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) \
+ $(INCLUDED_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
+
+EXTRA_CNF= \
+ $(builddir)/../dap/dap-exp.cnf \
+ $(builddir)/../dsp/dsp-exp.cnf
+
+$(builddir)/../dap/dap-exp.cnf:
+ (cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../dsp/dsp-exp.cnf:
+ (cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/inap/Makefile.common b/epan/dissectors/asn1/inap/Makefile.common
deleted file mode 100644
index a356e0ffec..0000000000
--- a/epan/dissectors/asn1/inap/Makefile.common
+++ /dev/null
@@ -1,81 +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=inap
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST_LATE = \
- ../ros/Remote-Operations-Information-Objects.asn \
- ../ros/Remote-Operations-Generic-ROS-PDUs.asn
-
-1248_1_ASN_FILES= \
- IN-operationcodes.asn \
- IN-object-identifiers.asn \
- IN-common-datatypes.asn
-
-1248_2_ASN_FILES= \
- IN-SSF-SCF-datatypes.asn \
- IN-SSF-SCF-ops-args.asn
-
-1248_3_ASN_FILES= \
- IN-SCF-SRF-datatypes.asn \
- IN-SCF-SRF-ops-args.asn
-
-1248_CLASSES_ASN= \
- IN-common-classes.asn \
- IN-SSF-SCF-Classes.asn \
- IN-SCF-SRF-Classes.asn
-
-ASN_FILE_LIST= \
- $(1248_CLASSES_ASN) \
- $(1248_1_ASN_FILES) \
- $(1248_2_ASN_FILES) \
- $(1248_3_ASN_FILES) \
- IN-errorcodes.asn \
- IN-errortypes.asn
-
-INCLUDED_ASN_FILE_LIST = \
- inap.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) \
- $(INCLUDED_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
-
-EXTRA_CNF= \
- $(builddir)/../dap/dap-exp.cnf \
- $(builddir)/../dsp/dsp-exp.cnf
-
-$(builddir)/../dap/dap-exp.cnf:
- (cd $(builddir)/../dap && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../dsp/dsp-exp.cnf:
- (cd $(builddir)/../dsp && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/isdn-sup/Makefile.am b/epan/dissectors/asn1/isdn-sup/Makefile.am
index 11932c53a4..dc1ba591ea 100644
--- a/epan/dissectors/asn1/isdn-sup/Makefile.am
+++ b/epan/dissectors/asn1/isdn-sup/Makefile.am
@@ -16,7 +16,50 @@
# 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 = isdn-sup
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ Addressing-Data-Elements.asn \
+ Basic-Service-Elements.asn \
+ Embedded-Q931-Types.asn \
+ General-Errors.asn \
+ Advice-of-Charge-Operations.asn \
+ Closed-User-Group-Service-Operations.asn \
+ Conference-Add-On-Operations.asn \
+ Diversion-Operations.asn \
+ MCID-Operations.asn \
+ User-To-User-Signalling-Operations.asn \
+ Freephone-Operations.asn \
+ MLPP-Operations-And-Errors.asn
+
+INCLUDED_ASN_FILE_LIST = \
+ CCBS-Operations-and-Errors.asn \
+ CCBS-private-networks-Operations-and-Errors.asn \
+ Explicit-Call-Transfer-Operations-and-Errors.asn \
+ MWI-Operations-and-Errors.asn \
+ Outgoing-Call-Barring-Operations-and-Errors.asn \
+ Set-Operations-and-Errors.asn \
+ Three-Party-Operations.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) \
+ $(INCLUDED_ASN_FILE_LIST) \
+ packet-$(PROTOCOL_NAME)-template.c \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/isdn-sup/Makefile.common b/epan/dissectors/asn1/isdn-sup/Makefile.common
deleted file mode 100644
index a17535d2a8..0000000000
--- a/epan/dissectors/asn1/isdn-sup/Makefile.common
+++ /dev/null
@@ -1,64 +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 = isdn-sup
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- Addressing-Data-Elements.asn \
- Basic-Service-Elements.asn \
- Embedded-Q931-Types.asn \
- General-Errors.asn \
- Advice-of-Charge-Operations.asn \
- Closed-User-Group-Service-Operations.asn \
- Conference-Add-On-Operations.asn \
- Diversion-Operations.asn \
- MCID-Operations.asn \
- User-To-User-Signalling-Operations.asn \
- Freephone-Operations.asn \
- MLPP-Operations-And-Errors.asn
-
-INCLUDED_ASN_FILE_LIST = \
- CCBS-Operations-and-Errors.asn \
- CCBS-private-networks-Operations-and-Errors.asn \
- Explicit-Call-Transfer-Operations-and-Errors.asn \
- MWI-Operations-and-Errors.asn \
- Outgoing-Call-Barring-Operations-and-Errors.asn \
- Set-Operations-and-Errors.asn \
- Three-Party-Operations.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) \
- $(INCLUDED_ASN_FILE_LIST) \
- packet-$(PROTOCOL_NAME)-template.c \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS= -b
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/kerberos/Makefile.am b/epan/dissectors/asn1/kerberos/Makefile.am
index 11932c53a4..ff7b2558e0 100644
--- a/epan/dissectors/asn1/kerberos/Makefile.am
+++ b/epan/dissectors/asn1/kerberos/Makefile.am
@@ -16,7 +16,31 @@
# 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=kerberos
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ KerberosV5Spec2.asn \
+ k5.asn \
+ RFC3244.asn
+
+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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/kerberos/Makefile.common b/epan/dissectors/asn1/kerberos/Makefile.common
deleted file mode 100644
index 956dd67ddd..0000000000
--- a/epan/dissectors/asn1/kerberos/Makefile.common
+++ /dev/null
@@ -1,45 +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=kerberos
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- KerberosV5Spec2.asn \
- k5.asn \
- RFC3244.asn
-
-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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/lcsap/Makefile.am b/epan/dissectors/asn1/lcsap/Makefile.am
index 11932c53a4..2ef977ade1 100644
--- a/epan/dissectors/asn1/lcsap/Makefile.am
+++ b/epan/dissectors/asn1/lcsap/Makefile.am
@@ -16,7 +16,41 @@
# 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=lcsap
+
+#DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ LCS-AP-CommonDataTypes.asn\
+ LCS-AP-Constants.asn\
+ LCS-AP-Containers.asn\
+ LCS-AP-IEs.asn\
+ LCS-AP-PDU-Contents.asn\
+ LCS-AP-PDU-Descriptions.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=
+
+EXTRA_CNF= \
+ $(builddir)/../x509if/x509if-exp.cnf
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd ../x509if && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/lcsap/Makefile.common b/epan/dissectors/asn1/lcsap/Makefile.common
deleted file mode 100644
index 4c3ae0cf89..0000000000
--- a/epan/dissectors/asn1/lcsap/Makefile.common
+++ /dev/null
@@ -1,55 +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=lcsap
-
-#DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- LCS-AP-CommonDataTypes.asn\
- LCS-AP-Constants.asn\
- LCS-AP-Containers.asn\
- LCS-AP-IEs.asn\
- LCS-AP-PDU-Contents.asn\
- LCS-AP-PDU-Descriptions.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=
-
-EXTRA_CNF= \
- $(builddir)/../x509if/x509if-exp.cnf
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd ../x509if && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/ldap/Makefile.am b/epan/dissectors/asn1/ldap/Makefile.am
index 11932c53a4..662d255fec 100644
--- a/epan/dissectors/asn1/ldap/Makefile.am
+++ b/epan/dissectors/asn1/ldap/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=ldap
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = Lightweight-Directory-Access-Protocol-V3.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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/ldap/Makefile.common b/epan/dissectors/asn1/ldap/Makefile.common
deleted file mode 100644
index b22690b50e..0000000000
--- a/epan/dissectors/asn1/ldap/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=ldap
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = Lightweight-Directory-Access-Protocol-V3.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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/logotypecertextn/Makefile.am b/epan/dissectors/asn1/logotypecertextn/Makefile.am
index 11932c53a4..ef2297a430 100644
--- a/epan/dissectors/asn1/logotypecertextn/Makefile.am
+++ b/epan/dissectors/asn1/logotypecertextn/Makefile.am
@@ -16,7 +16,32 @@
# 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=logotypecertextn
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ LogotypeCertExtn.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
+
+EXTRA_CNF= \
+ $(builddir)/../x509af/x509af-exp.cnf
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/logotypecertextn/Makefile.common b/epan/dissectors/asn1/logotypecertextn/Makefile.common
deleted file mode 100644
index a029b53209..0000000000
--- a/epan/dissectors/asn1/logotypecertextn/Makefile.common
+++ /dev/null
@@ -1,46 +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=logotypecertextn
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- LogotypeCertExtn.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
-
-EXTRA_CNF= \
- $(builddir)/../x509af/x509af-exp.cnf
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/lpp/Makefile.am b/epan/dissectors/asn1/lpp/Makefile.am
index 11932c53a4..b7fe24f755 100644
--- a/epan/dissectors/asn1/lpp/Makefile.am
+++ b/epan/dissectors/asn1/lpp/Makefile.am
@@ -16,7 +16,29 @@
# 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 = lpp
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ LPP.asn
+
+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 =
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/lpp/Makefile.common b/epan/dissectors/asn1/lpp/Makefile.common
deleted file mode 100644
index 34825eb68f..0000000000
--- a/epan/dissectors/asn1/lpp/Makefile.common
+++ /dev/null
@@ -1,43 +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 = lpp
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- LPP.asn
-
-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 =
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/lppa/Makefile.am b/epan/dissectors/asn1/lppa/Makefile.am
index 11932c53a4..2d460e9a21 100644
--- a/epan/dissectors/asn1/lppa/Makefile.am
+++ b/epan/dissectors/asn1/lppa/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 = lppa
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ LPPA-Common.asn \
+ LPPA-Constant.asn \
+ LPPA-Container.asn \
+ LPPA-ElementaryProcedure.asn \
+ LPPA-InformationElement.asn \
+ LPPA-PDU.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/lppa/Makefile.common b/epan/dissectors/asn1/lppa/Makefile.common
deleted file mode 100644
index 85430641e3..0000000000
--- a/epan/dissectors/asn1/lppa/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 = lppa
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- LPPA-Common.asn \
- LPPA-Constant.asn \
- LPPA-Container.asn \
- LPPA-ElementaryProcedure.asn \
- LPPA-InformationElement.asn \
- LPPA-PDU.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/lppe/Makefile.am b/epan/dissectors/asn1/lppe/Makefile.am
index 11932c53a4..9e1f1ce7f1 100644
--- a/epan/dissectors/asn1/lppe/Makefile.am
+++ b/epan/dissectors/asn1/lppe/Makefile.am
@@ -16,7 +16,29 @@
# 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 = lppe
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ LPPe.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 = \
+ $(builddir)/../lpp/lpp-exp.cnf
+
+$(builddir)/../lpp/lpp-exp.cnf:
+ (cd $(builddir)/../lpp && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/lppe/Makefile.common b/epan/dissectors/asn1/lppe/Makefile.common
deleted file mode 100644
index a76c8c75e0..0000000000
--- a/epan/dissectors/asn1/lppe/Makefile.common
+++ /dev/null
@@ -1,43 +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 = lppe
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- LPPe.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 = \
- $(builddir)/../lpp/lpp-exp.cnf
-
-$(builddir)/../lpp/lpp-exp.cnf:
- (cd $(builddir)/../lpp && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/lte-rrc/Makefile.am b/epan/dissectors/asn1/lte-rrc/Makefile.am
index 11932c53a4..7b98fdc08a 100644
--- a/epan/dissectors/asn1/lte-rrc/Makefile.am
+++ b/epan/dissectors/asn1/lte-rrc/Makefile.am
@@ -16,7 +16,32 @@
# 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 = lte-rrc
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ EUTRA-InterNodeDefinitions.asn \
+ EUTRA-RRC-Definitions.asn \
+ EUTRA-Sidelink-Preconf.asn \
+ EUTRA-UE-Variables.asn \
+ PC5-RRC-Definitions.asn
+
+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 = -L
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/lte-rrc/Makefile.common b/epan/dissectors/asn1/lte-rrc/Makefile.common
deleted file mode 100644
index bd1b43fc19..0000000000
--- a/epan/dissectors/asn1/lte-rrc/Makefile.common
+++ /dev/null
@@ -1,46 +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 = lte-rrc
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- EUTRA-InterNodeDefinitions.asn \
- EUTRA-RRC-Definitions.asn \
- EUTRA-Sidelink-Preconf.asn \
- EUTRA-UE-Variables.asn \
- PC5-RRC-Definitions.asn
-
-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 = -L
-
-EXTRA_CNF =
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 <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 = 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/mms/Makefile.am b/epan/dissectors/asn1/mms/Makefile.am
index 11932c53a4..60280368b0 100644
--- a/epan/dissectors/asn1/mms/Makefile.am
+++ b/epan/dissectors/asn1/mms/Makefile.am
@@ -16,7 +16,32 @@
# 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=mms
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
+
+EXTRA_CNF= \
+ $(builddir)/../acse/acse-exp.cnf
+
+$(builddir)/../acse/acse-exp.cnf:
+ (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/mms/Makefile.common b/epan/dissectors/asn1/mms/Makefile.common
deleted file mode 100644
index f0f1a650ab..0000000000
--- a/epan/dissectors/asn1/mms/Makefile.common
+++ /dev/null
@@ -1,46 +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=mms
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
-
-EXTRA_CNF= \
- $(builddir)/../acse/acse-exp.cnf
-
-$(builddir)/../acse/acse-exp.cnf:
- (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/mpeg-audio/Makefile.am b/epan/dissectors/asn1/mpeg-audio/Makefile.am
index 11932c53a4..bf69a9937b 100644
--- a/epan/dissectors/asn1/mpeg-audio/Makefile.am
+++ b/epan/dissectors/asn1/mpeg-audio/Makefile.am
@@ -16,7 +16,27 @@
# 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=mpeg-audio
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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 \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS=
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/mpeg-audio/Makefile.common b/epan/dissectors/asn1/mpeg-audio/Makefile.common
deleted file mode 100644
index 48a84dede2..0000000000
--- a/epan/dissectors/asn1/mpeg-audio/Makefile.common
+++ /dev/null
@@ -1,41 +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=mpeg-audio
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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 \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS=
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/mpeg-pes/Makefile.am b/epan/dissectors/asn1/mpeg-pes/Makefile.am
index 11932c53a4..8db3330209 100644
--- a/epan/dissectors/asn1/mpeg-pes/Makefile.am
+++ b/epan/dissectors/asn1/mpeg-pes/Makefile.am
@@ -16,7 +16,27 @@
# 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=mpeg-pes
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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 \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS=
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/mpeg-pes/Makefile.common b/epan/dissectors/asn1/mpeg-pes/Makefile.common
deleted file mode 100644
index 4a49865b1d..0000000000
--- a/epan/dissectors/asn1/mpeg-pes/Makefile.common
+++ /dev/null
@@ -1,41 +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=mpeg-pes
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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 \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS=
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/nbap/Makefile.am b/epan/dissectors/asn1/nbap/Makefile.am
index 11932c53a4..e658d7bc53 100644
--- a/epan/dissectors/asn1/nbap/Makefile.am
+++ b/epan/dissectors/asn1/nbap/Makefile.am
@@ -16,7 +16,31 @@
# 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 = nbap
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ NBAP-CommonDataTypes.asn \
+ NBAP-Constants.asn \
+ NBAP-Containers.asn \
+ NBAP-IEs.asn \
+ NBAP-PDU-Contents.asn \
+ NBAP-PDU-Descriptions.asn
+
+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 =
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/nbap/Makefile.common b/epan/dissectors/asn1/nbap/Makefile.common
deleted file mode 100644
index ea4f677731..0000000000
--- a/epan/dissectors/asn1/nbap/Makefile.common
+++ /dev/null
@@ -1,45 +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 = nbap
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- NBAP-CommonDataTypes.asn \
- NBAP-Constants.asn \
- NBAP-Containers.asn \
- NBAP-IEs.asn \
- NBAP-PDU-Contents.asn \
- NBAP-PDU-Descriptions.asn
-
-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 =
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/novell_pkis/Makefile.am b/epan/dissectors/asn1/novell_pkis/Makefile.am
index 133eae060f..676d13435f 100644
--- a/epan/dissectors/asn1/novell_pkis/Makefile.am
+++ b/epan/dissectors/asn1/novell_pkis/Makefile.am
@@ -16,6 +16,21 @@
# 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=novell_pkis
+
+EXT_ASN_FILE_LIST =
+ASN_FILE_LIST = $(PROTOCOL_NAME).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 = -b -u
diff --git a/epan/dissectors/asn1/novell_pkis/Makefile.common b/epan/dissectors/asn1/novell_pkis/Makefile.common
deleted file mode 100644
index 86ce4076fe..0000000000
--- a/epan/dissectors/asn1/novell_pkis/Makefile.common
+++ /dev/null
@@ -1,34 +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=novell_pkis
-
-EXT_ASN_FILE_LIST =
-ASN_FILE_LIST = $(PROTOCOL_NAME).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 = -b -u
diff --git a/epan/dissectors/asn1/ns_cert_exts/Makefile.am b/epan/dissectors/asn1/ns_cert_exts/Makefile.am
index 11932c53a4..4d6b7367b6 100644
--- a/epan/dissectors/asn1/ns_cert_exts/Makefile.am
+++ b/epan/dissectors/asn1/ns_cert_exts/Makefile.am
@@ -16,7 +16,25 @@
# 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=ns_cert_exts
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ NETSCAPE-CERT-EXTS.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= -b
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/ns_cert_exts/Makefile.common b/epan/dissectors/asn1/ns_cert_exts/Makefile.common
deleted file mode 100644
index f9fc3604b1..0000000000
--- a/epan/dissectors/asn1/ns_cert_exts/Makefile.common
+++ /dev/null
@@ -1,39 +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=ns_cert_exts
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- NETSCAPE-CERT-EXTS.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= -b
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/ocsp/Makefile.am b/epan/dissectors/asn1/ocsp/Makefile.am
index 11932c53a4..ce7d39d0a9 100644
--- a/epan/dissectors/asn1/ocsp/Makefile.am
+++ b/epan/dissectors/asn1/ocsp/Makefile.am
@@ -16,7 +16,36 @@
# 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=ocsp
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ OCSP.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
+
+EXTRA_CNF= \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509ce/x509ce-exp.cnf
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/ocsp/Makefile.common b/epan/dissectors/asn1/ocsp/Makefile.common
deleted file mode 100644
index fa22e9149b..0000000000
--- a/epan/dissectors/asn1/ocsp/Makefile.common
+++ /dev/null
@@ -1,50 +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=ocsp
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- OCSP.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
-
-EXTRA_CNF= \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509ce/x509ce-exp.cnf
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/p1/Makefile.am b/epan/dissectors/asn1/p1/Makefile.am
index 11932c53a4..288cd12da5 100644
--- a/epan/dissectors/asn1/p1/Makefile.am
+++ b/epan/dissectors/asn1/p1/Makefile.am
@@ -16,7 +16,61 @@
# 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=p1
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ MTAAbstractService.asn \
+ MTSAbstractService.asn \
+ MTSAccessProtocol.asn \
+ MHSProtocolObjectIdentifiers.asn \
+ MTSUpperBounds.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 -C
+
+EXTRA_CNF = \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509ce/x509ce-exp.cnf \
+ $(builddir)/../x509if/x509if-exp.cnf \
+ $(builddir)/../x509sat/x509sat-exp.cnf \
+ $(builddir)/../ros/ros-exp.cnf \
+ $(builddir)/../rtse/rtse-exp.cnf
+
+EXPORT_DEPENDS = \
+ $(builddir)/../x509af/x509af-exp.cnf
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509sat/x509sat-exp.cnf:
+ (cd $(builddir)/../x509sat && $(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/p1/Makefile.common b/epan/dissectors/asn1/p1/Makefile.common
deleted file mode 100644
index eca43a8ea5..0000000000
--- a/epan/dissectors/asn1/p1/Makefile.common
+++ /dev/null
@@ -1,75 +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=p1
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- MTAAbstractService.asn \
- MTSAbstractService.asn \
- MTSAccessProtocol.asn \
- MHSProtocolObjectIdentifiers.asn \
- MTSUpperBounds.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 -C
-
-EXTRA_CNF = \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509ce/x509ce-exp.cnf \
- $(builddir)/../x509if/x509if-exp.cnf \
- $(builddir)/../x509sat/x509sat-exp.cnf \
- $(builddir)/../ros/ros-exp.cnf \
- $(builddir)/../rtse/rtse-exp.cnf
-
-EXPORT_DEPENDS = \
- $(builddir)/../x509af/x509af-exp.cnf
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
- (cd $(builddir)/../x509sat && $(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/p22/Makefile.am b/epan/dissectors/asn1/p22/Makefile.am
index 11932c53a4..aba2d9be75 100644
--- a/epan/dissectors/asn1/p22/Makefile.am
+++ b/epan/dissectors/asn1/p22/Makefile.am
@@ -16,7 +16,66 @@
# 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=p22
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ IPMSInformationObjects.asn \
+ IPMSHeadingExtensions.asn \
+ IPMSExtendedBodyPartTypes2.asn \
+ IPMSFileTransferBodyPartType.asn \
+ IPMSExtendedVoiceBodyPartType.asn \
+ IPMSForwardedContentBodyPartType.asn \
+ IPMSMessageStoreAttributes.asn \
+ IPMSSecurityExtensions.asn \
+ IPMSObjectIdentifiers.asn \
+ IPMSUpperBounds.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 -C
+
+EXTRA_CNF = \
+ $(builddir)/../acse/acse-exp.cnf \
+ $(builddir)/../ftam/ftam-exp.cnf \
+ $(builddir)/../p7/p7-exp.cnf \
+ $(builddir)/../p1/p1-exp.cnf \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509ce/x509ce-exp.cnf
+
+EXPORT_DEPENDS = \
+ $(builddir)/../p1/p1-exp.cnf
+
+$(builddir)/../acse/acse-exp.cnf:
+ (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../ftam/ftam-exp.cnf:
+ (cd $(builddir)/../ftam && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../p7/p7-exp.cnf:
+ (cd $(builddir)/../p7 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../p1/p1-exp.cnf:
+ (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/p22/Makefile.common b/epan/dissectors/asn1/p22/Makefile.common
deleted file mode 100644
index 0cc13a9084..0000000000
--- a/epan/dissectors/asn1/p22/Makefile.common
+++ /dev/null
@@ -1,80 +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=p22
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- IPMSInformationObjects.asn \
- IPMSHeadingExtensions.asn \
- IPMSExtendedBodyPartTypes2.asn \
- IPMSFileTransferBodyPartType.asn \
- IPMSExtendedVoiceBodyPartType.asn \
- IPMSForwardedContentBodyPartType.asn \
- IPMSMessageStoreAttributes.asn \
- IPMSSecurityExtensions.asn \
- IPMSObjectIdentifiers.asn \
- IPMSUpperBounds.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 -C
-
-EXTRA_CNF = \
- $(builddir)/../acse/acse-exp.cnf \
- $(builddir)/../ftam/ftam-exp.cnf \
- $(builddir)/../p7/p7-exp.cnf \
- $(builddir)/../p1/p1-exp.cnf \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509ce/x509ce-exp.cnf
-
-EXPORT_DEPENDS = \
- $(builddir)/../p1/p1-exp.cnf
-
-$(builddir)/../acse/acse-exp.cnf:
- (cd $(builddir)/../acse && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../ftam/ftam-exp.cnf:
- (cd $(builddir)/../ftam && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../p7/p7-exp.cnf:
- (cd $(builddir)/../p7 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../p1/p1-exp.cnf:
- (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
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))
diff --git a/epan/dissectors/asn1/p772/Makefile.am b/epan/dissectors/asn1/p772/Makefile.am
index 11932c53a4..566c999ede 100644
--- a/epan/dissectors/asn1/p772/Makefile.am
+++ b/epan/dissectors/asn1/p772/Makefile.am
@@ -16,7 +16,44 @@
# 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=p772
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ MMSAbstractService.asn \
+ MMSInformationObjects.asn \
+ MMSOtherNotificationTypeExtensions.asn \
+ MMSObjectIdentifiers.asn \
+ MMSHeadingExtensions.asn \
+ MMSUpperBounds.asn \
+ MMSExtendedBodyPartTypes.asn \
+ MMSPerRecipientSpecifierExtensions.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 -C
+
+EXTRA_CNF= \
+ $(builddir)/../p1/p1-exp.cnf \
+ $(builddir)/../p22/p22-exp.cnf
+
+$(builddir)/../p1/p1-exp.cnf:
+ (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../p22/p22-exp.cnf:
+ (cd $(builddir)/../p22 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/p772/Makefile.common b/epan/dissectors/asn1/p772/Makefile.common
deleted file mode 100644
index 9effae1b67..0000000000
--- a/epan/dissectors/asn1/p772/Makefile.common
+++ /dev/null
@@ -1,58 +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=p772
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- MMSAbstractService.asn \
- MMSInformationObjects.asn \
- MMSOtherNotificationTypeExtensions.asn \
- MMSObjectIdentifiers.asn \
- MMSHeadingExtensions.asn \
- MMSUpperBounds.asn \
- MMSExtendedBodyPartTypes.asn \
- MMSPerRecipientSpecifierExtensions.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 -C
-
-EXTRA_CNF= \
- $(builddir)/../p1/p1-exp.cnf \
- $(builddir)/../p22/p22-exp.cnf
-
-$(builddir)/../p1/p1-exp.cnf:
- (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../p22/p22-exp.cnf:
- (cd $(builddir)/../p22 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pcap/Makefile.am b/epan/dissectors/asn1/pcap/Makefile.am
index 11932c53a4..912900326b 100644
--- a/epan/dissectors/asn1/pcap/Makefile.am
+++ b/epan/dissectors/asn1/pcap/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 = pcap
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ PCAP-CommonDataTypes.asn \
+ PCAP-Constants.asn \
+ PCAP-Containers.asn \
+ PCAP-IEs.asn \
+ PCAP-PDU-Contents.asn \
+ PCAP-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/pcap/Makefile.common b/epan/dissectors/asn1/pcap/Makefile.common
deleted file mode 100644
index 586a31bd22..0000000000
--- a/epan/dissectors/asn1/pcap/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 = pcap
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- PCAP-CommonDataTypes.asn \
- PCAP-Constants.asn \
- PCAP-Containers.asn \
- PCAP-IEs.asn \
- PCAP-PDU-Contents.asn \
- PCAP-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/pkcs1/Makefile.am b/epan/dissectors/asn1/pkcs1/Makefile.am
index 11932c53a4..cf26cbaa54 100644
--- a/epan/dissectors/asn1/pkcs1/Makefile.am
+++ b/epan/dissectors/asn1/pkcs1/Makefile.am
@@ -16,7 +16,32 @@
# 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=pkcs1
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ PKIXAlgs-2009.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
+
+EXTRA_CNF= \
+ $(builddir)/../x509af/x509af-exp.cnf
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkcs1/Makefile.common b/epan/dissectors/asn1/pkcs1/Makefile.common
deleted file mode 100644
index 9ee39f20d4..0000000000
--- a/epan/dissectors/asn1/pkcs1/Makefile.common
+++ /dev/null
@@ -1,46 +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=pkcs1
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- PKIXAlgs-2009.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
-
-EXTRA_CNF= \
- $(builddir)/../x509af/x509af-exp.cnf
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkcs12/Makefile.am b/epan/dissectors/asn1/pkcs12/Makefile.am
index 11932c53a4..45393ef26c 100644
--- a/epan/dissectors/asn1/pkcs12/Makefile.am
+++ b/epan/dissectors/asn1/pkcs12/Makefile.am
@@ -16,7 +16,41 @@
# 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=pkcs12
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
+
+# Note the order here is important, cms needs at least x509af-exp to be generated first
+EXTRA_CNF= \
+ $(builddir)/../x509if/x509if-exp.cnf \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../cms/cms-exp.cnf
+
+$(builddir)/../cms/cms-exp.cnf:
+ (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkcs12/Makefile.common b/epan/dissectors/asn1/pkcs12/Makefile.common
deleted file mode 100644
index 647f248b1c..0000000000
--- a/epan/dissectors/asn1/pkcs12/Makefile.common
+++ /dev/null
@@ -1,55 +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=pkcs12
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
-
-# Note the order here is important, cms needs at least x509af-exp to be generated first
-EXTRA_CNF= \
- $(builddir)/../x509if/x509if-exp.cnf \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../cms/cms-exp.cnf
-
-$(builddir)/../cms/cms-exp.cnf:
- (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkinit/Makefile.am b/epan/dissectors/asn1/pkinit/Makefile.am
index 11932c53a4..dbcf68e2d7 100644
--- a/epan/dissectors/asn1/pkinit/Makefile.am
+++ b/epan/dissectors/asn1/pkinit/Makefile.am
@@ -16,7 +16,32 @@
# 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=pkinit
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ PKINIT.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
+
+EXTRA_CNF= \
+ $(builddir)/../cms/cms-exp.cnf
+
+$(builddir)/../cms/cms-exp.cnf:
+ (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkinit/Makefile.common b/epan/dissectors/asn1/pkinit/Makefile.common
deleted file mode 100644
index 55cbb94dc3..0000000000
--- a/epan/dissectors/asn1/pkinit/Makefile.common
+++ /dev/null
@@ -1,46 +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=pkinit
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- PKINIT.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
-
-EXTRA_CNF= \
- $(builddir)/../cms/cms-exp.cnf
-
-$(builddir)/../cms/cms-exp.cnf:
- (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkix1explicit/Makefile.am b/epan/dissectors/asn1/pkix1explicit/Makefile.am
index 11932c53a4..2a337a1871 100644
--- a/epan/dissectors/asn1/pkix1explicit/Makefile.am
+++ b/epan/dissectors/asn1/pkix1explicit/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=pkix1explicit
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ PKIX1EXPLICIT93.asn \
+ IPAddrAndASCertExtn.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 \
+ pkix1explicit_exp.cnf \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/pkix1explicit/Makefile.common b/epan/dissectors/asn1/pkix1explicit/Makefile.common
deleted file mode 100644
index bb5cdd59df..0000000000
--- a/epan/dissectors/asn1/pkix1explicit/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=pkix1explicit
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- PKIX1EXPLICIT93.asn \
- IPAddrAndASCertExtn.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 \
- pkix1explicit_exp.cnf \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS= -b
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/pkix1implicit/Makefile.am b/epan/dissectors/asn1/pkix1implicit/Makefile.am
index 11932c53a4..d785c8caf8 100644
--- a/epan/dissectors/asn1/pkix1implicit/Makefile.am
+++ b/epan/dissectors/asn1/pkix1implicit/Makefile.am
@@ -17,6 +17,35 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-include ../Makefile.preinc
-include Makefile.common
-include ../Makefile.inc
+PROTOCOL_NAME=pkix1implicit
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ PKIX1IMPLICIT93.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 \
+ pkix1implicit_exp.cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b
+
+EXTRA_CNF= \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509ce/x509ce-exp.cnf
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkix1implicit/Makefile.common b/epan/dissectors/asn1/pkix1implicit/Makefile.common
deleted file mode 100644
index d785c8caf8..0000000000
--- a/epan/dissectors/asn1/pkix1implicit/Makefile.common
+++ /dev/null
@@ -1,51 +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=pkix1implicit
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- PKIX1IMPLICIT93.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 \
- pkix1implicit_exp.cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS= -b
-
-EXTRA_CNF= \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509ce/x509ce-exp.cnf
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkixac/Makefile.am b/epan/dissectors/asn1/pkixac/Makefile.am
index 11932c53a4..cafe15db1f 100644
--- a/epan/dissectors/asn1/pkixac/Makefile.am
+++ b/epan/dissectors/asn1/pkixac/Makefile.am
@@ -16,7 +16,38 @@
# 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=pkixac
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ PKIXAttributeCertificate.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
+
+EXTRA_CNF= \
+ $(builddir)/../pkix1explicit/pkix1explicit_exp.cnf \
+ $(builddir)/../pkix1implicit/pkix1implicit_exp.cnf \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509ce/x509ce-exp.cnf
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkixac/Makefile.common b/epan/dissectors/asn1/pkixac/Makefile.common
deleted file mode 100644
index fd24c59dc3..0000000000
--- a/epan/dissectors/asn1/pkixac/Makefile.common
+++ /dev/null
@@ -1,52 +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=pkixac
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- PKIXAttributeCertificate.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
-
-EXTRA_CNF= \
- $(builddir)/../pkix1explicit/pkix1explicit_exp.cnf \
- $(builddir)/../pkix1implicit/pkix1implicit_exp.cnf \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509ce/x509ce-exp.cnf
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkixproxy/Makefile.am b/epan/dissectors/asn1/pkixproxy/Makefile.am
index 11932c53a4..0233b71286 100644
--- a/epan/dissectors/asn1/pkixproxy/Makefile.am
+++ b/epan/dissectors/asn1/pkixproxy/Makefile.am
@@ -16,7 +16,28 @@
# 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=pkixproxy
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ PKIXProxy.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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/pkixproxy/Makefile.common b/epan/dissectors/asn1/pkixproxy/Makefile.common
deleted file mode 100644
index d395841a7f..0000000000
--- a/epan/dissectors/asn1/pkixproxy/Makefile.common
+++ /dev/null
@@ -1,42 +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=pkixproxy
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- PKIXProxy.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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/pkixqualified/Makefile.am b/epan/dissectors/asn1/pkixqualified/Makefile.am
index 11932c53a4..2fe0dc567d 100644
--- a/epan/dissectors/asn1/pkixqualified/Makefile.am
+++ b/epan/dissectors/asn1/pkixqualified/Makefile.am
@@ -16,7 +16,40 @@
# 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=pkixqualified
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ PKIXqualified.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
+
+EXTRA_CNF= \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509ce/x509ce-exp.cnf \
+ $(builddir)/../x509sat/x509sat-exp.cnf
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509sat/x509sat-exp.cnf:
+ (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkixqualified/Makefile.common b/epan/dissectors/asn1/pkixqualified/Makefile.common
deleted file mode 100644
index 6cefc8ef64..0000000000
--- a/epan/dissectors/asn1/pkixqualified/Makefile.common
+++ /dev/null
@@ -1,54 +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=pkixqualified
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- PKIXqualified.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
-
-EXTRA_CNF= \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509ce/x509ce-exp.cnf \
- $(builddir)/../x509sat/x509sat-exp.cnf
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
- (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkixtsp/Makefile.am b/epan/dissectors/asn1/pkixtsp/Makefile.am
index 11932c53a4..f0526a22a7 100644
--- a/epan/dissectors/asn1/pkixtsp/Makefile.am
+++ b/epan/dissectors/asn1/pkixtsp/Makefile.am
@@ -16,7 +16,32 @@
# 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=pkixtsp
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ PKIXTSP.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
+
+EXTRA_CNF= \
+ $(builddir)/../cms/cms-exp.cnf
+
+$(builddir)/../cms/cms-exp.cnf:
+ (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pkixtsp/Makefile.common b/epan/dissectors/asn1/pkixtsp/Makefile.common
deleted file mode 100644
index 251d1497b3..0000000000
--- a/epan/dissectors/asn1/pkixtsp/Makefile.common
+++ /dev/null
@@ -1,46 +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=pkixtsp
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- PKIXTSP.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
-
-EXTRA_CNF= \
- $(builddir)/../cms/cms-exp.cnf
-
-$(builddir)/../cms/cms-exp.cnf:
- (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pres/Makefile.am b/epan/dissectors/asn1/pres/Makefile.am
index 11932c53a4..0b70afe3b2 100644
--- a/epan/dissectors/asn1/pres/Makefile.am
+++ b/epan/dissectors/asn1/pres/Makefile.am
@@ -16,7 +16,33 @@
# 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=pres
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ ISO8823-PRESENTATION.asn \
+ ISO9576-PRESENTATION.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
+
+EXTRA_CNF= \
+ $(builddir)/../rtse/rtse-exp.cnf
+
+$(builddir)/../rtse/rtse-exp.cnf:
+ (cd $(builddir)/../rtse && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/pres/Makefile.common b/epan/dissectors/asn1/pres/Makefile.common
deleted file mode 100644
index c9439d747b..0000000000
--- a/epan/dissectors/asn1/pres/Makefile.common
+++ /dev/null
@@ -1,47 +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=pres
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- ISO8823-PRESENTATION.asn \
- ISO9576-PRESENTATION.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
-
-EXTRA_CNF= \
- $(builddir)/../rtse/rtse-exp.cnf
-
-$(builddir)/../rtse/rtse-exp.cnf:
- (cd $(builddir)/../rtse && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/q932-ros/Makefile.am b/epan/dissectors/asn1/q932-ros/Makefile.am
index 11932c53a4..1bd6c4ebdc 100644
--- a/epan/dissectors/asn1/q932-ros/Makefile.am
+++ b/epan/dissectors/asn1/q932-ros/Makefile.am
@@ -16,7 +16,34 @@
# 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=q932-ros
+
+PROTO_OPT = -p q932.ros
+
+EXT_ASN_FILE_LIST = \
+ ../ros/Remote-Operations-Information-Objects.asn
+
+ASN_FILE_LIST = \
+ Facility-Information-Element-Components.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 \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b
+
+EXTRA_CNF = \
+ $(builddir)/../ros/ros-inv.cnf \
+ $(builddir)/../ros/ros-res.cnf \
+ $(builddir)/../ros/ros-err.cnf \
+ $(builddir)/../ros/ros-rej.cnf
diff --git a/epan/dissectors/asn1/q932-ros/Makefile.common b/epan/dissectors/asn1/q932-ros/Makefile.common
deleted file mode 100644
index aa1870e3c5..0000000000
--- a/epan/dissectors/asn1/q932-ros/Makefile.common
+++ /dev/null
@@ -1,48 +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=q932-ros
-
-PROTO_OPT = -p q932.ros
-
-EXT_ASN_FILE_LIST = \
- ../ros/Remote-Operations-Information-Objects.asn
-
-ASN_FILE_LIST = \
- Facility-Information-Element-Components.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 \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS= -b
-
-EXTRA_CNF = \
- $(builddir)/../ros/ros-inv.cnf \
- $(builddir)/../ros/ros-res.cnf \
- $(builddir)/../ros/ros-err.cnf \
- $(builddir)/../ros/ros-rej.cnf
diff --git a/epan/dissectors/asn1/q932/Makefile.am b/epan/dissectors/asn1/q932/Makefile.am
index 11932c53a4..3c01c57071 100644
--- a/epan/dissectors/asn1/q932/Makefile.am
+++ b/epan/dissectors/asn1/q932/Makefile.am
@@ -16,7 +16,33 @@
# 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 = q932
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ Addressing-Data-Elements.asn \
+ Network-Facility-Extension.asn \
+ Network-Protocol-Profile-component.asn \
+ Interpretation-component.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
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/q932/Makefile.common b/epan/dissectors/asn1/q932/Makefile.common
deleted file mode 100644
index b9febc84ff..0000000000
--- a/epan/dissectors/asn1/q932/Makefile.common
+++ /dev/null
@@ -1,47 +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 = q932
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- Addressing-Data-Elements.asn \
- Network-Facility-Extension.asn \
- Network-Protocol-Profile-component.asn \
- Interpretation-component.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
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/qsig/Makefile.am b/epan/dissectors/asn1/qsig/Makefile.am
index 11932c53a4..ffe1e9b733 100644
--- a/epan/dissectors/asn1/qsig/Makefile.am
+++ b/epan/dissectors/asn1/qsig/Makefile.am
@@ -16,7 +16,59 @@
# 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 = qsig
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ General-Error-List.asn \
+ qsig-gf-ext.asn \
+ qsig-gf-gp.asn \
+ qsig-gf-ade.asn \
+ QSIG-NA.asn \
+ QSIG-CF.asn \
+ QSIG-PR.asn \
+ QSIG-CT.asn \
+ QSIG-CC.asn \
+ QSIG-CO.asn \
+ QSIG-DND.asn \
+ QSIG-CI.asn \
+ QSIG-AOC.asn \
+ QSIG-RE.asn \
+ SYNC-SIG.asn \
+ QSIG-CINT.asn \
+ QSIG-CMN.asn \
+ QSIG-CPI.asn \
+ QSIG-PUMR.asn \
+ QSIG-PUMCH.asn \
+ QSIG-SSCT.asn \
+ QSIG-WTMLR.asn \
+ QSIG-WTMCH.asn \
+ QSIG-WTMAU.asn \
+ QSIG-SD.asn \
+ QSIG-CIDL.asn \
+ QSIG-SMS.asn \
+ QSIG-MCR.asn \
+ QSIG-MCM.asn \
+ QSIG-MID.asn
+
+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)
+
+# need empty -p <proto> option, default is -p $(PROTOCOL_NAME)
+PROTO_OPT =
+A2W_FLAGS =
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/qsig/Makefile.common b/epan/dissectors/asn1/qsig/Makefile.common
deleted file mode 100644
index 4c317c2c2b..0000000000
--- a/epan/dissectors/asn1/qsig/Makefile.common
+++ /dev/null
@@ -1,73 +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 = qsig
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- General-Error-List.asn \
- qsig-gf-ext.asn \
- qsig-gf-gp.asn \
- qsig-gf-ade.asn \
- QSIG-NA.asn \
- QSIG-CF.asn \
- QSIG-PR.asn \
- QSIG-CT.asn \
- QSIG-CC.asn \
- QSIG-CO.asn \
- QSIG-DND.asn \
- QSIG-CI.asn \
- QSIG-AOC.asn \
- QSIG-RE.asn \
- SYNC-SIG.asn \
- QSIG-CINT.asn \
- QSIG-CMN.asn \
- QSIG-CPI.asn \
- QSIG-PUMR.asn \
- QSIG-PUMCH.asn \
- QSIG-SSCT.asn \
- QSIG-WTMLR.asn \
- QSIG-WTMCH.asn \
- QSIG-WTMAU.asn \
- QSIG-SD.asn \
- QSIG-CIDL.asn \
- QSIG-SMS.asn \
- QSIG-MCR.asn \
- QSIG-MCM.asn \
- QSIG-MID.asn
-
-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)
-
-# need empty -p <proto> option, default is -p $(PROTOCOL_NAME)
-PROTO_OPT =
-A2W_FLAGS =
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/ranap/Makefile.am b/epan/dissectors/asn1/ranap/Makefile.am
index 11932c53a4..dbdea5b6df 100644
--- a/epan/dissectors/asn1/ranap/Makefile.am
+++ b/epan/dissectors/asn1/ranap/Makefile.am
@@ -16,7 +16,31 @@
# 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 = ranap
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ RANAP-CommonDataTypes.asn \
+ RANAP-Constants.asn \
+ RANAP-Containers.asn \
+ RANAP-IEs.asn \
+ RANAP-PDU-Contents.asn \
+ RANAP-PDU-Descriptions.asn
+
+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 =
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/ranap/Makefile.common b/epan/dissectors/asn1/ranap/Makefile.common
deleted file mode 100644
index e813a76e74..0000000000
--- a/epan/dissectors/asn1/ranap/Makefile.common
+++ /dev/null
@@ -1,45 +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 = ranap
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- RANAP-CommonDataTypes.asn \
- RANAP-Constants.asn \
- RANAP-Containers.asn \
- RANAP-IEs.asn \
- RANAP-PDU-Contents.asn \
- RANAP-PDU-Descriptions.asn
-
-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 =
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/rnsap/Makefile.am b/epan/dissectors/asn1/rnsap/Makefile.am
index 11932c53a4..f8515129b0 100644
--- a/epan/dissectors/asn1/rnsap/Makefile.am
+++ b/epan/dissectors/asn1/rnsap/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 = rnsap
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ RNSAP-CommonDataTypes.asn \
+ RNSAP-Constants.asn \
+ RNSAP-Containers.asn \
+ RNSAP-IEs.asn \
+ RNSAP-PDU-Contents.asn \
+ RNSAP-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/rnsap/Makefile.common b/epan/dissectors/asn1/rnsap/Makefile.common
deleted file mode 100644
index a1436132ea..0000000000
--- a/epan/dissectors/asn1/rnsap/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 = rnsap
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- RNSAP-CommonDataTypes.asn \
- RNSAP-Constants.asn \
- RNSAP-Containers.asn \
- RNSAP-IEs.asn \
- RNSAP-PDU-Contents.asn \
- RNSAP-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/ros/Makefile.am b/epan/dissectors/asn1/ros/Makefile.am
index 11932c53a4..0a9536e202 100644
--- a/epan/dissectors/asn1/ros/Makefile.am
+++ b/epan/dissectors/asn1/ros/Makefile.am
@@ -16,7 +16,41 @@
# 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=ros
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).asn \
+ Remote-Operations-Information-Objects.asn
+
+INCLUDED_ASN_FILE_LIST = \
+ Remote-Operations-Generic-ROS-PDUs.asn \
+ Remote-Operations-Information-Objects.asn \
+ Remote-Operations-Useful-Definitions.asn \
+ ros-err.cnf \
+ ros-inv.cnf \
+ ros-rej.cnf \
+ ros-res.cnf
+
+# 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) \
+ $(INCLUDED_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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/ros/Makefile.common b/epan/dissectors/asn1/ros/Makefile.common
deleted file mode 100644
index 09e22d2fb3..0000000000
--- a/epan/dissectors/asn1/ros/Makefile.common
+++ /dev/null
@@ -1,55 +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=ros
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).asn \
- Remote-Operations-Information-Objects.asn
-
-INCLUDED_ASN_FILE_LIST = \
- Remote-Operations-Generic-ROS-PDUs.asn \
- Remote-Operations-Information-Objects.asn \
- Remote-Operations-Useful-Definitions.asn \
- ros-err.cnf \
- ros-inv.cnf \
- ros-rej.cnf \
- ros-res.cnf
-
-# 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) \
- $(INCLUDED_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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/rrc/Makefile.am b/epan/dissectors/asn1/rrc/Makefile.am
index 11932c53a4..c92b11abce 100644
--- a/epan/dissectors/asn1/rrc/Makefile.am
+++ b/epan/dissectors/asn1/rrc/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 = rrc
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ Class-definitions.asn \
+ PDU-definitions.asn \
+ InformationElements.asn \
+ Constant-definitions.asn \
+ Internode-definitions.asn
+
+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 =
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/rrc/Makefile.common b/epan/dissectors/asn1/rrc/Makefile.common
deleted file mode 100644
index 281b77d087..0000000000
--- a/epan/dissectors/asn1/rrc/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 = rrc
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- Class-definitions.asn \
- PDU-definitions.asn \
- InformationElements.asn \
- Constant-definitions.asn \
- Internode-definitions.asn
-
-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 =
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/rrlp/Makefile.am b/epan/dissectors/asn1/rrlp/Makefile.am
index 11932c53a4..fa280878ff 100644
--- a/epan/dissectors/asn1/rrlp/Makefile.am
+++ b/epan/dissectors/asn1/rrlp/Makefile.am
@@ -16,7 +16,28 @@
# 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 = rrlp
+
+EXT_ASN_FILE_LIST = \
+ ../gsm_map/MAP-ExtensionDataTypes.asn \
+ ../gsm_map/MAP-LCS-DataTypes.asn
+
+ASN_FILE_LIST = \
+ RRLP-Messages.asn \
+ RRLP-Components.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/rrlp/Makefile.common b/epan/dissectors/asn1/rrlp/Makefile.common
deleted file mode 100644
index b585e3fbe8..0000000000
--- a/epan/dissectors/asn1/rrlp/Makefile.common
+++ /dev/null
@@ -1,42 +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 = rrlp
-
-EXT_ASN_FILE_LIST = \
- ../gsm_map/MAP-ExtensionDataTypes.asn \
- ../gsm_map/MAP-LCS-DataTypes.asn
-
-ASN_FILE_LIST = \
- RRLP-Messages.asn \
- RRLP-Components.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/rtse/Makefile.am b/epan/dissectors/asn1/rtse/Makefile.am
index 11932c53a4..14c9c4cffa 100644
--- a/epan/dissectors/asn1/rtse/Makefile.am
+++ b/epan/dissectors/asn1/rtse/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=rtse
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/rtse/Makefile.common b/epan/dissectors/asn1/rtse/Makefile.common
deleted file mode 100644
index 235e3d2a4f..0000000000
--- a/epan/dissectors/asn1/rtse/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=rtse
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/rua/Makefile.am b/epan/dissectors/asn1/rua/Makefile.am
index 11932c53a4..16063db9e6 100644
--- a/epan/dissectors/asn1/rua/Makefile.am
+++ b/epan/dissectors/asn1/rua/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 = rua
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ RUA-CommonDataTypes.asn \
+ RUA-Constants.asn \
+ RUA-Containers.asn \
+ RUA-IEs.asn \
+ RUA-PDU-Contents.asn \
+ RUA-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/rua/Makefile.common b/epan/dissectors/asn1/rua/Makefile.common
deleted file mode 100644
index 981a3d7ebe..0000000000
--- a/epan/dissectors/asn1/rua/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 = rua
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- RUA-CommonDataTypes.asn \
- RUA-Constants.asn \
- RUA-Containers.asn \
- RUA-IEs.asn \
- RUA-PDU-Contents.asn \
- RUA-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/s1ap/Makefile.am b/epan/dissectors/asn1/s1ap/Makefile.am
index 11932c53a4..765dd3c259 100644
--- a/epan/dissectors/asn1/s1ap/Makefile.am
+++ b/epan/dissectors/asn1/s1ap/Makefile.am
@@ -16,7 +16,34 @@
# 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 = s1ap
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ S1AP-CommonDataTypes.asn \
+ S1AP-Constants.asn \
+ S1AP-Containers.asn \
+ S1AP-IEs.asn \
+ S1AP-PDU-Contents.asn \
+ S1AP-PDU-Descriptions.asn \
+ S1AP-SonTransfer-IEs.asn
+
+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 =
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/s1ap/Makefile.common b/epan/dissectors/asn1/s1ap/Makefile.common
deleted file mode 100644
index 9f7e97ca59..0000000000
--- a/epan/dissectors/asn1/s1ap/Makefile.common
+++ /dev/null
@@ -1,48 +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 = s1ap
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- S1AP-CommonDataTypes.asn \
- S1AP-Constants.asn \
- S1AP-Containers.asn \
- S1AP-IEs.asn \
- S1AP-PDU-Contents.asn \
- S1AP-PDU-Descriptions.asn \
- S1AP-SonTransfer-IEs.asn
-
-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 =
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/sabp/Makefile.am b/epan/dissectors/asn1/sabp/Makefile.am
index 11932c53a4..a1469a63df 100644
--- a/epan/dissectors/asn1/sabp/Makefile.am
+++ b/epan/dissectors/asn1/sabp/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 = sabp
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ SABP-CommonDataTypes.asn \
+ SABP-Constants.asn \
+ SABP-Containers.asn \
+ SABP-IEs.asn \
+ SABP-PDU-Contents.asn \
+ SABP-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/sabp/Makefile.common b/epan/dissectors/asn1/sabp/Makefile.common
deleted file mode 100644
index 036680c0cb..0000000000
--- a/epan/dissectors/asn1/sabp/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 = sabp
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- SABP-CommonDataTypes.asn \
- SABP-Constants.asn \
- SABP-Containers.asn \
- SABP-IEs.asn \
- SABP-PDU-Contents.asn \
- SABP-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/sbc-ap/Makefile.am b/epan/dissectors/asn1/sbc-ap/Makefile.am
index 11932c53a4..6ef30a86bb 100644
--- a/epan/dissectors/asn1/sbc-ap/Makefile.am
+++ b/epan/dissectors/asn1/sbc-ap/Makefile.am
@@ -16,7 +16,32 @@
# 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 = sbc-ap
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ SBC-AP-CommonDataTypes.asn \
+ SBC-AP-Constants.asn \
+ SBC-AP-Containers.asn \
+ SBC-AP-IEs.asn \
+ SBC-AP-PDU-Contents.asn \
+ SBC-AP-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/sbc-ap/Makefile.common b/epan/dissectors/asn1/sbc-ap/Makefile.common
deleted file mode 100644
index cd4f03236a..0000000000
--- a/epan/dissectors/asn1/sbc-ap/Makefile.common
+++ /dev/null
@@ -1,46 +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 = sbc-ap
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- SBC-AP-CommonDataTypes.asn \
- SBC-AP-Constants.asn \
- SBC-AP-Containers.asn \
- SBC-AP-IEs.asn \
- SBC-AP-PDU-Contents.asn \
- SBC-AP-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/smrse/Makefile.am b/epan/dissectors/asn1/smrse/Makefile.am
index 11932c53a4..b508f010f0 100644
--- a/epan/dissectors/asn1/smrse/Makefile.am
+++ b/epan/dissectors/asn1/smrse/Makefile.am
@@ -16,7 +16,28 @@
# 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=smrse
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ SMRSE.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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/smrse/Makefile.common b/epan/dissectors/asn1/smrse/Makefile.common
deleted file mode 100644
index 2cb89306c0..0000000000
--- a/epan/dissectors/asn1/smrse/Makefile.common
+++ /dev/null
@@ -1,42 +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=smrse
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- SMRSE.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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/snmp/Makefile.am b/epan/dissectors/asn1/snmp/Makefile.am
index 11932c53a4..99acacf5b9 100644
--- a/epan/dissectors/asn1/snmp/Makefile.am
+++ b/epan/dissectors/asn1/snmp/Makefile.am
@@ -16,7 +16,28 @@
# 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=snmp
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/snmp/Makefile.common b/epan/dissectors/asn1/snmp/Makefile.common
deleted file mode 100644
index f5c1fd44cd..0000000000
--- a/epan/dissectors/asn1/snmp/Makefile.common
+++ /dev/null
@@ -1,42 +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=snmp
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/spnego/Makefile.am b/epan/dissectors/asn1/spnego/Makefile.am
index 11932c53a4..a73c60671c 100644
--- a/epan/dissectors/asn1/spnego/Makefile.am
+++ b/epan/dissectors/asn1/spnego/Makefile.am
@@ -16,7 +16,27 @@
# 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=spnego
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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 \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/spnego/Makefile.common b/epan/dissectors/asn1/spnego/Makefile.common
deleted file mode 100644
index 37da2463bc..0000000000
--- a/epan/dissectors/asn1/spnego/Makefile.common
+++ /dev/null
@@ -1,41 +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=spnego
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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 \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS= -b
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/sv/Makefile.am b/epan/dissectors/asn1/sv/Makefile.am
index 11932c53a4..3d0a9b1529 100644
--- a/epan/dissectors/asn1/sv/Makefile.am
+++ b/epan/dissectors/asn1/sv/Makefile.am
@@ -16,7 +16,26 @@
# 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=sv
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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
diff --git a/epan/dissectors/asn1/sv/Makefile.common b/epan/dissectors/asn1/sv/Makefile.common
deleted file mode 100644
index 75d0c59f1b..0000000000
--- a/epan/dissectors/asn1/sv/Makefile.common
+++ /dev/null
@@ -1,40 +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=sv
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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
diff --git a/epan/dissectors/asn1/t124/Makefile.am b/epan/dissectors/asn1/t124/Makefile.am
index b1e3c53aab..e6c0db64af 100644
--- a/epan/dissectors/asn1/t124/Makefile.am
+++ b/epan/dissectors/asn1/t124/Makefile.am
@@ -16,10 +16,29 @@
# 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
-MCS-PROTOCOL.asn: ../t125/MCS-PROTOCOL.asn
- cp $< $(srcdir)/$@
+PROTOCOL_NAME=t124
+
+EXT_ASN_FILE_LIST_LATE = \
+ ../t125/MCS-PROTOCOL.asn
+
+ASN_FILE_LIST = \
+ GCC-PROTOCOL.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=
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/t124/Makefile.common b/epan/dissectors/asn1/t124/Makefile.common
deleted file mode 100644
index 5327cb1eed..0000000000
--- a/epan/dissectors/asn1/t124/Makefile.common
+++ /dev/null
@@ -1,43 +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=t124
-
-EXT_ASN_FILE_LIST_LATE = \
- ../t125/MCS-PROTOCOL.asn
-
-ASN_FILE_LIST = \
- GCC-PROTOCOL.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=
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/t125/Makefile.am b/epan/dissectors/asn1/t125/Makefile.am
index 11932c53a4..19d1af41bd 100644
--- a/epan/dissectors/asn1/t125/Makefile.am
+++ b/epan/dissectors/asn1/t125/Makefile.am
@@ -16,7 +16,27 @@
# 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=t125
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ MCS-PROTOCOL.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 \
+ $(PROTOCOL_NAME).cnf
+
+SRC_FILES = \
+ $(EXTRA_DIST) \
+ $(EXT_ASN_FILE_LIST)
+
+A2W_FLAGS= -b
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/t125/Makefile.common b/epan/dissectors/asn1/t125/Makefile.common
deleted file mode 100644
index fb2b5ab7d3..0000000000
--- a/epan/dissectors/asn1/t125/Makefile.common
+++ /dev/null
@@ -1,41 +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=t125
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- MCS-PROTOCOL.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 \
- $(PROTOCOL_NAME).cnf
-
-SRC_FILES = \
- $(EXTRA_DIST) \
- $(EXT_ASN_FILE_LIST)
-
-A2W_FLAGS= -b
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/t38/Makefile.am b/epan/dissectors/asn1/t38/Makefile.am
index 11932c53a4..2511ddd2d9 100644
--- a/epan/dissectors/asn1/t38/Makefile.am
+++ b/epan/dissectors/asn1/t38/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 = t38
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ T38_2002.asn
+
+INCLUDED_ASN_FILE_LIST = \
+ T38_1998.asn
+
+EXTRA_DIST = \
+ $(EXTRA_DIST_COMMON) \
+ $(ASN_FILE_LIST) \
+ $(INCLUDED_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 =
+
+EXTRA_CNF =
diff --git a/epan/dissectors/asn1/t38/Makefile.common b/epan/dissectors/asn1/t38/Makefile.common
deleted file mode 100644
index c71cbc1c4a..0000000000
--- a/epan/dissectors/asn1/t38/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 = t38
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- T38_2002.asn
-
-INCLUDED_ASN_FILE_LIST = \
- T38_1998.asn
-
-EXTRA_DIST = \
- $(EXTRA_DIST_COMMON) \
- $(ASN_FILE_LIST) \
- $(INCLUDED_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 =
-
-EXTRA_CNF =
diff --git a/epan/dissectors/asn1/tcap/Makefile.am b/epan/dissectors/asn1/tcap/Makefile.am
index 11932c53a4..3f56ea3ac5 100644
--- a/epan/dissectors/asn1/tcap/Makefile.am
+++ b/epan/dissectors/asn1/tcap/Makefile.am
@@ -16,7 +16,35 @@
# 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=tcap
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).asn\
+ UnidialoguePDUs.asn \
+ DialoguePDUs.asn
+
+INCLUDED_ASN_FILE_LIST = \
+ TCAPMessages.asn \
+ TC-Notation-Extensions.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) \
+ $(INCLUDED_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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/tcap/Makefile.common b/epan/dissectors/asn1/tcap/Makefile.common
deleted file mode 100644
index 4d2e6aee5a..0000000000
--- a/epan/dissectors/asn1/tcap/Makefile.common
+++ /dev/null
@@ -1,49 +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=tcap
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).asn\
- UnidialoguePDUs.asn \
- DialoguePDUs.asn
-
-INCLUDED_ASN_FILE_LIST = \
- TCAPMessages.asn \
- TC-Notation-Extensions.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) \
- $(INCLUDED_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
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/tetra/Makefile.am b/epan/dissectors/asn1/tetra/Makefile.am
index 11932c53a4..a95f0b11b0 100644
--- a/epan/dissectors/asn1/tetra/Makefile.am
+++ b/epan/dissectors/asn1/tetra/Makefile.am
@@ -16,7 +16,28 @@
# 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=tetra
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ $(PROTOCOL_NAME).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= -u
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/tetra/Makefile.common b/epan/dissectors/asn1/tetra/Makefile.common
deleted file mode 100644
index 7085d53659..0000000000
--- a/epan/dissectors/asn1/tetra/Makefile.common
+++ /dev/null
@@ -1,42 +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=tetra
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- $(PROTOCOL_NAME).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= -u
-
-EXTRA_CNF=
diff --git a/epan/dissectors/asn1/ulp/Makefile.am b/epan/dissectors/asn1/ulp/Makefile.am
index 11932c53a4..26c95c043f 100644
--- a/epan/dissectors/asn1/ulp/Makefile.am
+++ b/epan/dissectors/asn1/ulp/Makefile.am
@@ -16,7 +16,27 @@
# 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 = ulp
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ ULP.asn \
+ SUPL.asn \
+ ULP-Components.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/ulp/Makefile.common b/epan/dissectors/asn1/ulp/Makefile.common
deleted file mode 100644
index 7431f176f9..0000000000
--- a/epan/dissectors/asn1/ulp/Makefile.common
+++ /dev/null
@@ -1,41 +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 = ulp
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- ULP.asn \
- SUPL.asn \
- ULP-Components.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/wlancertextn/Makefile.am b/epan/dissectors/asn1/wlancertextn/Makefile.am
index 11932c53a4..da8429dde2 100644
--- a/epan/dissectors/asn1/wlancertextn/Makefile.am
+++ b/epan/dissectors/asn1/wlancertextn/Makefile.am
@@ -16,7 +16,28 @@
# 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=wlancertextn
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ WLANCERTEXTN.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
+
+EXTRA_CNF=
diff --git a/epan/dissectors/asn1/wlancertextn/Makefile.common b/epan/dissectors/asn1/wlancertextn/Makefile.common
deleted file mode 100644
index 2f51ab2b7e..0000000000
--- a/epan/dissectors/asn1/wlancertextn/Makefile.common
+++ /dev/null
@@ -1,42 +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=wlancertextn
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- WLANCERTEXTN.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
-
-EXTRA_CNF=
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 =
diff --git a/epan/dissectors/asn1/x509af/Makefile.am b/epan/dissectors/asn1/x509af/Makefile.am
index 11932c53a4..952c82c948 100644
--- a/epan/dissectors/asn1/x509af/Makefile.am
+++ b/epan/dissectors/asn1/x509af/Makefile.am
@@ -16,7 +16,42 @@
# 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=x509af
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ AuthenticationFramework.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
+
+EXTRA_CNF= \
+ $(builddir)/../x509ce/x509ce-exp.cnf \
+ $(builddir)/../x509if/x509if-exp.cnf \
+ $(builddir)/../x509sat/x509sat-exp.cnf
+
+$(builddir)/../x509ce/x509ce-exp.cnf:
+ (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509sat/x509sat-exp.cnf:
+ (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/x509af/Makefile.common b/epan/dissectors/asn1/x509af/Makefile.common
deleted file mode 100644
index 715948938f..0000000000
--- a/epan/dissectors/asn1/x509af/Makefile.common
+++ /dev/null
@@ -1,56 +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=x509af
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- AuthenticationFramework.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
-
-EXTRA_CNF= \
- $(builddir)/../x509ce/x509ce-exp.cnf \
- $(builddir)/../x509if/x509if-exp.cnf \
- $(builddir)/../x509sat/x509sat-exp.cnf
-
-$(builddir)/../x509ce/x509ce-exp.cnf:
- (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
- (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/x509ce/Makefile.am b/epan/dissectors/asn1/x509ce/Makefile.am
index 11932c53a4..0dad2cd19e 100644
--- a/epan/dissectors/asn1/x509ce/Makefile.am
+++ b/epan/dissectors/asn1/x509ce/Makefile.am
@@ -16,7 +16,50 @@
# 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=x509ce
+
+EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ CertificateExtensions.asn \
+ CertificateExtensionsCiplus.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
+
+EXTRA_CNF = \
+ $(builddir)/../p1/p1-exp.cnf \
+ $(builddir)/../x509af/x509af-exp.cnf \
+ $(builddir)/../x509if/x509if-exp.cnf \
+ $(builddir)/../x509sat/x509sat-exp.cnf
+
+EXPORT_DEPENDS = \
+ $(builddir)/../x509af/x509af-exp.cnf
+
+$(builddir)/../p1/p1-exp.cnf:
+ (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509af/x509af-exp.cnf:
+ (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../x509sat/x509sat-exp.cnf:
+ (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/x509ce/Makefile.common b/epan/dissectors/asn1/x509ce/Makefile.common
deleted file mode 100644
index d51c51fe52..0000000000
--- a/epan/dissectors/asn1/x509ce/Makefile.common
+++ /dev/null
@@ -1,64 +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=x509ce
-
-EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- CertificateExtensions.asn \
- CertificateExtensionsCiplus.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
-
-EXTRA_CNF = \
- $(builddir)/../p1/p1-exp.cnf \
- $(builddir)/../x509af/x509af-exp.cnf \
- $(builddir)/../x509if/x509if-exp.cnf \
- $(builddir)/../x509sat/x509sat-exp.cnf
-
-EXPORT_DEPENDS = \
- $(builddir)/../x509af/x509af-exp.cnf
-
-$(builddir)/../p1/p1-exp.cnf:
- (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509af/x509af-exp.cnf:
- (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
- (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/x509if/Makefile.am b/epan/dissectors/asn1/x509if/Makefile.am
index 11932c53a4..3f0a1eaca6 100644
--- a/epan/dissectors/asn1/x509if/Makefile.am
+++ b/epan/dissectors/asn1/x509if/Makefile.am
@@ -16,7 +16,36 @@
# 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=x509if
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ InformationFramework.asn \
+ ServiceAdministration.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
+
+EXTRA_CNF= \
+ $(builddir)/../x509sat/x509sat-exp.cnf
+
+$(builddir)/../x509sat/x509sat-exp.cnf:
+ (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/x509if/Makefile.common b/epan/dissectors/asn1/x509if/Makefile.common
deleted file mode 100644
index e087bd3a08..0000000000
--- a/epan/dissectors/asn1/x509if/Makefile.common
+++ /dev/null
@@ -1,50 +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=x509if
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- InformationFramework.asn \
- ServiceAdministration.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
-
-EXTRA_CNF= \
- $(builddir)/../x509sat/x509sat-exp.cnf
-
-$(builddir)/../x509sat/x509sat-exp.cnf:
- (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/x509sat/Makefile.am b/epan/dissectors/asn1/x509sat/Makefile.am
index 11932c53a4..ed1ab69261 100644
--- a/epan/dissectors/asn1/x509sat/Makefile.am
+++ b/epan/dissectors/asn1/x509sat/Makefile.am
@@ -16,7 +16,39 @@
# 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=x509sat
+
+EXPORT_FILES = \
+ $(PROTOCOL_NAME)-exp.cnf
+
+EXT_ASN_FILE_LIST =
+
+ASN_FILE_LIST = \
+ SelectedAttributeTypes.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 -r Syntax
+
+EXTRA_CNF= \
+ $(builddir)/../x509if/x509if-exp.cnf \
+ $(builddir)/../p1/p1-exp.cnf
+
+$(builddir)/../x509if/x509if-exp.cnf:
+ (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
+
+$(builddir)/../p1/p1-exp.cnf:
+ (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/x509sat/Makefile.common b/epan/dissectors/asn1/x509sat/Makefile.common
deleted file mode 100644
index e735425ee6..0000000000
--- a/epan/dissectors/asn1/x509sat/Makefile.common
+++ /dev/null
@@ -1,53 +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=x509sat
-
-EXPORT_FILES = \
- $(PROTOCOL_NAME)-exp.cnf
-
-EXT_ASN_FILE_LIST =
-
-ASN_FILE_LIST = \
- SelectedAttributeTypes.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 -r Syntax
-
-EXTRA_CNF= \
- $(builddir)/../x509if/x509if-exp.cnf \
- $(builddir)/../p1/p1-exp.cnf
-
-$(builddir)/../x509if/x509if-exp.cnf:
- (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT))
-
-$(builddir)/../p1/p1-exp.cnf:
- (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT))
diff --git a/epan/dissectors/asn1/x721/Makefile.am b/epan/dissectors/asn1/x721/Makefile.am
index 11932c53a4..3bba1491e9 100644
--- a/epan/dissectors/asn1/x721/Makefile.am
+++ b/epan/dissectors/asn1/x721/Makefile.am
@@ -16,7 +16,20 @@
# 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
+
+#Dummy entry to pass the clean target
+PROTOCOL_NAME = dummy
+
+ASN_FILE_LIST =
+
+INCLUDED_ASN_FILE_LIST =
+
+EXTRA_DIST = \
+ $(EXTRA_DIST_COMMON) \
+ $(ASN_FILE_LIST) \
+ $(INCLUDED_ASN_FILE_LIST) \
+ Attribute-ASN1Module.asn \
+ ManagedObjectClassesDefinitions.asn \
+ Notification-ASN1Module.asn \
+ Parameter-ASN1Module.asn
diff --git a/epan/dissectors/asn1/x721/Makefile.common b/epan/dissectors/asn1/x721/Makefile.common
deleted file mode 100644
index 5da5ac8d33..0000000000
--- a/epan/dissectors/asn1/x721/Makefile.common
+++ /dev/null
@@ -1,33 +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.
-
-#Dummy entry to pass the clean target
-PROTOCOL_NAME = dummy
-
-ASN_FILE_LIST =
-
-INCLUDED_ASN_FILE_LIST =
-
-EXTRA_DIST = \
- $(EXTRA_DIST_COMMON) \
- $(ASN_FILE_LIST) \
- $(INCLUDED_ASN_FILE_LIST) \
- Attribute-ASN1Module.asn \
- ManagedObjectClassesDefinitions.asn \
- Notification-ASN1Module.asn \
- Parameter-ASN1Module.asn