diff options
Diffstat (limited to 'epan')
225 files changed, 5582 insertions, 8016 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 4b2f6531b1..4dab5675bf 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -21,7 +21,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include Makefile.common include $(top_srcdir)/Makefile.am.inc if HAVE_LIBLUA @@ -45,30 +44,319 @@ AM_CPPFLAGS = $(INCLUDEDIRS) -I$(builddir)/wslua $(WS_CPPFLAGS) \ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la -# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ + +LIBWIRESHARK_SRC = \ + addr_and_mask.c \ + addr_resolv.c \ + address_types.c \ + afn.c \ + aftypes.c \ + app_mem_usage.c \ + asn1.c \ + capture_dissectors.c \ + charsets.c \ + circuit.c \ + color_filters.c \ + column.c \ + column-utils.c \ + conversation.c \ + conversation_table.c \ + crc10-tvb.c \ + crc16-tvb.c \ + crc32-tvb.c \ + crc6-tvb.c \ + crc8-tvb.c \ + decode_as.c \ + disabled_protos.c \ + dissector_filters.c \ + dvb_chartbl.c \ + dwarf.c \ + epan.c \ + ex-opt.c \ + except.c \ + expert.c \ + exported_pdu.c \ + plugin_if.c \ + filter_expressions.c \ + follow.c \ + frame_data.c \ + frame_data_sequence.c \ + funnel.c \ + g_int64_hash_routines.c \ + geoip_db.c \ + golay.c \ + guid-utils.c \ + iana_charsets.c \ + in_cksum.c \ + ipproto.c \ + ipv4.c \ + next_tvb.c \ + oids.c \ + osi-utils.c \ + oui.c \ + packet-range.c \ + packet.c \ + prefs.c \ + print.c \ + print_stream.c \ + proto.c \ + proto_data.c \ + range.c \ + reassemble.c \ + reedsolomon.c \ + req_resp_hdrs.c \ + rtd_table.c \ + show_exception.c \ + sminmpec.c \ + srt_table.c \ + stat_tap_ui.c \ + stats_tree.c \ + strutil.c \ + stream.c \ + t35.c \ + tap.c \ + timestamp.c \ + timestats.c \ + tfs.c \ + to_str.c \ + tvbparse.c \ + tvbuff_base64.c \ + tvbuff_composite.c \ + tvbuff_real.c \ + tvbuff_subset.c \ + tvbuff_zlib.c \ + tvbuff.c \ + uat.c \ + value_string.c \ + xdlc.c + +# +# We distribute Lemon and rdps.py with Wireshark, so we don't distribute the +# files they produce. +# +NODIST_LIBWIRESHARK_GENERATED_C_FILES = \ + dtd_grammar.c \ + ps.c + +NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES = \ + dtd_grammar.h + +# +# These don't get removed on "make distclean", as the tools we use to +# generate them aren't part of the Wireshark distribution, and aren't +# tools assumed to be present for any system capable of compiling +# from a tarball (e.g., make and a C compiler are assumed to be present, +# but Flex isn't). +# +LIBWIRESHARK_GENERATED_C_FILES = \ + diam_dict.c \ + dtd_parse.c \ + dtd_preparse.c \ + radius_dict.c \ + uat_load.c + +LIBWIRESHARK_GENERATED_HEADER_FILES = \ + diam_dict_lex.h \ + dtd_parse_lex.h \ + dtd_preparse_lex.h \ + radius_dict_lex.h \ + uat_load_lex.h + +LIBWIRESHARK_GENERATED_SRC = \ + $(LIBWIRESHARK_GENERATED_C_FILES) \ + $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) + +LIBWIRESHARK_ALL_SRC = \ + $(LIBWIRESHARK_SRC) \ + $(LIBWIRESHARK_GENERATED_SRC) + +LIBWIRESHARK_INCLUDES = \ + addr_and_mask.h \ + addr_resolv.h \ + address.h \ + address_types.h \ + afn.h \ + aftypes.h \ + app_mem_usage.h \ + arcnet_pids.h \ + arptypes.h \ + asn1.h \ + ax25_pids.h \ + bridged_pids.h \ + capture_dissectors.h \ + charsets.h \ + chdlctypes.h \ + circuit.h \ + color_filters.h \ + column.h \ + column-info.h \ + column-utils.h \ + conversation.h \ + conversation_debug.h \ + conversation_table.h \ + conv_id.h \ + crc10-tvb.h \ + crc16-tvb.h \ + crc32-tvb.h \ + crc6-tvb.h \ + crc8-tvb.h \ + decode_as.h \ + diam_dict.h \ + disabled_protos.h \ + dissector_filters.h \ + dtd.h \ + dtd_parse.h \ + dvb_chartbl.h \ + dwarf.h \ + eap.h \ + eapol_keydes_types.h \ + epan-int.h \ + epan.h \ + epan_dissect.h \ + etypes.h \ + ex-opt.h \ + except.h \ + exceptions.h \ + expert.h \ + exported_pdu.h \ + plugin_if.h \ + filter_expressions.h \ + follow.h \ + frame_data.h \ + frame_data_sequence.h \ + funnel.h \ + g_int64_hash_routines.h \ + garrayfix.h \ + geoip_db.h \ + golay.h \ + guid-utils.h \ + iana_charsets.h \ + iax2_codec_type.h \ + in_cksum.h \ + ip_opts.h \ + ipproto.h \ + ipv4.h \ + ipv6.h \ + lapd_sapi.h \ + llcsaps.h \ + next_tvb.h \ + nlpid.h \ + oids.h \ + osi-utils.h \ + oui.h \ + packet-range.h \ + packet.h \ + packet_info.h \ + params.h \ + ppptypes.h \ + print.h \ + print_stream.h \ + prefs.h \ + prefs-int.h \ + proto.h \ + proto_data.h \ + ps.h \ + ptvcursor.h \ + range.h \ + reassemble.h \ + reedsolomon.h \ + req_resp_hdrs.h \ + rtd_table.h \ + rtp_pt.h \ + sctpppids.h \ + show_exception.h \ + slow_protocol_subtypes.h \ + sminmpec.h \ + srt_table.h \ + stat_tap_ui.h \ + stat_groups.h \ + stats_tree.h \ + stats_tree_priv.h \ + stream.h \ + strutil.h \ + t35.h \ + tap.h \ + tap-voip.h \ + timestamp.h \ + timestats.h \ + tfs.h \ + time_fmt.h \ + to_str.h \ + to_str-int.h \ + tvbparse.h \ + tvbuff.h \ + tvbuff-int.h \ + uat.h \ + uat-int.h \ + value_string.h \ + x264_prt_id.h \ + xdlc.h #Since code generated by lex may trigger gcc warnings, we are now generating two #libraries. A single library is generated with the lex code without the barrier #"stop on warning". An other library is generated from the remaining source #files with the "stop on warning" barrier. libwireshark_la_SOURCES = \ - $(LIBWIRESHARK_SRC) \ + $(LIBWIRESHARK_SRC) \ $(LIBWIRESHARK_INCLUDES) \ ws_version_info.c libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL +# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ + +# +# Add the object files for missing routines, if any. +# +libwireshark_la_LIBADD = \ + libwireshark_generated.la \ + libwireshark_asmopt.la \ + crypt/libairpdcap.la \ + ftypes/libftypes.la \ + dfilter/libdfilter.la \ + dissectors/libdissectors.la \ + dissectors/libdirtydissectors.la \ + dissectors/libfiledissectors.la \ + nghttp2/libnghttp2.la \ + wmem/libwmem.la \ + $(wslua_lib) \ + ${top_builddir}/wiretap/libwiretap.la \ + ${top_builddir}/wsutil/libwsutil.la \ + @C_ARES_LIBS@ \ + @LIBGCRYPT_LIBS@ \ + @LIBGNUTLS_LIBS@ \ + @KRB5_LIBS@ \ + @SSL_LIBS@ \ + @LIBSMI_LDFLAGS@ \ + @GEOIP_LIBS@ \ + @GLIB_LIBS@ + +libwireshark_la_DEPENDENCIES = \ + libwireshark_generated.la \ + compress/liblzxpress.la \ + libwireshark_asmopt.la \ + crypt/libairpdcap.la \ + ftypes/libftypes.la \ + dfilter/libdfilter.la \ + dissectors/libdissectors.la \ + dissectors/libdirtydissectors.la \ + nghttp2/libnghttp2.la \ + wmem/libwmem.la \ + $(wslua_lib) \ + ${top_builddir}/wsutil/libwsutil.la \ + ${top_builddir}/wiretap/libwiretap.la + libwireshark_generated_la_SOURCES = \ $(LIBWIRESHARK_GENERATED_C_FILES) \ $(LIBWIRESHARK_GENERATED_HEADER_FILES) -libwireshark_generated_la_CFLAGS = $(GENERATED_CFLAGS) - nodist_libwireshark_generated_la_SOURCES = \ $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \ $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) +libwireshark_generated_la_CFLAGS = $(GENERATED_CFLAGS) + # code optionally implemented in assembler # only C source available for platforms other than Win32 libwireshark_asmopt_la_SOURCES = \ @@ -84,7 +372,6 @@ EXTRA_DIST = \ dtd_parse.h \ dtd_preparse.l \ enterprise-numbers \ - Makefile.common \ radius_dict.l \ uat_load.l \ doxygen.cfg.in \ @@ -117,47 +404,6 @@ BUILT_SOURCES = \ $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \ ws_version_info.c -# -# Add the object files for missing routines, if any. -# -libwireshark_la_LIBADD = \ - libwireshark_generated.la \ - libwireshark_asmopt.la \ - crypt/libairpdcap.la \ - ftypes/libftypes.la \ - dfilter/libdfilter.la \ - dissectors/libdissectors.la \ - dissectors/libdirtydissectors.la \ - dissectors/libfiledissectors.la \ - nghttp2/libnghttp2.la \ - wmem/libwmem.la \ - $(wslua_lib) \ - ${top_builddir}/wiretap/libwiretap.la \ - ${top_builddir}/wsutil/libwsutil.la \ - @C_ARES_LIBS@ \ - @LIBGCRYPT_LIBS@ \ - @LIBGNUTLS_LIBS@ \ - @KRB5_LIBS@ \ - @SSL_LIBS@ \ - @LIBSMI_LDFLAGS@ \ - @GEOIP_LIBS@ \ - @GLIB_LIBS@ - -libwireshark_la_DEPENDENCIES = \ - libwireshark_generated.la \ - compress/liblzxpress.la \ - libwireshark_asmopt.la \ - crypt/libairpdcap.la \ - ftypes/libftypes.la \ - dfilter/libdfilter.la \ - dissectors/libdissectors.la \ - dissectors/libdirtydissectors.la \ - nghttp2/libnghttp2.la \ - wmem/libwmem.la \ - $(wslua_lib) \ - ${top_builddir}/wsutil/libwsutil.la \ - ${top_builddir}/wiretap/libwiretap.la - EXTRA_PROGRAMS = reassemble_test tvbtest oids_test exntest reassemble_test_LDADD = \ diff --git a/epan/Makefile.common b/epan/Makefile.common deleted file mode 100644 index f80b81cfef..0000000000 --- a/epan/Makefile.common +++ /dev/null @@ -1,269 +0,0 @@ -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - -LIBWIRESHARK_SRC = \ - addr_and_mask.c \ - addr_resolv.c \ - address_types.c \ - afn.c \ - aftypes.c \ - app_mem_usage.c \ - asn1.c \ - capture_dissectors.c \ - charsets.c \ - circuit.c \ - color_filters.c \ - column.c \ - column-utils.c \ - conversation.c \ - conversation_table.c \ - crc10-tvb.c \ - crc16-tvb.c \ - crc32-tvb.c \ - crc6-tvb.c \ - crc8-tvb.c \ - decode_as.c \ - disabled_protos.c \ - dissector_filters.c \ - dvb_chartbl.c \ - dwarf.c \ - epan.c \ - ex-opt.c \ - except.c \ - expert.c \ - exported_pdu.c \ - plugin_if.c \ - filter_expressions.c \ - follow.c \ - frame_data.c \ - frame_data_sequence.c \ - funnel.c \ - g_int64_hash_routines.c \ - geoip_db.c \ - golay.c \ - guid-utils.c \ - iana_charsets.c \ - in_cksum.c \ - ipproto.c \ - ipv4.c \ - next_tvb.c \ - oids.c \ - osi-utils.c \ - oui.c \ - packet-range.c \ - packet.c \ - prefs.c \ - print.c \ - print_stream.c \ - proto.c \ - proto_data.c \ - range.c \ - reassemble.c \ - reedsolomon.c \ - req_resp_hdrs.c \ - rtd_table.c \ - show_exception.c \ - sminmpec.c \ - srt_table.c \ - stat_tap_ui.c \ - stats_tree.c \ - strutil.c \ - stream.c \ - t35.c \ - tap.c \ - timestamp.c \ - timestats.c \ - tfs.c \ - to_str.c \ - tvbparse.c \ - tvbuff_base64.c \ - tvbuff_composite.c \ - tvbuff_real.c \ - tvbuff_subset.c \ - tvbuff_zlib.c \ - tvbuff.c \ - uat.c \ - value_string.c \ - xdlc.c - -# -# We distribute Lemon and rdps.py with Wireshark, so we don't distribute the -# files they produce. -# -NODIST_LIBWIRESHARK_GENERATED_C_FILES = \ - dtd_grammar.c \ - ps.c - -NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES = \ - dtd_grammar.h - -# -# These don't get removed on "make distclean", as the tools we use to -# generate them aren't part of the Wireshark distribution, and aren't -# tools assumed to be present for any system capable of compiling -# from a tarball (e.g., make and a C compiler are assumed to be present, -# but Flex isn't). -# -LIBWIRESHARK_GENERATED_C_FILES = \ - diam_dict.c \ - dtd_parse.c \ - dtd_preparse.c \ - radius_dict.c \ - uat_load.c - -LIBWIRESHARK_GENERATED_HEADER_FILES = \ - diam_dict_lex.h \ - dtd_parse_lex.h \ - dtd_preparse_lex.h \ - radius_dict_lex.h \ - uat_load_lex.h - -LIBWIRESHARK_GENERATED_SRC = \ - $(LIBWIRESHARK_GENERATED_C_FILES) \ - $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) - -LIBWIRESHARK_ALL_SRC = \ - $(LIBWIRESHARK_SRC) \ - $(LIBWIRESHARK_GENERATED_SRC) - -LIBWIRESHARK_INCLUDES = \ - addr_and_mask.h \ - addr_resolv.h \ - address.h \ - address_types.h \ - afn.h \ - aftypes.h \ - app_mem_usage.h \ - arcnet_pids.h \ - arptypes.h \ - asn1.h \ - ax25_pids.h \ - bridged_pids.h \ - capture_dissectors.h \ - charsets.h \ - chdlctypes.h \ - circuit.h \ - color_filters.h \ - column.h \ - column-info.h \ - column-utils.h \ - conversation.h \ - conversation_debug.h \ - conversation_table.h \ - conv_id.h \ - crc10-tvb.h \ - crc16-tvb.h \ - crc32-tvb.h \ - crc6-tvb.h \ - crc8-tvb.h \ - decode_as.h \ - diam_dict.h \ - disabled_protos.h \ - dissector_filters.h \ - dtd.h \ - dtd_parse.h \ - dvb_chartbl.h \ - dwarf.h \ - eap.h \ - eapol_keydes_types.h \ - epan-int.h \ - epan.h \ - epan_dissect.h \ - etypes.h \ - ex-opt.h \ - except.h \ - exceptions.h \ - expert.h \ - exported_pdu.h \ - plugin_if.h \ - filter_expressions.h \ - follow.h \ - frame_data.h \ - frame_data_sequence.h \ - funnel.h \ - g_int64_hash_routines.h \ - garrayfix.h \ - geoip_db.h \ - golay.h \ - guid-utils.h \ - iana_charsets.h \ - iax2_codec_type.h \ - in_cksum.h \ - ip_opts.h \ - ipproto.h \ - ipv4.h \ - ipv6.h \ - lapd_sapi.h \ - llcsaps.h \ - next_tvb.h \ - nlpid.h \ - oids.h \ - osi-utils.h \ - oui.h \ - packet-range.h \ - packet.h \ - packet_info.h \ - params.h \ - ppptypes.h \ - print.h \ - print_stream.h \ - prefs.h \ - prefs-int.h \ - proto.h \ - proto_data.h \ - ps.h \ - ptvcursor.h \ - range.h \ - reassemble.h \ - reedsolomon.h \ - req_resp_hdrs.h \ - rtd_table.h \ - rtp_pt.h \ - sctpppids.h \ - show_exception.h \ - slow_protocol_subtypes.h \ - sminmpec.h \ - srt_table.h \ - stat_tap_ui.h \ - stat_groups.h \ - stats_tree.h \ - stats_tree_priv.h \ - stream.h \ - strutil.h \ - t35.h \ - tap.h \ - tap-voip.h \ - timestamp.h \ - timestats.h \ - tfs.h \ - time_fmt.h \ - to_str.h \ - to_str-int.h \ - tvbparse.h \ - tvbuff.h \ - tvbuff-int.h \ - uat.h \ - uat-int.h \ - value_string.h \ - x264_prt_id.h \ - xdlc.h diff --git a/epan/compress/Makefile.am b/epan/compress/Makefile.am index 6105061ca7..b196c5b238 100644 --- a/epan/compress/Makefile.am +++ b/epan/compress/Makefile.am @@ -19,13 +19,18 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include Makefile.common include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) noinst_LTLIBRARIES = liblzxpress.la +liblzxpress_la_SOURCES = \ + lzxpress.c \ + lzxpress.h + +EXTRA_DIST = + CLEANFILES = \ liblzxpress.a \ liblzxpress.la \ @@ -33,16 +38,9 @@ CLEANFILES = \ DISTCLEANFILES = -MAINTAINERCLEANFILES = \ +MAINTAINERCLEANFILES = \ Makefile.in -liblzxpress_la_SOURCES = \ - $(LIBLZXPRESS_SRC) \ - $(LIBLZXPRESS_INCLUDES) - -EXTRA_DIST = \ - Makefile.common - checkapi: $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(LIBLZXPRESS_SRC) + $(liblzxpress_la_SOURCES) diff --git a/epan/compress/Makefile.common b/epan/compress/Makefile.common deleted file mode 100644 index a9cc4bb028..0000000000 --- a/epan/compress/Makefile.common +++ /dev/null @@ -1,28 +0,0 @@ -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -LIBLZXPRESS_SRC = \ - lzxpress.c - -LIBLZXPRESS_INCLUDES = \ - lzxpress.h diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am index 60a8a2b291..b7f2a36556 100644 --- a/epan/crypt/Makefile.am +++ b/epan/crypt/Makefile.am @@ -19,13 +19,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.common include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) noinst_LTLIBRARIES = libairpdcap.la +include Custom.common + +libairpdcap_la_SOURCES = \ + airpdcap.c \ + airpdcap_ccmp.c \ + airpdcap_debug.c \ + airpdcap_rijndael.c \ + airpdcap_tkip.c \ + airpdcap_debug.h \ + airpdcap_interop.h \ + airpdcap_int.h \ + airpdcap_rijndael.h \ + airpdcap_system.h \ + airpdcap_user.h \ + airpdcap_ws.h \ + kasumi.h \ + wep-wpadefs.h \ + $(CUSTOM_CRYPTO_SRC) + +EXTRA_DIST = \ + Custom.common \ + CMakeLists.txt \ + CMakeListsCustom.txt.example + CLEANFILES = \ libairpdcap.a \ libairpdcap.la \ @@ -36,17 +59,7 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = \ Makefile.in -libairpdcap_la_SOURCES = \ - $(LIBAIRPDCAP_SRC) \ - $(LIBAIRPDCAP_INCLUDES) - -EXTRA_DIST = \ - Custom.common \ - Makefile.common \ - CMakeLists.txt \ - CMakeListsCustom.txt.example - checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ -sourcedir=$(srcdir) \ - $(LIBAIRPDCAP_SRC) + $(libairpdcap_la_SOURCES) diff --git a/epan/crypt/Makefile.common b/epan/crypt/Makefile.common deleted file mode 100644 index 18e8edee5d..0000000000 --- a/epan/crypt/Makefile.common +++ /dev/null @@ -1,43 +0,0 @@ -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -include Custom.common - -LIBAIRPDCAP_SRC = \ - airpdcap.c \ - airpdcap_ccmp.c \ - airpdcap_debug.c \ - airpdcap_rijndael.c \ - airpdcap_tkip.c \ - $(CUSTOM_CRYPTO_SRC) - -LIBAIRPDCAP_INCLUDES = \ - airpdcap_debug.h \ - airpdcap_interop.h \ - airpdcap_int.h \ - airpdcap_rijndael.h \ - airpdcap_system.h \ - airpdcap_user.h \ - airpdcap_ws.h \ - kasumi.h \ - wep-wpadefs.h diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index 81703011f4..d74af56551 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -19,7 +19,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -include Makefile.common include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan -I$(lemon_srcdir) \ @@ -27,30 +26,88 @@ AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan -I$(lemon_srcdir) \ noinst_LTLIBRARIES = libdfilter_generated.la libdfilter.la -CLEANFILES = \ - libdfilter.a \ - libdfilter.la \ - libdfilter_generated.a \ - libdfilter_generated.la \ - *~ - -DISTCLEANFILES = \ - grammar.out \ - $(NODIST_GENERATED_FILES) +# C source files that are part of the display filter source; this includes only +# .c files, not YACC or Lex or... files (as Makefile.nmake maps this list +# into a list of object files by replacing ".c" with ".obj") or files +# generated from YACC or Lex files (as Automake doesn't want them in +# _SOURCES variables). +NONGENERATED_C_FILES = \ + dfilter.c \ + dfilter-macro.c \ + dfunctions.c \ + dfvm.c \ + drange.c \ + gencode.c \ + semcheck.c \ + sttype-function.c \ + sttype-integer.c \ + sttype-pointer.c \ + sttype-range.c \ + sttype-set.c \ + sttype-string.c \ + sttype-test.c \ + syntax-tree.c + +# Header files that are not generated from other files +NONGENERATED_HEADER_FILES = \ + dfilter.h \ + dfilter-macro.h \ + dfilter-int.h \ + dfunctions.h \ + dfvm.h \ + drange.h \ + gencode.h \ + semcheck.h \ + sttype-function.h \ + sttype-range.h \ + sttype-set.h \ + sttype-test.h \ + syntax-tree.h + +# Files that generate compileable files +GENERATOR_FILES = \ + grammar.lemon \ + scanner.l + +# The C source files they generate and that we want in the distribution +GENERATED_C_FILES = \ + scanner.c + +# The C source files they generate and that we don't want in the distribution +NODIST_GENERATED_C_FILES = \ + grammar.c + +# The header files that they generate and that we want in the distribution +GENERATED_HEADER_FILES = \ + scanner_lex.h + +# The header files that they generate and that we don't want in the distribution +NODIST_GENERATED_HEADER_FILES = \ + grammar.h -MAINTAINERCLEANFILES = \ - $(GENERATED_FILES) \ - $(NODIST_GENERATED_FILES) \ - Makefile.in +# All the generated files we want in the distribution. +GENERATED_FILES = \ + $(GENERATED_C_FILES) \ + $(GENERATED_HEADER_FILES) -BUILT_SOURCES = \ - grammar.h +# All the generated files we don't want in the distribution. +NODIST_GENERATED_FILES = \ + $(NODIST_GENERATED_C_FILES) \ + $(NODIST_GENERATED_HEADER_FILES) #Since code generated by lex may trigger gcc warnings, we are now generating two #libraries. A single library is generated with the lex code without the barrier #"stop on warning". An other library is generated from the remaining source #files with the "stop on warning" barrier. -libdfilter_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES) +libdfilter_la_SOURCES = \ + $(NONGENERATED_C_FILES) \ + $(NONGENERATED_HEADER_FILES) + +libdfilter_la_LIBADD = \ + libdfilter_generated.la + +libdfilter_la_DEPENDENCIES = \ + libdfilter_generated.la libdfilter_generated_la_SOURCES = \ $(GENERATED_C_FILES) \ @@ -62,16 +119,30 @@ nodist_libdfilter_generated_la_SOURCES = \ $(NODIST_GENERATED_C_FILES) \ $(NODIST_GENERATED_HEADER_FILES) -libdfilter_la_LIBADD = libdfilter_generated.la - -libdfilter_la_DEPENDENCIES = libdfilter_generated.la - EXTRA_DIST = \ .editorconfig \ $(GENERATOR_FILES) \ - Makefile.common \ CMakeLists.txt +CLEANFILES = \ + libdfilter.a \ + libdfilter.la \ + libdfilter_generated.a \ + libdfilter_generated.la \ + *~ + +DISTCLEANFILES = \ + grammar.out \ + $(NODIST_GENERATED_FILES) + +MAINTAINERCLEANFILES = \ + $(GENERATED_FILES) \ + $(NODIST_GENERATED_FILES) \ + Makefile.in + +BUILT_SOURCES = \ + grammar.h + scanner_lex.h : scanner.c grammar.h : grammar.c diff --git a/epan/dfilter/Makefile.common b/epan/dfilter/Makefile.common deleted file mode 100644 index 90eda7661a..0000000000 --- a/epan/dfilter/Makefile.common +++ /dev/null @@ -1,91 +0,0 @@ -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# C source files that are part of the display filter source; this includes only -# .c files, not YACC or Lex or... files (as Makefile.nmake maps this list -# into a list of object files by replacing ".c" with ".obj") or files -# generated from YACC or Lex files (as Automake doesn't want them in -# _SOURCES variables). -NONGENERATED_C_FILES = \ - dfilter.c \ - dfilter-macro.c \ - dfunctions.c \ - dfvm.c \ - drange.c \ - gencode.c \ - semcheck.c \ - sttype-function.c \ - sttype-integer.c \ - sttype-pointer.c \ - sttype-range.c \ - sttype-set.c \ - sttype-string.c \ - sttype-test.c \ - syntax-tree.c - -# Header files that are not generated from other files -NONGENERATED_HEADER_FILES = \ - dfilter.h \ - dfilter-macro.h \ - dfilter-int.h \ - dfunctions.h \ - dfvm.h \ - drange.h \ - gencode.h \ - semcheck.h \ - sttype-function.h \ - sttype-range.h \ - sttype-set.h \ - sttype-test.h \ - syntax-tree.h - -# Files that generate compileable files -GENERATOR_FILES = \ - grammar.lemon \ - scanner.l - -# The C source files they generate and that we want in the distribution -GENERATED_C_FILES = \ - scanner.c - -# The C source files they generate and that we don't want in the distribution -NODIST_GENERATED_C_FILES = \ - grammar.c - -# The header files that they generate and that we want in the distribution -GENERATED_HEADER_FILES = \ - scanner_lex.h - -# The header files that they generate and that we don't want in the distribution -NODIST_GENERATED_HEADER_FILES = \ - grammar.h - -# All the generated files we want in the distribution. -GENERATED_FILES = \ - $(GENERATED_C_FILES) \ - $(GENERATED_HEADER_FILES) - -# All the generated files we don't want in the distribution. -NODIST_GENERATED_FILES = \ - $(NODIST_GENERATED_C_FILES) \ - $(NODIST_GENERATED_HEADER_FILES) diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index bf14ad5824..49bc696347 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -18,12 +18,1798 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include Makefile.common include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan $(WS_CPPFLAGS) \ $(GLIB_CFLAGS) $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) +include Custom.common + +# "BUILT_SOURCES" are built before any "make all" or "make check" targets. +BUILT_C_FILES = \ + register.c + +BUILT_SOURCES = $(BUILT_C_FILES) $(BUILT_HEADER_FILES) + +# Header files generated from source files. +GENERATED_HEADER_FILES = \ + $(BUILT_HEADER_FILES) + +# C source files generated from source files. +GENERATED_C_FILES = \ + $(BUILT_C_FILES) \ + packet-ncp2222.c + +# All the generated files. +GENERATED_FILES = $(GENERATED_HEADER_FILES) $(GENERATED_C_FILES) + +# +# PIDL-generated DCE RPC dissectors without warnings. +# +PIDL_DISSECTOR_SRC = \ + packet-dcerpc-atsvc.c \ + packet-dcerpc-budb.c \ + packet-dcerpc-butc.c \ + packet-dcerpc-dfs.c \ + packet-dcerpc-dnsserver.c \ + packet-dcerpc-drsuapi.c \ + packet-dcerpc-dssetup.c \ + packet-dcerpc-efs.c \ + packet-dcerpc-eventlog.c \ + packet-dcerpc-frstrans.c \ + packet-dcerpc-initshutdown.c \ + packet-dcerpc-lsa.c \ + packet-dcerpc-mapi.c \ + packet-dcerpc-mdssvc.c \ + packet-dcerpc-misc.c \ + packet-dcerpc-nspi.c \ + packet-dcerpc-rfr.c \ + packet-dcerpc-srvsvc.c \ + packet-dcerpc-winreg.c \ + packet-dcerpc-witness.c \ + packet-dcerpc-wkssvc.c \ + packet-dcerpc-wzcsvc.c + +# +# Headers for PIDL-generated dissectors. +# +PIDL_DISSECTOR_INCLUDES = \ + packet-dcerpc-atsvc.h \ + packet-dcerpc-dfs.h \ + packet-dcerpc-dssetup.h \ + packet-dcerpc-efs.h \ + packet-dcerpc-eventlog.h \ + packet-dcerpc-initshutdown.h \ + packet-dcerpc-lsa.h \ + packet-dcerpc-mapi.h \ + packet-dcerpc-mdssvc.h \ + packet-dcerpc-misc.h \ + packet-dcerpc-nspi.h \ + packet-dcerpc-rfr.h \ + packet-dcerpc-srvsvc.h \ + packet-dcerpc-winreg.h \ + packet-dcerpc-witness.h \ + packet-dcerpc-wkssvc.h \ + packet-dcerpc-wzcsvc.h \ + packet-dcerpc-frstrans.h + +# +# asn2wrs-generated ASN.1 dissectors without warnings. +# +ASN1_DISSECTOR_SRC = \ + packet-ansi_map.c \ + packet-acp133.c \ + packet-acse.c \ + packet-ansi_tcap.c \ + packet-atn-ulcs.c \ + packet-atn-cm.c \ + packet-atn-cpdlc.c \ + packet-c1222.c \ + packet-camel.c \ + packet-cdt.c \ + packet-charging_ase.c \ + packet-cmip.c \ + packet-cmp.c \ + packet-cms.c \ + packet-credssp.c \ + packet-crmf.c \ + packet-dap.c \ + packet-disp.c \ + packet-dop.c \ + packet-dsp.c \ + packet-ecp.c \ + packet-ess.c \ + packet-ftam.c \ + packet-goose.c \ + packet-gsm_map.c \ + packet-HI2Operations.c \ + packet-h225.c \ + packet-h235.c \ + packet-h245.c \ + packet-h248.c \ + packet-h282.c \ + packet-h283.c \ + packet-h323.c \ + packet-h450.c \ + packet-h450-ros.c \ + packet-h460.c \ + packet-h501.c \ + packet-hnbap.c \ + packet-idmp.c \ + packet-ilp.c \ + packet-inap.c \ + packet-isdn-sup.c \ + packet-kerberos.c \ + packet-lcsap.c \ + packet-ldap.c \ + packet-logotypecertextn.c \ + packet-lpp.c \ + packet-lppa.c \ + packet-lppe.c \ + packet-lte-rrc.c \ + packet-m3ap.c \ + packet-mms.c \ + packet-mpeg-audio.c \ + packet-mpeg-pes.c \ + packet-nbap.c \ + packet-novell_pkis.c \ + packet-ns_cert_exts.c \ + packet-ocsp.c \ + packet-p1.c \ + packet-p22.c \ + packet-p7.c \ + packet-p772.c \ + packet-pcap.c \ + packet-pkcs1.c \ + packet-pkcs12.c \ + packet-pkinit.c \ + packet-pkix1explicit.c \ + packet-pkix1implicit.c \ + packet-pkixac.c \ + packet-pkixproxy.c \ + packet-pkixqualified.c \ + packet-pkixtsp.c \ + packet-pres.c \ + packet-q932.c \ + packet-q932-ros.c \ + packet-qsig.c \ + packet-ranap.c \ + packet-rnsap.c \ + packet-ros.c \ + packet-rrc.c \ + packet-rrlp.c \ + packet-rtse.c \ + packet-rua.c \ + packet-s1ap.c \ + packet-sabp.c \ + packet-sbc-ap.c \ + packet-smrse.c \ + packet-snmp.c \ + packet-spnego.c \ + packet-sv.c \ + packet-t124.c \ + packet-t125.c \ + packet-t38.c \ + packet-tcap.c \ + packet-tetra.c \ + packet-ulp.c \ + packet-wlancertextn.c \ + packet-x2ap.c \ + packet-x509af.c \ + packet-x509ce.c \ + packet-x509if.c \ + packet-x509sat.c + +# +# idl2wrs-generated CORBA IDL dissectors without warnings. +# +CORBA_IDL_DISSECTOR_SRC = \ + packet-coseventcomm.c + +# +# asn2wrs-generated ASN.1 dissectors with warnings. +# +DIRTY_ASN1_DISSECTOR_SRC = \ + $(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC) + +# +# idl2wrs-generated CORBA IDL dissectors with warnings. +# +DIRTY_CORBA_IDL_DISSECTOR_SRC = \ + packet-cosnaming.c \ + packet-gias.c \ + packet-parlay.c \ + packet-tango.c + +FILE_DISSECTOR_SRC = \ + file-btsnoop.c \ + file-elf.c \ + file-file.c \ + file-gif.c \ + file-jpeg.c \ + file-mp4.c \ + file-pcap.c \ + file-pcapng.c \ + file-png.c +# +# Dissectors without warnings. +# +DISSECTOR_SRC = \ + packet-2dparityfec.c \ + packet-3com-njack.c \ + packet-3com-xns.c \ + packet-3g-a11.c \ + packet-6lowpan.c \ + packet-9p.c \ + packet-a21.c \ + packet-aarp.c \ + packet-aastra-aasp.c \ + packet-acap.c \ + packet-acn.c \ + packet-acr122.c \ + packet-actrace.c \ + packet-adb.c \ + packet-adb_cs.c \ + packet-adb_service.c \ + packet-adwin-config.c \ + packet-adwin.c \ + packet-aeron.c \ + packet-afp.c \ + packet-afs.c \ + packet-agentx.c \ + packet-aim-admin.c \ + packet-aim-adverts.c \ + packet-aim-bos.c \ + packet-aim-buddylist.c \ + packet-aim-chat.c \ + packet-aim-chatnav.c \ + packet-aim-directory.c \ + packet-aim-email.c \ + packet-aim-generic.c \ + packet-aim-icq.c \ + packet-aim-invitation.c \ + packet-aim-location.c \ + packet-aim-messaging.c \ + packet-aim-oft.c \ + packet-aim-popup.c \ + packet-aim-signon.c \ + packet-aim-ssi.c \ + packet-aim-sst.c \ + packet-aim-stats.c \ + packet-aim-translate.c \ + packet-aim-userlookup.c \ + packet-aim.c \ + packet-ajp13.c \ + packet-alcap.c \ + packet-alljoyn.c \ + packet-amqp.c \ + packet-amr.c \ + packet-ancp.c \ + packet-ans.c \ + packet-ansi_637.c \ + packet-ansi_683.c \ + packet-ansi_801.c \ + packet-ansi_a.c \ + packet-aodv.c \ + packet-aoe.c \ + packet-aol.c \ + packet-ap1394.c \ + packet-app-pkix-cert.c \ + packet-applemidi.c \ + packet-aprs.c \ + packet-arcnet.c \ + packet-armagetronad.c \ + packet-arp.c \ + packet-artnet.c \ + packet-aruba-adp.c \ + packet-aruba-erm.c \ + packet-aruba-iap.c \ + packet-aruba-papi.c \ + packet-ar_drone.c \ + packet-asap.c \ + packet-ascend.c \ + packet-asf.c \ + packet-assa_r3.c \ + packet-asterix.c \ + packet-at.c \ + packet-atalk.c \ + packet-ath.c \ + packet-atm.c \ + packet-atmtcp.c \ + packet-auto_rp.c \ + packet-ax25.c \ + packet-ax25-kiss.c \ + packet-ax25-nol3.c \ + packet-ax4000.c \ + packet-ayiya.c \ + packet-babel.c \ + packet-bacapp.c \ + packet-bacnet.c \ + packet-banana.c \ + packet-bat.c \ + packet-batadv.c \ + packet-bctp.c \ + packet-beep.c \ + packet-bencode.c \ + packet-ber.c \ + packet-bfcp.c \ + packet-bfd.c \ + packet-bgp.c \ + packet-bitcoin.c \ + packet-bittorrent.c \ + packet-bjnp.c \ + packet-bluecom.c \ + packet-bluetooth.c \ + packet-bmc.c \ + packet-bmp.c \ + packet-bofl.c \ + packet-bootp.c \ + packet-bootparams.c \ + packet-bpdu.c \ + packet-bpq.c \ + packet-brdwlk.c \ + packet-brp.c \ + packet-bssap.c \ + packet-bssgp.c \ + packet-bt-dht.c \ + packet-bt-utp.c \ + packet-bt3ds.c \ + packet-btamp.c \ + packet-btatt.c \ + packet-btbnep.c \ + packet-btbredr_rf.c \ + packet-btavctp.c \ + packet-btavdtp.c \ + packet-btavrcp.c \ + packet-bthci_acl.c \ + packet-bthci_cmd.c \ + packet-bthci_evt.c \ + packet-bthci_sco.c \ + packet-bthci_vendor.c \ + packet-bthcrp.c \ + packet-bthfp.c \ + packet-bthid.c \ + packet-bthsp.c \ + packet-btl2cap.c \ + packet-btle.c \ + packet-btle_rf.c \ + packet-btmcap.c \ + packet-btrfcomm.c \ + packet-btsap.c \ + packet-btsdp.c \ + packet-btsmp.c \ + packet-bvlc.c \ + packet-bzr.c \ + packet-c15ch.c \ + packet-calcappprotocol.c \ + packet-canopen.c \ + packet-capwap.c \ + packet-carp.c \ + packet-cast.c \ + packet-catapult-dct2000.c \ + packet-cattp.c \ + packet-cbor.c \ + packet-ccsds.c \ + packet-cdp.c \ + packet-cell_broadcast.c \ + packet-ceph.c \ + packet-cfdp.c \ + packet-cfm.c \ + packet-cgmp.c \ + packet-chargen.c \ + packet-chdlc.c \ + packet-cigi.c \ + packet-cimd.c \ + packet-cimetrics.c \ + packet-cip.c \ + packet-cipmotion.c \ + packet-cipsafety.c \ + packet-cisco-erspan.c \ + packet-cisco-fp-mim.c \ + packet-cisco-marker.c \ + packet-cisco-metadata.c \ + packet-cisco-oui.c \ + packet-cisco-sm.c \ + packet-cisco-ttag.c \ + packet-cisco-wids.c \ + packet-classicstun.c \ + packet-clearcase.c \ + packet-clip.c \ + packet-clique-rm.c \ + packet-clnp.c \ + packet-cmpp.c \ + packet-cnip.c \ + packet-coap.c \ + packet-collectd.c \ + packet-componentstatus.c \ + packet-cops.c \ + packet-corosync-totemnet.c \ + packet-corosync-totemsrp.c \ + packet-cosine.c \ + packet-couchbase.c \ + packet-cp2179.c \ + packet-cpfi.c \ + packet-cpha.c \ + packet-cql.c \ + packet-csm-encaps.c \ + packet-csn1.c \ + packet-ctdb.c \ + packet-cups.c \ + packet-daap.c \ + packet-data.c \ + packet-daytime.c \ + packet-db-lsp.c \ + packet-dbus.c \ + packet-dcc.c \ + packet-dccp.c \ + packet-dcerpc-bossvr.c \ + packet-dcerpc-browser.c \ + packet-dcerpc-cds_clerkserver.c \ + packet-dcerpc-cds_solicit.c \ + packet-dcerpc-conv.c \ + packet-dcerpc-cprpc_server.c \ + packet-dcerpc-dce122.c \ + packet-dcerpc-dtsprovider.c \ + packet-dcerpc-dtsstime_req.c \ + packet-dcerpc-epm.c \ + packet-dcerpc-fileexp.c \ + packet-dcerpc-fldb.c \ + packet-dcerpc-frsapi.c \ + packet-dcerpc-frsrpc.c \ + packet-dcerpc-ftserver.c \ + packet-dcerpc-icl_rpc.c \ + packet-dcerpc-krb5rpc.c \ + packet-dcerpc-llb.c \ + packet-dcerpc-messenger.c \ + packet-dcerpc-mgmt.c \ + packet-dcerpc-ndr.c \ + packet-dcerpc-netlogon.c \ + packet-dcerpc-pnp.c \ + packet-dcerpc-rdaclif.c \ + packet-dcerpc-rep_proc.c \ + packet-dcerpc-roverride.c \ + packet-dcerpc-rpriv.c \ + packet-dcerpc-rras.c \ + packet-dcerpc-rs_acct.c \ + packet-dcerpc-rs_attr.c \ + packet-dcerpc-rs_attr_schema.c \ + packet-dcerpc-rs_bind.c \ + packet-dcerpc-rs_misc.c \ + packet-dcerpc-rs_pgo.c \ + packet-dcerpc-rs_plcy.c \ + packet-dcerpc-rs_prop_acct.c \ + packet-dcerpc-rs_prop_acl.c \ + packet-dcerpc-rs_prop_attr.c \ + packet-dcerpc-rs_prop_pgo.c \ + packet-dcerpc-rs_prop_plcy.c \ + packet-dcerpc-rs_pwd_mgmt.c \ + packet-dcerpc-rs_repadm.c \ + packet-dcerpc-rs_replist.c \ + packet-dcerpc-rs_repmgr.c \ + packet-dcerpc-rs_unix.c \ + packet-dcerpc-rsec_login.c \ + packet-dcerpc-samr.c \ + packet-dcerpc-secidmap.c \ + packet-dcerpc-spoolss.c \ + packet-dcerpc-svcctl.c \ + packet-dcerpc-tapi.c \ + packet-dcerpc-tkn4int.c \ + packet-dcerpc-trksvr.c \ + packet-dcerpc-ubikdisk.c \ + packet-dcerpc-ubikvote.c \ + packet-dcerpc-update.c \ + packet-dcerpc.c \ + packet-dcm.c \ + packet-dcom-dispatch.c \ + packet-dcom-oxid.c \ + packet-dcom-remact.c \ + packet-dcom-remunkn.c \ + packet-dcom-sysact.c \ + packet-dcom.c \ + packet-dcp-etsi.c \ + packet-ddtp.c \ + packet-dec-bpdu.c \ + packet-dec-dnart.c \ + packet-dect.c \ + packet-devicenet.c \ + packet-dhcp-failover.c \ + packet-dhcpv6.c \ + packet-diameter.c \ + packet-diameter_3gpp.c \ + packet-diffserv-mpls-common.c \ + packet-dis.c \ + packet-distcc.c \ + packet-dji-uav.c \ + packet-dlm3.c \ + packet-dlsw.c \ + packet-dmp.c \ + packet-dmx.c \ + packet-dnp.c \ + packet-dns.c \ + packet-dof.c \ + packet-dplay.c \ + packet-dpnss-link.c \ + packet-dpnss.c \ + packet-drda.c \ + packet-dsi.c \ + packet-dsr.c \ + packet-dtcp-ip.c \ + packet-dtls.c \ + packet-dtn.c \ + packet-dtp.c \ + packet-dtpt.c \ + packet-dua.c \ + packet-dvb-ait.c \ + packet-dvb-bat.c \ + packet-dvb-data-mpe.c \ + packet-dvb-eit.c \ + packet-dvb-ipdc.c \ + packet-dvb-nit.c \ + packet-dvb-s2-bb.c \ + packet-dvb-sdt.c \ + packet-dvb-tdt.c \ + packet-dvb-tot.c \ + packet-dvbci.c \ + packet-dvmrp.c \ + packet-e100.c \ + packet-e164.c \ + packet-e212.c \ + packet-eap.c \ + packet-eapol.c \ + packet-echo.c \ + packet-ecmp.c \ + packet-ecp-oui.c \ + packet-edonkey.c \ + packet-egd.c \ + packet-ehdlc.c \ + packet-ehs.c \ + packet-eigrp.c \ + packet-eiss.c \ + packet-elasticsearch.c \ + packet-elcom.c \ + packet-elmi.c \ + packet-enc.c \ + packet-enip.c \ + packet-enrp.c \ + packet-enttec.c \ + packet-epl.c \ + packet-epl_v1.c \ + packet-epmd.c \ + packet-epon.c \ + packet-erf.c \ + packet-erldp.c \ + packet-esio.c \ + packet-esis.c \ + packet-etch.c \ + packet-eth.c \ + packet-etherip.c \ + packet-ethertype.c \ + packet-etsi_card_app_toolkit.c \ + packet-etv.c \ + packet-evrc.c \ + packet-exec.c \ + packet-exported_pdu.c \ + packet-extreme.c \ + packet-fc.c \ + packet-fcct.c \ + packet-fcdns.c \ + packet-fcels.c \ + packet-fcfcs.c \ + packet-fcfzs.c \ + packet-fcgi.c \ + packet-fcip.c \ + packet-fclctl.c \ + packet-fcoe.c \ + packet-fcoib.c \ + packet-fcp.c \ + packet-fcsb3.c \ + packet-fcsp.c \ + packet-fcswils.c \ + packet-fddi.c \ + packet-fefd.c \ + packet-ff.c \ + packet-finger.c \ + packet-fip.c \ + packet-fix.c \ + packet-flexnet.c \ + packet-flexray.c\ + packet-flip.c \ + packet-fmp.c \ + packet-fmp_notify.c \ + packet-fmtp.c \ + packet-force10-oui.c \ + packet-forces.c \ + packet-foundry.c \ + packet-fp_hint.c \ + packet-fr.c \ + packet-fractalgeneratorprotocol.c \ + packet-frame.c \ + packet-ftp.c \ + packet-fw1.c \ + packet-g723.c \ + packet-gadu-gadu.c \ + packet-gdb.c \ + packet-gdsdb.c \ + packet-gearman.c \ + packet-ged125.c \ + packet-geneve.c \ + packet-gfp.c \ + packet-gift.c \ + packet-giop.c \ + packet-git.c \ + packet-glbp.c \ + packet-gluster_cli.c \ + packet-gluster_pmap.c \ + packet-glusterd.c \ + packet-glusterfs.c \ + packet-glusterfs_hndsk.c \ + packet-gmhdr.c \ + packet-gmr1_bcch.c \ + packet-gmr1_common.c \ + packet-gmr1_dtap.c \ + packet-gmr1_rach.c \ + packet-gmr1_rr.c \ + packet-gmrp.c \ + packet-gnutella.c \ + packet-gopher.c \ + packet-gpef.c \ + packet-gprs-llc.c \ + packet-gprscdr.c \ + packet-gre.c \ + packet-gsm_a_bssmap.c \ + packet-gsm_a_common.c \ + packet-gsm_a_dtap.c \ + packet-gsm_a_gm.c \ + packet-gsm_a_rp.c \ + packet-gsm_a_rr.c \ + packet-gsm_abis_om2000.c \ + packet-gsm_abis_oml.c \ + packet-gsm_bsslap.c \ + packet-gsm_bssmap_le.c \ + packet-gsm_cbch.c \ + packet-gsm_ipa.c \ + packet-gsm_rlcmac.c \ + packet-gsm_sim.c \ + packet-gsm_sms.c \ + packet-gsm_sms_ud.c \ + packet-gsm_um.c \ + packet-gsmtap.c \ + packet-gssapi.c \ + packet-gtp.c \ + packet-gtpv2.c \ + packet-gvcp.c \ + packet-gvrp.c \ + packet-gvsp.c \ + packet-h1.c \ + packet-h221_nonstd.c \ + packet-h223.c \ + packet-h248_10.c \ + packet-h248_2.c \ + packet-h248_3gpp.c \ + packet-h248_7.c \ + packet-h248_annex_c.c \ + packet-h248_annex_e.c \ + packet-h248_q1950.c \ + packet-h261.c \ + packet-h263.c \ + packet-h263p.c \ + packet-h264.c \ + packet-hartip.c \ + packet-hazelcast.c \ + packet-hci_h1.c \ + packet-hci_h4.c \ + packet-hci_mon.c \ + packet-hci_usb.c \ + packet-hclnfsd.c \ + packet-hcrt.c \ + packet-hdcp.c \ + packet-hdcp2.c \ + packet-hdfs.c \ + packet-hdfsdata.c \ + packet-hdmi.c \ + packet-hip.c \ + packet-hiqnet.c \ + packet-hislip.c \ + packet-homeplug-av.c \ + packet-homeplug.c \ + packet-hp-erm.c \ + packet-hpext.c \ + packet-hpfeeds.c \ + packet-hpsw.c \ + packet-hpteam.c \ + packet-hsr-prp-supervision.c \ + packet-hsr.c \ + packet-hsrp.c \ + packet-http.c \ + packet-http2.c \ + packet-http-urlencoded.c \ + packet-hyperscsi.c \ + packet-i2c.c \ + packet-iana-oui.c \ + packet-iapp.c \ + packet-iax2.c \ + packet-icap.c \ + packet-icep.c \ + packet-icmp.c \ + packet-icmpv6.c \ + packet-icp.c \ + packet-icq.c \ + packet-idp.c \ + packet-idrp.c \ + packet-iec104.c \ + packet-ieee1722.c \ + packet-ieee17221.c \ + packet-ieee80211-netmon.c \ + packet-ieee80211-prism.c \ + packet-ieee80211-radio.c \ + packet-ieee80211-radiotap-iter.c\ + packet-ieee80211-radiotap.c \ + packet-ieee80211-wlancap.c \ + packet-ieee80211.c \ + packet-ieee802154.c \ + packet-ieee8021ah.c \ + packet-ieee8023.c \ + packet-ieee802a.c \ + packet-ifcp.c \ + packet-igap.c \ + packet-igmp.c \ + packet-igrp.c \ + packet-imap.c \ + packet-imf.c \ + packet-infiniband.c \ + packet-infiniband_sdp.c \ + packet-interlink.c \ + packet-ip.c \ + packet-ipars.c \ + packet-ipdc.c \ + packet-ipdr.c \ + packet-ipfc.c \ + packet-ipmi.c \ + packet-ipmi-app.c \ + packet-ipmi-bridge.c \ + packet-ipmi-chassis.c \ + packet-ipmi-picmg.c \ + packet-ipmi-se.c \ + packet-ipmi-session.c \ + packet-ipmi-storage.c \ + packet-ipmi-trace.c \ + packet-ipmi-transport.c \ + packet-ipmi-pps.c \ + packet-ipmi-update.c \ + packet-ipmi-vita.c \ + packet-ipnet.c \ + packet-ipoib.c \ + packet-ipos.c \ + packet-ipp.c \ + packet-ipsec-tcp.c \ + packet-ipsec-udp.c \ + packet-ipsec.c \ + packet-ipsi-ctl.c \ + packet-ipv6.c \ + packet-ipvs-syncd.c \ + packet-ipx.c \ + packet-ipxwan.c \ + packet-irc.c \ + packet-isakmp.c \ + packet-iscsi.c \ + packet-isdn.c \ + packet-iser.c \ + packet-isi.c \ + packet-isis-clv.c \ + packet-isis-hello.c \ + packet-isis-lsp.c \ + packet-isis-snp.c \ + packet-isis.c \ + packet-isl.c \ + packet-ismacryp.c \ + packet-ismp.c \ + packet-isns.c \ + packet-iso14443.c \ + packet-iso7816.c \ + packet-iso8583.c \ + packet-isup.c \ + packet-itdm.c \ + packet-iua.c \ + packet-iuup.c \ + packet-iwarp-ddp-rdmap.c\ + packet-iwarp-mpa.c \ + packet-ixiatrailer.c \ + packet-ixveriwave.c \ + packet-j1939.c \ + packet-jmirror.c \ + packet-jpeg.c \ + packet-json.c \ + packet-juniper.c \ + packet-jxta.c \ + packet-k12.c \ + packet-kadm5.c \ + packet-kafka.c \ + packet-kdp.c \ + packet-kdsp.c \ + packet-kerberos4.c \ + packet-kingfisher.c \ + packet-kink.c \ + packet-kismet.c \ + packet-klm.c \ + packet-knet.c \ + packet-knxnetip.c \ + packet-kpasswd.c \ + packet-kt.c \ + packet-l1-events.c \ + packet-l2tp.c \ + packet-lacp.c \ + packet-lanforge.c \ + packet-lapb.c \ + packet-lapbether.c \ + packet-lapd.c \ + packet-lapdm.c \ + packet-laplink.c \ + packet-lapsat.c \ + packet-lat.c \ + packet-lbm.c \ + packet-lbmc.c \ + packet-lbmpdm.c \ + packet-lbmpdmtcp.c \ + packet-lbmr.c \ + packet-lbtrm.c \ + packet-lbtru.c \ + packet-lbttcp.c \ + packet-ldp.c \ + packet-ldss.c \ + packet-lg8979.c \ + packet-lge_monitor.c \ + packet-link16.c \ + packet-linx.c \ + packet-lisp-data.c \ + packet-lisp-tcp.c \ + packet-lisp.c \ + packet-llc.c \ + packet-lldp.c \ + packet-llrp.c \ + packet-llt.c \ + packet-lltd.c \ + packet-lmi.c \ + packet-lmp.c \ + packet-logcat.c \ + packet-logcat-text.c \ + packet-lon.c \ + packet-loop.c \ + packet-lpd.c \ + packet-lsc.c \ + packet-ltp.c \ + packet-lwapp.c \ + packet-lwm.c \ + packet-lwm2mtlv.c \ + packet-lwres.c \ + packet-m2pa.c \ + packet-m2tp.c \ + packet-m2ua.c \ + packet-m3ua.c \ + packet-maap.c \ + packet-mac-lte-framed.c \ + packet-mac-lte.c \ + packet-maccontrol.c \ + packet-macsec.c \ + packet-mactelnet.c \ + packet-manolito.c \ + packet-marker.c \ + packet-mausb.c \ + packet-mbim.c \ + packet-mbtcp.c \ + packet-mcpe.c \ + packet-mdshdr.c \ + packet-media.c \ + packet-megaco.c \ + packet-memcache.c \ + packet-mesh.c \ + packet-meta.c \ + packet-metamako.c \ + packet-mgcp.c \ + packet-mih.c \ + packet-mikey.c \ + packet-mime-encap.c \ + packet-mint.c \ + packet-miop.c \ + packet-mip.c \ + packet-mip6.c \ + packet-mka.c \ + packet-mmse.c \ + packet-mndp.c \ + packet-mojito.c \ + packet-moldudp.c \ + packet-moldudp64.c \ + packet-mongo.c \ + packet-mount.c \ + packet-mp2t.c \ + packet-mp4ves.c \ + packet-mpeg-ca.c \ + packet-mpeg-descriptor.c \ + packet-mpeg-dsmcc.c \ + packet-mpeg-pat.c \ + packet-mpeg-pmt.c \ + packet-mpeg-sect.c \ + packet-mpeg1.c \ + packet-mpls-echo.c \ + packet-mpls-pm.c \ + packet-mpls-psc.c \ + packet-mplstp-oam.c \ + packet-mpls-y1711.c \ + packet-mpls.c \ + packet-mq-base.c \ + packet-mq-pcf.c \ + packet-mq.c \ + packet-mqtt.c \ + packet-mqtt-sn.c \ + packet-mrcpv2.c \ + packet-mrdisc.c \ + packet-mrp-mmrp.c \ + packet-mrp-msrp.c \ + packet-mrp-mvrp.c \ + packet-ms-mms.c \ + packet-msdp.c \ + packet-msn-messenger.c \ + packet-msnip.c \ + packet-msnlb.c \ + packet-msproxy.c \ + packet-msrp.c \ + packet-mstp.c \ + packet-mswsp.c \ + packet-mtp2.c \ + packet-mtp3.c \ + packet-mtp3mg.c \ + packet-multipart.c \ + packet-mux27010.c \ + packet-mysql.c \ + packet-nas_eps.c \ + packet-nasdaq-itch.c \ + packet-nasdaq-soup.c \ + packet-nat-pmp.c \ + packet-nb_rtpmux.c \ + packet-nbd.c \ + packet-nbipx.c \ + packet-nbt.c \ + packet-ncp-nmas.c \ + packet-ncp-sss.c \ + packet-ncp.c \ + packet-ncp2222.c \ + packet-ncs.c \ + packet-ndmp.c \ + packet-ndp.c \ + packet-ndps.c \ + packet-negoex.c \ + packet-netanalyzer.c \ + packet-netbios.c \ + packet-netdump.c \ + packet-netflow.c \ + packet-netlink-netfilter.c \ + packet-netlink-route.c \ + packet-netlink-sock_diag.c \ + packet-netlink.c \ + packet-netperfmeter.c \ + packet-netrom.c \ + packet-netsync.c \ + packet-nettl.c \ + packet-newmail.c \ + packet-nflog.c \ + packet-nfs.c \ + packet-nfsacl.c \ + packet-nfsauth.c \ + packet-nhrp.c \ + packet-nisplus.c \ + packet-nlm.c \ + packet-nlsp.c \ + packet-nntp.c \ + packet-noe.c \ + packet-nsip.c \ + packet-nsh.c \ + packet-nsrp.c \ + packet-nstrace.c \ + packet-nt-oui.c \ + packet-nt-tpcp.c \ + packet-ntlmssp.c \ + packet-ntp.c \ + packet-null.c \ + packet-nwmtp.c \ + packet-nwp.c \ + packet-oampdu.c \ + packet-obex.c \ + packet-ocfs2.c \ + packet-oicq.c \ + packet-oipf.c \ + packet-olsr.c \ + packet-omapi.c \ + packet-omron-fins.c \ + packet-opa.c \ + packet-opa-fe.c \ + packet-opa-mad.c \ + packet-opa-snc.c \ + packet-openflow.c \ + packet-openflow_v1.c \ + packet-openflow_v4.c \ + packet-openflow_v5.c \ + packet-opensafety.c \ + packet-openvpn.c \ + packet-openwire.c \ + packet-opsi.c \ + packet-optommp.c \ + packet-osc.c \ + packet-osi-options.c \ + packet-osi.c \ + packet-ositp.c \ + packet-ospf.c \ + packet-ossp.c \ + packet-ouch.c \ + packet-p_mul.c \ + packet-pathport.c \ + packet-packetbb.c \ + packet-packetlogger.c \ + packet-pagp.c \ + packet-paltalk.c \ + packet-pana.c \ + packet-pcap_pktdata.c \ + packet-pcapng_block.c \ + packet-pcep.c \ + packet-pcli.c \ + packet-pcnfsd.c \ + packet-pcp.c \ + packet-pdc.c \ + packet-pdcp-lte.c \ + packet-peekremote.c \ + packet-per.c \ + packet-pflog.c \ + packet-pgm.c \ + packet-pgsql.c \ + packet-pim.c \ + packet-pingpongprotocol.c \ + packet-pktap.c \ + packet-pktc.c \ + packet-pktgen.c \ + packet-pmproxy.c \ + packet-pnrp.c \ + packet-pop.c \ + packet-portmap.c \ + packet-ppcap.c \ + packet-ppi-antenna.c \ + packet-ppi-geolocation-common.c \ + packet-ppi-gps.c \ + packet-ppi-sensor.c \ + packet-ppi-vector.c \ + packet-ppi.c \ + packet-ppp.c \ + packet-pppoe.c \ + packet-pptp.c \ + packet-prp.c \ + packet-ptp.c \ + packet-ptpip.c \ + packet-pulse.c \ + packet-pvfs2.c \ + packet-pw-atm.c \ + packet-pw-cesopsn.c \ + packet-pw-common.c \ + packet-pw-eth.c \ + packet-pw-fr.c \ + packet-pw-hdlc.c \ + packet-pw-oam.c \ + packet-pw-satop.c \ + packet-q2931.c \ + packet-q708.c \ + packet-q931.c \ + packet-q933.c \ + packet-qllc.c \ + packet-qnet6.c \ + packet-quake.c \ + packet-quake2.c \ + packet-quake3.c \ + packet-quakeworld.c \ + packet-quic.c \ + packet-radius.c \ + packet-radius_packetcable.c \ + packet-raknet.c \ + packet-raw.c \ + packet-rdm.c \ + packet-rdp.c \ + packet-rdt.c \ + packet-redback.c \ + packet-redbackli.c \ + packet-reload-framing.c \ + packet-reload.c \ + packet-retix-bpdu.c \ + packet-rfc2190.c \ + packet-rfid-felica.c \ + packet-rfid-mifare.c \ + packet-rfid-pn532.c \ + packet-rfid-pn532-hci.c \ + packet-rgmp.c \ + packet-riemann.c \ + packet-rip.c \ + packet-ripng.c \ + packet-rlc-lte.c \ + packet-rlc.c \ + packet-rlm.c \ + packet-rlogin.c \ + packet-rmcp.c \ + packet-rmi.c \ + packet-rmp.c \ + packet-rmt-alc.c \ + packet-rmt-fec.c \ + packet-rmt-lct.c \ + packet-rmt-norm.c \ + packet-rohc.c \ + packet-roofnet.c \ + packet-rpc.c \ + packet-rpcap.c \ + packet-rpcrdma.c \ + packet-rpki-rtr.c \ + packet-rpl.c \ + packet-rquota.c \ + packet-rsh.c \ + packet-rsip.c \ + packet-rsl.c \ + packet-rstat.c \ + packet-rsvd.c \ + packet-rsvp.c \ + packet-rsync.c \ + packet-rtacser.c \ + packet-rtcdc.c \ + packet-rtcp.c \ + packet-rtitcp.c \ + packet-rtls.c \ + packet-rtmpt.c \ + packet-rtnet.c \ + packet-rtp-events.c \ + packet-rtp-midi.c \ + packet-rtp.c \ + packet-rtpproxy.c \ + packet-rtps.c \ + packet-rtsp.c \ + packet-rudp.c \ + packet-rwall.c \ + packet-rx.c \ + packet-s5066sis.c \ + packet-s5066dts.c \ + packet-s7comm.c \ + packet-s7comm_szl_ids.c \ + packet-sadmind.c \ + packet-sametime.c \ + packet-sap.c \ + packet-sasp.c \ + packet-sbus.c \ + packet-sbc.c \ + packet-sccp.c \ + packet-sccpmg.c \ + packet-scop.c \ + packet-scriptingservice.c \ + packet-scsi-mmc.c \ + packet-scsi-osd.c \ + packet-scsi-sbc.c \ + packet-scsi-smc.c \ + packet-scsi-ssc.c \ + packet-scsi.c \ + packet-sctp.c \ + packet-sdh.c \ + packet-sdlc.c \ + packet-sdp.c \ + packet-sebek.c \ + packet-selfm.c \ + packet-sercosiii.c \ + packet-ses.c \ + packet-sflow.c \ + packet-sgsap.c \ + packet-sigcomp.c \ + packet-simple.c \ + packet-simulcrypt.c \ + packet-sip.c \ + packet-sipfrag.c \ + packet-sita.c \ + packet-skinny.c \ + packet-skype.c \ + packet-slimp3.c \ + packet-sll.c \ + packet-slowprotocols.c \ + packet-slsk.c \ + packet-smb-browse.c \ + packet-smb-common.c \ + packet-smb-logon.c \ + packet-smb-mailslot.c \ + packet-smb-pipe.c \ + packet-smb-sidsnooping.c \ + packet-smb-direct.c \ + packet-smb.c \ + packet-smb2.c \ + packet-smcr.c \ + packet-sml.c \ + packet-smpp.c \ + packet-smtp.c \ + packet-sna.c \ + packet-snaeth.c \ + packet-sndcp-xid.c \ + packet-sndcp.c \ + packet-socketcan.c \ + packet-socks.c \ + packet-soupbintcp.c \ + packet-spdy.c \ + packet-spice.c \ + packet-spp.c \ + packet-spray.c \ + packet-sprt.c \ + packet-srp.c \ + packet-srvloc.c \ + packet-sscf-nni.c \ + packet-sscop.c \ + packet-ssh.c \ + packet-ssl-utils.c \ + packet-ssl.c \ + packet-sstp.c \ + packet-stanag4607.c \ + packet-starteam.c \ + packet-stat-notify.c \ + packet-stat.c \ + packet-stt.c \ + packet-stun.c \ + packet-sua.c \ + packet-swipe.c \ + packet-symantec.c \ + packet-sync.c \ + packet-synergy.c \ + packet-synphasor.c \ + packet-sysdig-event.c \ + packet-sysex.c \ + packet-syslog.c \ + packet-t30.c \ + packet-tacacs.c \ + packet-tali.c \ + packet-tapa.c \ + packet-tcp.c \ + packet-tcpros.c \ + packet-tdmoe.c \ + packet-tdmop.c \ + packet-tds.c \ + packet-teamspeak2.c \ + packet-teimanagement.c \ + packet-teklink.c \ + packet-telkonet.c \ + packet-telnet.c \ + packet-teredo.c \ + packet-text-media.c \ + packet-tfp.c \ + packet-tftp.c \ + packet-thrift.c \ + packet-time.c \ + packet-tipc.c \ + packet-tivoconnect.c \ + packet-tn3270.c \ + packet-tn5250.c \ + packet-tnef.c \ + packet-tns.c \ + packet-tpkt.c \ + packet-tpncp.c \ + packet-tr.c \ + packet-trill.c \ + packet-trmac.c \ + packet-tsp.c \ + packet-tte-pcf.c \ + packet-tte.c \ + packet-turbocell.c \ + packet-turnchannel.c \ + packet-tuxedo.c \ + packet-tzsp.c \ + packet-u3v.c \ + packet-ua.c \ + packet-ua3g.c \ + packet-uasip.c \ + packet-uaudp.c \ + packet-ubertooth.c \ + packet-ucp.c \ + packet-udld.c \ + packet-udp.c \ + packet-udt.c \ + packet-uhd.c \ + packet-uma.c \ + packet-umts_fp.c \ + packet-umts_mac.c \ + packet-usb-audio.c \ + packet-usb-ccid.c \ + packet-usb-com.c \ + packet-usb-dfu.c \ + packet-usb-hid.c \ + packet-usb-hub.c \ + packet-usb-masstorage.c \ + packet-usb-video.c \ + packet-usb.c \ + packet-usbip.c \ + packet-user_encap.c \ + packet-userlog.c \ + packet-uts.c \ + packet-v120.c \ + packet-v150fw.c \ + packet-v52.c \ + packet-v5dl.c \ + packet-v5ef.c \ + packet-v5ua.c \ + packet-vcdu.c \ + packet-vicp.c \ + packet-vines.c \ + packet-vlan.c \ + packet-vmlab.c \ + packet-vnc.c \ + packet-vntag.c \ + packet-vp8.c \ + packet-vrrp.c \ + packet-vrt.c \ + packet-vsip.c \ + packet-vssmonitoring.c \ + packet-vtp.c \ + packet-vuze-dht.c \ + packet-vxi11.c \ + packet-vxlan.c \ + packet-wai.c \ + packet-wap.c \ + packet-wassp.c \ + packet-waveagent.c \ + packet-wbxml.c \ + packet-wccp.c \ + packet-wcp.c \ + packet-websocket.c \ + packet-wfleet-hdlc.c \ + packet-who.c \ + packet-whois.c \ + packet-wifi-display.c \ + packet-wifi-p2p.c \ + packet-windows-common.c \ + packet-winsrepl.c \ + packet-wlccp.c \ + packet-wol.c \ + packet-wow.c \ + packet-wps.c \ + packet-wreth.c \ + packet-wsmp.c \ + packet-wsp.c \ + packet-wtls.c \ + packet-wtp.c \ + packet-x11.c \ + packet-x25.c \ + packet-x29.c \ + packet-xcsl.c \ + packet-xdmcp.c \ + packet-xip.c \ + packet-xip-serval.c \ + packet-xmcp.c \ + packet-xml.c \ + packet-xmpp-conference.c \ + packet-xmpp-core.c \ + packet-xmpp-gtalk.c \ + packet-xmpp-jingle.c \ + packet-xmpp-other.c \ + packet-xmpp-utils.c \ + packet-xmpp.c \ + packet-xot.c \ + packet-xtp.c \ + packet-xyplex.c \ + packet-yami.c \ + packet-yhoo.c \ + packet-ymsg.c \ + packet-ypbind.c \ + packet-yppasswd.c \ + packet-ypserv.c \ + packet-ypxfr.c \ + packet-zbee-aps.c \ + packet-zbee-nwk.c \ + packet-zbee-nwk-gp.c \ + packet-zbee-security.c \ + packet-zbee-zcl.c \ + packet-zbee-zcl-closures.c \ + packet-zbee-zcl-general.c \ + packet-zbee-zcl-ha.c \ + packet-zbee-zcl-hvac.c \ + packet-zbee-zcl-lighting.c \ + packet-zbee-zcl-meas-sensing.c \ + packet-zbee-zcl-misc.c \ + packet-zbee-zcl-sas.c \ + packet-zbee-zcl-se.c \ + packet-zbee-zdp.c \ + packet-zbee-zdp-binding.c \ + packet-zbee-zdp-discovery.c \ + packet-zbee-zdp-management.c \ + packet-zebra.c \ + packet-zep.c \ + packet-ziop.c \ + packet-zrtp.c \ + packet-zvt.c \ + $(CUSTOM_DISSECTOR_SRC) + +# +# Headers for file dissectors. +# +FILE_DISSECTOR_INCLUDES = \ + file-file.h + +# +# Headers for dissectors. +# +DISSECTOR_INCLUDES = \ + $(PIDL_DISSECTOR_INCLUDES) \ + packet-6lowpan.h \ + packet-a21.h \ + packet-acp133.h \ + packet-acse.h \ + packet-actrace.h \ + packet-adb_service.h \ + packet-afp.h \ + packet-aim.h \ + packet-alcap.h \ + packet-ansi_a.h \ + packet-ansi_map.h \ + packet-ansi_tcap.h \ + packet-arp.h \ + packet-atalk.h \ + packet-atm.h \ + packet-atn-ulcs.h \ + packet-ax25.h \ + packet-bacapp.h \ + packet-ber.h \ + packet-bfd.h \ + packet-bgp.h \ + packet-bluetooth.h \ + packet-bssap.h \ + packet-bssgp.h \ + packet-btatt.h \ + packet-btavctp.h \ + packet-btavdtp.h \ + packet-btavrcp.h \ + packet-bthci_acl.h \ + packet-bthci_cmd.h \ + packet-bthci_evt.h \ + packet-bthci_sco.h \ + packet-btl2cap.h \ + packet-btle.h \ + packet-btrfcomm.h \ + packet-btsdp.h \ + packet-c1222.h \ + packet-camel.h \ + packet-cdt.h \ + packet-cell_broadcast.h \ + packet-charging_ase.h \ + packet-chdlc.h \ + packet-cip.h \ + packet-cipsafety.h \ + packet-clearcase.h \ + packet-cmip.h \ + packet-cmp.h \ + packet-cms.h \ + packet-credssp.h \ + packet-crmf.h \ + packet-csn1.h \ + packet-dap.h \ + packet-dcc.h \ + packet-dccp.h \ + packet-dcerpc.h \ + packet-dcerpc-browser.h \ + packet-dcerpc-budb.h \ + packet-dcerpc-butc.h \ + packet-dcerpc-dce122.h \ + packet-dcerpc-dcom.h \ + packet-dcerpc-dnsserver.h \ + packet-dcerpc-drsuapi.h \ + packet-dcerpc-frsapi.h \ + packet-dcerpc-frsrpc.h \ + packet-dcerpc-netlogon.h \ + packet-dcerpc-nt.h \ + packet-dcerpc-pnp.h \ + packet-dcerpc-rras.h \ + packet-dcerpc-samr.h \ + packet-dcerpc-spoolss.h \ + packet-dcerpc-svcctl.h \ + packet-dcerpc-tapi.h \ + packet-dcom.h \ + packet-dcom-dispatch.h \ + packet-dcm.h \ + packet-diameter.h \ + packet-diffserv-mpls-common.h \ + packet-disp.h \ + packet-dns.h \ + packet-dop.h \ + packet-dsp.h \ + packet-dtls.h \ + packet-dtn.h \ + packet-dvbci.h \ + packet-enip.h \ + packet-erf.h \ + packet-e164.h \ + packet-e212.h \ + packet-edonkey.h \ + packet-epmd.h \ + packet-ess.h \ + packet-eth.h \ + packet-fc.h \ + packet-fcbls.h \ + packet-fcct.h \ + packet-fcels.h \ + packet-fcfcs.h \ + packet-fcfzs.h \ + packet-fclctl.h \ + packet-fcp.h \ + packet-fcsb3.h \ + packet-fcswils.h \ + packet-ff.h \ + packet-fix.h \ + packet-fmp.h \ + packet-frame.h \ + packet-ftam.h \ + packet-giop.h \ + packet-gluster.h \ + packet-gmr1_common.h \ + packet-gmr1_rr.h \ + packet-gnutella.h \ + packet-gprscdr.h \ + packet-gre.h \ + packet-gsm_a_common.h \ + packet-gsm_a_rr.h \ + packet-gsm_map.h \ + packet-gsm_rlcmac.h \ + packet-gsm_sms.h \ + packet-gssapi.h \ + packet-gtp.h \ + packet-gtpv2.h \ + packet-h223.h \ + packet-h225.h \ + packet-h235.h \ + packet-h245.h \ + packet-h248.h \ + packet-h263.h \ + packet-h264.h \ + packet-h323.h \ + packet-h450-ros.h \ + packet-hpext.h \ + packet-http.h \ + packet-iana-oui.h \ + packet-iax2.h \ + packet-icmp.h \ + packet-idmp.h \ + packet-idp.h \ + packet-ieee80211.h \ + packet-ieee80211-radiotap-iter.h \ + packet-ieee80211-radiotap-defs.h \ + packet-ieee802154.h \ + packet-ieee8023.h \ + packet-ieee802a.h \ + packet-igmp.h \ + packet-imf.h \ + packet-inap.h \ + packet-infiniband.h \ + packet-ip.h \ + packet-ipmi.h \ + packet-ipsec.h \ + packet-ipv6.h \ + packet-ipx.h \ + packet-isakmp.h \ + packet-isis.h \ + packet-isis-clv.h \ + packet-isl.h \ + packet-isup.h \ + packet-iwarp-ddp-rdmap.h \ + packet-juniper.h \ + packet-jxta.h \ + packet-kerberos.h \ + packet-klm.h \ + packet-l2tp.h \ + packet-lbm.h \ + packet-lbtrm.h \ + packet-lbtru.h \ + packet-lbttcp.h \ + packet-ldap.h \ + packet-lcsap.h \ + packet-ldp.h \ + packet-link16.h \ + packet-llc.h \ + packet-logotypecertextn.h \ + packet-lpp.h \ + packet-lte-rrc.h \ + packet-mac-lte.h \ + packet-mausb.h \ + packet-mbim.h \ + packet-mbtcp.h \ + packet-mgcp.h \ + packet-mms.h \ + packet-mount.h \ + packet-mp4ves.h \ + packet-mpeg-descriptor.h \ + packet-mpeg-pmt.h \ + packet-mpeg-sect.h \ + packet-mpls.h \ + packet-mq.h \ + packet-msrp.h \ + packet-mstp.h \ + packet-mtp3.h \ + packet-nbap.h \ + packet-ncp-int.h \ + packet-ncp-nmas.h \ + packet-ncp-sss.h \ + packet-ndmp.h \ + packet-ndps.h \ + packet-netbios.h \ + packet-netlink.h \ + packet-nfs.h \ + packet-nisplus.h \ + packet-nlm.h \ + packet-ntlmssp.h \ + packet-ntp.h \ + packet-ocsp.h \ + packet-opensafety.h \ + packet-osi.h \ + packet-osi-options.h \ + packet-p1.h \ + packet-p22.h \ + packet-p7.h \ + packet-p772.h \ + packet-pcap_pktdata.h \ + packet-pcnfsd.h \ + packet-pdcp-lte.h \ + packet-per.h \ + packet-pkcs1.h \ + packet-pkcs12.h \ + packet-pkix1explicit.h \ + packet-pkix1implicit.h \ + packet-pkixac.h \ + packet-pkixproxy.h \ + packet-pkixqualified.h \ + packet-pkixtsp.h \ + packet-pkinit.h \ + packet-pktc.h \ + packet-portmap.h \ + packet-ppi-geolocation-common.h \ + packet-ppp.h \ + packet-pres.h \ + packet-ptpip.h \ + packet-pw-atm.h \ + packet-pw-common.h \ + packet-q708.h \ + packet-q931.h \ + packet-q932.h \ + packet-qsig.h \ + packet-radius.h \ + packet-ranap.h \ + packet-rdm.h \ + packet-rdt.h \ + packet-reload.h \ + packet-rlc.h \ + packet-rlc-lte.h \ + packet-rmi.h \ + packet-rmt-common.h \ + packet-rohc.h \ + packet-ros.h \ + packet-rpc.h \ + packet-rquota.h \ + packet-rrc.h \ + packet-rsvp.h \ + packet-rtcp.h \ + packet-rtp.h \ + packet-rtps.h \ + packet-rtp-events.h \ + packet-rtse.h \ + packet-rtsp.h \ + packet-rwall.h \ + packet-rx.h \ + packet-s1ap.h \ + packet-s5066sis.h \ + packet-s7comm.h \ + packet-s7comm_szl_ids.h \ + packet-sccp.h \ + packet-scsi.h \ + packet-scsi-mmc.h \ + packet-scsi-osd.h \ + packet-scsi-sbc.h \ + packet-scsi-smc.h \ + packet-scsi-ssc.h \ + packet-sctp.h \ + packet-sdp.h \ + packet-ses.h \ + packet-sflow.h \ + packet-sip.h \ + packet-skinny.h \ + packet-sll.h \ + packet-smb.h \ + packet-smb2.h \ + packet-smb-browse.h \ + packet-smb-common.h \ + packet-smb-mailslot.h \ + packet-smb-pipe.h \ + packet-smb-sidsnooping.h \ + packet-smpp.h \ + packet-smrse.h \ + packet-snmp.h \ + packet-spice.h \ + packet-spray.h \ + packet-sprt.h \ + packet-sscop.h \ + packet-ssl.h \ + packet-ssl-utils.h \ + packet-stat.h \ + packet-stat-notify.h \ + packet-sv.h \ + packet-t124.h \ + packet-t30.h \ + packet-t38.h \ + packet-tacacs.h \ + packet-tcap.h \ + packet-tcp.h \ + packet-tetra.h \ + packet-tftp.h \ + packet-tn3270.h \ + packet-tn5250.h \ + packet-tns.h \ + packet-tpkt.h \ + packet-tr.h \ + packet-tte.h \ + packet-ua.h \ + packet-uaudp.h \ + packet-ubertooth.h \ + packet-udp.h \ + packet-umts_fp.h \ + packet-umts_mac.h \ + packet-usb.h \ + packet-usb-hid.h \ + packet-usbip.h \ + packet-wap.h \ + packet-wccp.h \ + packet-windows-common.h \ + packet-wlancertextn.h \ + packet-wps.h \ + packet-wsp.h \ + packet-wtls.h \ + packet-wtp.h \ + packet-x11.h \ + packet-x11-keysymdef.h \ + x11-keysym.h \ + x11-declarations.h \ + x11-register-info.h \ + x11-extension-implementation.h \ + x11-extension-errors.h \ + x11-glx-render-enum.h \ + x11-enum.h \ + packet-x509af.h \ + packet-x509ce.h \ + packet-x509if.h \ + packet-x509sat.h \ + packet-xml.h \ + packet-xmpp-conference.h \ + packet-xmpp-core.h \ + packet-xmpp-gtalk.h \ + packet-xmpp.h \ + packet-xmpp-jingle.h \ + packet-xmpp-other.h \ + packet-xmpp-utils.h \ + packet-ypbind.h \ + packet-yppasswd.h \ + packet-ypserv.h \ + packet-ypxfr.h \ + packet-zbee.h \ + packet-zbee-aps.h \ + packet-zbee-nwk.h \ + packet-zbee-security.h \ + packet-zbee-zcl.h \ + packet-zbee-zdp.h \ + packet-zep.h \ + packet-ziop.h \ + $(GENERATED_HEADER_FILES) \ + $(CUSTOM_HEADER_FILES) + +# Dissector helpers. They're included in the source files in this +# directory, but they're not dissectors themselves, i.e. they're not +# used to generate "register.c"). +DISSECTOR_SUPPORT_SRC = \ + packet-dcerpc-nt.c \ + usb.c \ + register.c + +ALL_DISSECTORS_SRC = \ + $(DISSECTOR_SRC) \ + $(FILE_DISSECTOR_SRC) \ + $(PIDL_DISSECTOR_SRC) \ + $(ASN1_DISSECTOR_SRC) \ + $(DIRTY_ASN1_DISSECTOR_SRC) \ + $(CORBA_IDL_DISSECTOR_SRC) \ + $(DIRTY_CORBA_IDL_DISSECTOR_SRC) + noinst_LTLIBRARIES = libdirtydissectors.la libfiledissectors.la libdissectors.la libdirtydissectors_la_SOURCES = \ @@ -42,6 +1828,11 @@ libdissectors_la_SOURCES = \ $(PIDL_DISSECTOR_SRC) \ $(DISSECTOR_SUPPORT_SRC) +# this target needed for distribution only +noinst_HEADERS = \ + $(DISSECTOR_INCLUDES) \ + $(FILE_DISSECTOR_INCLUDES) + # include asn1 in the source tarball. But nothing to build... DIST_SUBDIRS = asn1 dcerpc @@ -50,7 +1841,6 @@ SUBDIRS = dcerpc EXTRA_DIST = \ .editorconfig \ Custom.common \ - Makefile.common \ packet-ncp2222.inc \ README.X11 \ x11-fields \ @@ -95,7 +1885,7 @@ x11-dissector: $(top_srcdir)/tools/process-x11-fields.pl $(srcdir)/x11-fields $( # a register.c file for libwireshark. # All subsequent arguments are the files to scan. # -register.c: $(plugin_src) $(ALL_DISSECTORS_SRC) Makefile.common Custom.common \ +register.c: $(plugin_src) $(ALL_DISSECTORS_SRC) Custom.common \ $(top_srcdir)/tools/make-dissector-reg.py @echo Making register.c ; \ $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common deleted file mode 100644 index f30404fd85..0000000000 --- a/epan/dissectors/Makefile.common +++ /dev/null @@ -1,1814 +0,0 @@ -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -include Custom.common - -# "BUILT_SOURCES" are built before any "make all" or "make check" targets. -BUILT_C_FILES = \ - register.c - -BUILT_SOURCES = $(BUILT_C_FILES) $(BUILT_HEADER_FILES) - -# Header files generated from source files. -GENERATED_HEADER_FILES = \ - $(BUILT_HEADER_FILES) - -# C source files generated from source files. -GENERATED_C_FILES = \ - $(BUILT_C_FILES) \ - packet-ncp2222.c - -# All the generated files. -GENERATED_FILES = $(GENERATED_HEADER_FILES) $(GENERATED_C_FILES) - -# -# PIDL-generated DCE RPC dissectors without warnings. -# -PIDL_DISSECTOR_SRC = \ - packet-dcerpc-atsvc.c \ - packet-dcerpc-budb.c \ - packet-dcerpc-butc.c \ - packet-dcerpc-dfs.c \ - packet-dcerpc-dnsserver.c \ - packet-dcerpc-drsuapi.c \ - packet-dcerpc-dssetup.c \ - packet-dcerpc-efs.c \ - packet-dcerpc-eventlog.c \ - packet-dcerpc-frstrans.c \ - packet-dcerpc-initshutdown.c \ - packet-dcerpc-lsa.c \ - packet-dcerpc-mapi.c \ - packet-dcerpc-mdssvc.c \ - packet-dcerpc-misc.c \ - packet-dcerpc-nspi.c \ - packet-dcerpc-rfr.c \ - packet-dcerpc-srvsvc.c \ - packet-dcerpc-winreg.c \ - packet-dcerpc-witness.c \ - packet-dcerpc-wkssvc.c \ - packet-dcerpc-wzcsvc.c - -# -# Headers for PIDL-generated dissectors. -# -PIDL_DISSECTOR_INCLUDES = \ - packet-dcerpc-atsvc.h \ - packet-dcerpc-dfs.h \ - packet-dcerpc-dssetup.h \ - packet-dcerpc-efs.h \ - packet-dcerpc-eventlog.h \ - packet-dcerpc-initshutdown.h \ - packet-dcerpc-lsa.h \ - packet-dcerpc-mapi.h \ - packet-dcerpc-mdssvc.h \ - packet-dcerpc-misc.h \ - packet-dcerpc-nspi.h \ - packet-dcerpc-rfr.h \ - packet-dcerpc-srvsvc.h \ - packet-dcerpc-winreg.h \ - packet-dcerpc-witness.h \ - packet-dcerpc-wkssvc.h \ - packet-dcerpc-wzcsvc.h \ - packet-dcerpc-frstrans.h - -# -# asn2wrs-generated ASN.1 dissectors without warnings. -# -ASN1_DISSECTOR_SRC = \ - packet-ansi_map.c \ - packet-acp133.c \ - packet-acse.c \ - packet-ansi_tcap.c \ - packet-atn-ulcs.c \ - packet-atn-cm.c \ - packet-atn-cpdlc.c \ - packet-c1222.c \ - packet-camel.c \ - packet-cdt.c \ - packet-charging_ase.c \ - packet-cmip.c \ - packet-cmp.c \ - packet-cms.c \ - packet-credssp.c \ - packet-crmf.c \ - packet-dap.c \ - packet-disp.c \ - packet-dop.c \ - packet-dsp.c \ - packet-ecp.c \ - packet-ess.c \ - packet-ftam.c \ - packet-goose.c \ - packet-gsm_map.c \ - packet-HI2Operations.c \ - packet-h225.c \ - packet-h235.c \ - packet-h245.c \ - packet-h248.c \ - packet-h282.c \ - packet-h283.c \ - packet-h323.c \ - packet-h450.c \ - packet-h450-ros.c \ - packet-h460.c \ - packet-h501.c \ - packet-hnbap.c \ - packet-idmp.c \ - packet-ilp.c \ - packet-inap.c \ - packet-isdn-sup.c \ - packet-kerberos.c \ - packet-lcsap.c \ - packet-ldap.c \ - packet-logotypecertextn.c \ - packet-lpp.c \ - packet-lppa.c \ - packet-lppe.c \ - packet-lte-rrc.c \ - packet-m3ap.c \ - packet-mms.c \ - packet-mpeg-audio.c \ - packet-mpeg-pes.c \ - packet-nbap.c \ - packet-novell_pkis.c \ - packet-ns_cert_exts.c \ - packet-ocsp.c \ - packet-p1.c \ - packet-p22.c \ - packet-p7.c \ - packet-p772.c \ - packet-pcap.c \ - packet-pkcs1.c \ - packet-pkcs12.c \ - packet-pkinit.c \ - packet-pkix1explicit.c \ - packet-pkix1implicit.c \ - packet-pkixac.c \ - packet-pkixproxy.c \ - packet-pkixqualified.c \ - packet-pkixtsp.c \ - packet-pres.c \ - packet-q932.c \ - packet-q932-ros.c \ - packet-qsig.c \ - packet-ranap.c \ - packet-rnsap.c \ - packet-ros.c \ - packet-rrc.c \ - packet-rrlp.c \ - packet-rtse.c \ - packet-rua.c \ - packet-s1ap.c \ - packet-sabp.c \ - packet-sbc-ap.c \ - packet-smrse.c \ - packet-snmp.c \ - packet-spnego.c \ - packet-sv.c \ - packet-t124.c \ - packet-t125.c \ - packet-t38.c \ - packet-tcap.c \ - packet-tetra.c \ - packet-ulp.c \ - packet-wlancertextn.c \ - packet-x2ap.c \ - packet-x509af.c \ - packet-x509ce.c \ - packet-x509if.c \ - packet-x509sat.c - -# -# idl2wrs-generated CORBA IDL dissectors without warnings. -# -CORBA_IDL_DISSECTOR_SRC = \ - packet-coseventcomm.c - -# -# asn2wrs-generated ASN.1 dissectors with warnings. -# -DIRTY_ASN1_DISSECTOR_SRC = \ - $(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC) - -# -# idl2wrs-generated CORBA IDL dissectors with warnings. -# -DIRTY_CORBA_IDL_DISSECTOR_SRC = \ - packet-cosnaming.c \ - packet-gias.c \ - packet-parlay.c \ - packet-tango.c - -FILE_DISSECTOR_SRC = \ - file-btsnoop.c \ - file-elf.c \ - file-file.c \ - file-gif.c \ - file-jpeg.c \ - file-mp4.c \ - file-pcap.c \ - file-pcapng.c \ - file-png.c -# -# Dissectors without warnings. -# -DISSECTOR_SRC = \ - packet-2dparityfec.c \ - packet-3com-njack.c \ - packet-3com-xns.c \ - packet-3g-a11.c \ - packet-6lowpan.c \ - packet-9p.c \ - packet-a21.c \ - packet-aarp.c \ - packet-aastra-aasp.c \ - packet-acap.c \ - packet-acn.c \ - packet-acr122.c \ - packet-actrace.c \ - packet-adb.c \ - packet-adb_cs.c \ - packet-adb_service.c \ - packet-adwin-config.c \ - packet-adwin.c \ - packet-aeron.c \ - packet-afp.c \ - packet-afs.c \ - packet-agentx.c \ - packet-aim-admin.c \ - packet-aim-adverts.c \ - packet-aim-bos.c \ - packet-aim-buddylist.c \ - packet-aim-chat.c \ - packet-aim-chatnav.c \ - packet-aim-directory.c \ - packet-aim-email.c \ - packet-aim-generic.c \ - packet-aim-icq.c \ - packet-aim-invitation.c \ - packet-aim-location.c \ - packet-aim-messaging.c \ - packet-aim-oft.c \ - packet-aim-popup.c \ - packet-aim-signon.c \ - packet-aim-ssi.c \ - packet-aim-sst.c \ - packet-aim-stats.c \ - packet-aim-translate.c \ - packet-aim-userlookup.c \ - packet-aim.c \ - packet-ajp13.c \ - packet-alcap.c \ - packet-alljoyn.c \ - packet-amqp.c \ - packet-amr.c \ - packet-ancp.c \ - packet-ans.c \ - packet-ansi_637.c \ - packet-ansi_683.c \ - packet-ansi_801.c \ - packet-ansi_a.c \ - packet-aodv.c \ - packet-aoe.c \ - packet-aol.c \ - packet-ap1394.c \ - packet-app-pkix-cert.c \ - packet-applemidi.c \ - packet-aprs.c \ - packet-arcnet.c \ - packet-armagetronad.c \ - packet-arp.c \ - packet-artnet.c \ - packet-aruba-adp.c \ - packet-aruba-erm.c \ - packet-aruba-iap.c \ - packet-aruba-papi.c \ - packet-ar_drone.c \ - packet-asap.c \ - packet-ascend.c \ - packet-asf.c \ - packet-assa_r3.c \ - packet-asterix.c \ - packet-at.c \ - packet-atalk.c \ - packet-ath.c \ - packet-atm.c \ - packet-atmtcp.c \ - packet-auto_rp.c \ - packet-ax25.c \ - packet-ax25-kiss.c \ - packet-ax25-nol3.c \ - packet-ax4000.c \ - packet-ayiya.c \ - packet-babel.c \ - packet-bacapp.c \ - packet-bacnet.c \ - packet-banana.c \ - packet-bat.c \ - packet-batadv.c \ - packet-bctp.c \ - packet-beep.c \ - packet-bencode.c \ - packet-ber.c \ - packet-bfcp.c \ - packet-bfd.c \ - packet-bgp.c \ - packet-bitcoin.c \ - packet-bittorrent.c \ - packet-bjnp.c \ - packet-bluecom.c \ - packet-bluetooth.c \ - packet-bmc.c \ - packet-bmp.c \ - packet-bofl.c \ - packet-bootp.c \ - packet-bootparams.c \ - packet-bpdu.c \ - packet-bpq.c \ - packet-brdwlk.c \ - packet-brp.c \ - packet-bssap.c \ - packet-bssgp.c \ - packet-bt-dht.c \ - packet-bt-utp.c \ - packet-bt3ds.c \ - packet-btamp.c \ - packet-btatt.c \ - packet-btbnep.c \ - packet-btbredr_rf.c \ - packet-btavctp.c \ - packet-btavdtp.c \ - packet-btavrcp.c \ - packet-bthci_acl.c \ - packet-bthci_cmd.c \ - packet-bthci_evt.c \ - packet-bthci_sco.c \ - packet-bthci_vendor.c \ - packet-bthcrp.c \ - packet-bthfp.c \ - packet-bthid.c \ - packet-bthsp.c \ - packet-btl2cap.c \ - packet-btle.c \ - packet-btle_rf.c \ - packet-btmcap.c \ - packet-btrfcomm.c \ - packet-btsap.c \ - packet-btsdp.c \ - packet-btsmp.c \ - packet-bvlc.c \ - packet-bzr.c \ - packet-c15ch.c \ - packet-calcappprotocol.c \ - packet-canopen.c \ - packet-capwap.c \ - packet-carp.c \ - packet-cast.c \ - packet-catapult-dct2000.c \ - packet-cattp.c \ - packet-cbor.c \ - packet-ccsds.c \ - packet-cdp.c \ - packet-cell_broadcast.c \ - packet-ceph.c \ - packet-cfdp.c \ - packet-cfm.c \ - packet-cgmp.c \ - packet-chargen.c \ - packet-chdlc.c \ - packet-cigi.c \ - packet-cimd.c \ - packet-cimetrics.c \ - packet-cip.c \ - packet-cipmotion.c \ - packet-cipsafety.c \ - packet-cisco-erspan.c \ - packet-cisco-fp-mim.c \ - packet-cisco-marker.c \ - packet-cisco-metadata.c \ - packet-cisco-oui.c \ - packet-cisco-sm.c \ - packet-cisco-ttag.c \ - packet-cisco-wids.c \ - packet-classicstun.c \ - packet-clearcase.c \ - packet-clip.c \ - packet-clique-rm.c \ - packet-clnp.c \ - packet-cmpp.c \ - packet-cnip.c \ - packet-coap.c \ - packet-collectd.c \ - packet-componentstatus.c \ - packet-cops.c \ - packet-corosync-totemnet.c \ - packet-corosync-totemsrp.c \ - packet-cosine.c \ - packet-couchbase.c \ - packet-cp2179.c \ - packet-cpfi.c \ - packet-cpha.c \ - packet-cql.c \ - packet-csm-encaps.c \ - packet-csn1.c \ - packet-ctdb.c \ - packet-cups.c \ - packet-daap.c \ - packet-data.c \ - packet-daytime.c \ - packet-db-lsp.c \ - packet-dbus.c \ - packet-dcc.c \ - packet-dccp.c \ - packet-dcerpc-bossvr.c \ - packet-dcerpc-browser.c \ - packet-dcerpc-cds_clerkserver.c \ - packet-dcerpc-cds_solicit.c \ - packet-dcerpc-conv.c \ - packet-dcerpc-cprpc_server.c \ - packet-dcerpc-dce122.c \ - packet-dcerpc-dtsprovider.c \ - packet-dcerpc-dtsstime_req.c \ - packet-dcerpc-epm.c \ - packet-dcerpc-fileexp.c \ - packet-dcerpc-fldb.c \ - packet-dcerpc-frsapi.c \ - packet-dcerpc-frsrpc.c \ - packet-dcerpc-ftserver.c \ - packet-dcerpc-icl_rpc.c \ - packet-dcerpc-krb5rpc.c \ - packet-dcerpc-llb.c \ - packet-dcerpc-messenger.c \ - packet-dcerpc-mgmt.c \ - packet-dcerpc-ndr.c \ - packet-dcerpc-netlogon.c \ - packet-dcerpc-pnp.c \ - packet-dcerpc-rdaclif.c \ - packet-dcerpc-rep_proc.c \ - packet-dcerpc-roverride.c \ - packet-dcerpc-rpriv.c \ - packet-dcerpc-rras.c \ - packet-dcerpc-rs_acct.c \ - packet-dcerpc-rs_attr.c \ - packet-dcerpc-rs_attr_schema.c \ - packet-dcerpc-rs_bind.c \ - packet-dcerpc-rs_misc.c \ - packet-dcerpc-rs_pgo.c \ - packet-dcerpc-rs_plcy.c \ - packet-dcerpc-rs_prop_acct.c \ - packet-dcerpc-rs_prop_acl.c \ - packet-dcerpc-rs_prop_attr.c \ - packet-dcerpc-rs_prop_pgo.c \ - packet-dcerpc-rs_prop_plcy.c \ - packet-dcerpc-rs_pwd_mgmt.c \ - packet-dcerpc-rs_repadm.c \ - packet-dcerpc-rs_replist.c \ - packet-dcerpc-rs_repmgr.c \ - packet-dcerpc-rs_unix.c \ - packet-dcerpc-rsec_login.c \ - packet-dcerpc-samr.c \ - packet-dcerpc-secidmap.c \ - packet-dcerpc-spoolss.c \ - packet-dcerpc-svcctl.c \ - packet-dcerpc-tapi.c \ - packet-dcerpc-tkn4int.c \ - packet-dcerpc-trksvr.c \ - packet-dcerpc-ubikdisk.c \ - packet-dcerpc-ubikvote.c \ - packet-dcerpc-update.c \ - packet-dcerpc.c \ - packet-dcm.c \ - packet-dcom-dispatch.c \ - packet-dcom-oxid.c \ - packet-dcom-remact.c \ - packet-dcom-remunkn.c \ - packet-dcom-sysact.c \ - packet-dcom.c \ - packet-dcp-etsi.c \ - packet-ddtp.c \ - packet-dec-bpdu.c \ - packet-dec-dnart.c \ - packet-dect.c \ - packet-devicenet.c \ - packet-dhcp-failover.c \ - packet-dhcpv6.c \ - packet-diameter.c \ - packet-diameter_3gpp.c \ - packet-diffserv-mpls-common.c \ - packet-dis.c \ - packet-distcc.c \ - packet-dji-uav.c \ - packet-dlm3.c \ - packet-dlsw.c \ - packet-dmp.c \ - packet-dmx.c \ - packet-dnp.c \ - packet-dns.c \ - packet-dof.c \ - packet-dplay.c \ - packet-dpnss-link.c \ - packet-dpnss.c \ - packet-drda.c \ - packet-dsi.c \ - packet-dsr.c \ - packet-dtcp-ip.c \ - packet-dtls.c \ - packet-dtn.c \ - packet-dtp.c \ - packet-dtpt.c \ - packet-dua.c \ - packet-dvb-ait.c \ - packet-dvb-bat.c \ - packet-dvb-data-mpe.c \ - packet-dvb-eit.c \ - packet-dvb-ipdc.c \ - packet-dvb-nit.c \ - packet-dvb-s2-bb.c \ - packet-dvb-sdt.c \ - packet-dvb-tdt.c \ - packet-dvb-tot.c \ - packet-dvbci.c \ - packet-dvmrp.c \ - packet-e100.c \ - packet-e164.c \ - packet-e212.c \ - packet-eap.c \ - packet-eapol.c \ - packet-echo.c \ - packet-ecmp.c \ - packet-ecp-oui.c \ - packet-edonkey.c \ - packet-egd.c \ - packet-ehdlc.c \ - packet-ehs.c \ - packet-eigrp.c \ - packet-eiss.c \ - packet-elasticsearch.c \ - packet-elcom.c \ - packet-elmi.c \ - packet-enc.c \ - packet-enip.c \ - packet-enrp.c \ - packet-enttec.c \ - packet-epl.c \ - packet-epl_v1.c \ - packet-epmd.c \ - packet-epon.c \ - packet-erf.c \ - packet-erldp.c \ - packet-esio.c \ - packet-esis.c \ - packet-etch.c \ - packet-eth.c \ - packet-etherip.c \ - packet-ethertype.c \ - packet-etsi_card_app_toolkit.c \ - packet-etv.c \ - packet-evrc.c \ - packet-exec.c \ - packet-exported_pdu.c \ - packet-extreme.c \ - packet-fc.c \ - packet-fcct.c \ - packet-fcdns.c \ - packet-fcels.c \ - packet-fcfcs.c \ - packet-fcfzs.c \ - packet-fcgi.c \ - packet-fcip.c \ - packet-fclctl.c \ - packet-fcoe.c \ - packet-fcoib.c \ - packet-fcp.c \ - packet-fcsb3.c \ - packet-fcsp.c \ - packet-fcswils.c \ - packet-fddi.c \ - packet-fefd.c \ - packet-ff.c \ - packet-finger.c \ - packet-fip.c \ - packet-fix.c \ - packet-flexnet.c \ - packet-flexray.c\ - packet-flip.c \ - packet-fmp.c \ - packet-fmp_notify.c \ - packet-fmtp.c \ - packet-force10-oui.c \ - packet-forces.c \ - packet-foundry.c \ - packet-fp_hint.c \ - packet-fr.c \ - packet-fractalgeneratorprotocol.c \ - packet-frame.c \ - packet-ftp.c \ - packet-fw1.c \ - packet-g723.c \ - packet-gadu-gadu.c \ - packet-gdb.c \ - packet-gdsdb.c \ - packet-gearman.c \ - packet-ged125.c \ - packet-geneve.c \ - packet-gfp.c \ - packet-gift.c \ - packet-giop.c \ - packet-git.c \ - packet-glbp.c \ - packet-gluster_cli.c \ - packet-gluster_pmap.c \ - packet-glusterd.c \ - packet-glusterfs.c \ - packet-glusterfs_hndsk.c \ - packet-gmhdr.c \ - packet-gmr1_bcch.c \ - packet-gmr1_common.c \ - packet-gmr1_dtap.c \ - packet-gmr1_rach.c \ - packet-gmr1_rr.c \ - packet-gmrp.c \ - packet-gnutella.c \ - packet-gopher.c \ - packet-gpef.c \ - packet-gprs-llc.c \ - packet-gprscdr.c \ - packet-gre.c \ - packet-gsm_a_bssmap.c \ - packet-gsm_a_common.c \ - packet-gsm_a_dtap.c \ - packet-gsm_a_gm.c \ - packet-gsm_a_rp.c \ - packet-gsm_a_rr.c \ - packet-gsm_abis_om2000.c \ - packet-gsm_abis_oml.c \ - packet-gsm_bsslap.c \ - packet-gsm_bssmap_le.c \ - packet-gsm_cbch.c \ - packet-gsm_ipa.c \ - packet-gsm_rlcmac.c \ - packet-gsm_sim.c \ - packet-gsm_sms.c \ - packet-gsm_sms_ud.c \ - packet-gsm_um.c \ - packet-gsmtap.c \ - packet-gssapi.c \ - packet-gtp.c \ - packet-gtpv2.c \ - packet-gvcp.c \ - packet-gvrp.c \ - packet-gvsp.c \ - packet-h1.c \ - packet-h221_nonstd.c \ - packet-h223.c \ - packet-h248_10.c \ - packet-h248_2.c \ - packet-h248_3gpp.c \ - packet-h248_7.c \ - packet-h248_annex_c.c \ - packet-h248_annex_e.c \ - packet-h248_q1950.c \ - packet-h261.c \ - packet-h263.c \ - packet-h263p.c \ - packet-h264.c \ - packet-hartip.c \ - packet-hazelcast.c \ - packet-hci_h1.c \ - packet-hci_h4.c \ - packet-hci_mon.c \ - packet-hci_usb.c \ - packet-hclnfsd.c \ - packet-hcrt.c \ - packet-hdcp.c \ - packet-hdcp2.c \ - packet-hdfs.c \ - packet-hdfsdata.c \ - packet-hdmi.c \ - packet-hip.c \ - packet-hiqnet.c \ - packet-hislip.c \ - packet-homeplug-av.c \ - packet-homeplug.c \ - packet-hp-erm.c \ - packet-hpext.c \ - packet-hpfeeds.c \ - packet-hpsw.c \ - packet-hpteam.c \ - packet-hsr-prp-supervision.c \ - packet-hsr.c \ - packet-hsrp.c \ - packet-http.c \ - packet-http2.c \ - packet-http-urlencoded.c \ - packet-hyperscsi.c \ - packet-i2c.c \ - packet-iana-oui.c \ - packet-iapp.c \ - packet-iax2.c \ - packet-icap.c \ - packet-icep.c \ - packet-icmp.c \ - packet-icmpv6.c \ - packet-icp.c \ - packet-icq.c \ - packet-idp.c \ - packet-idrp.c \ - packet-iec104.c \ - packet-ieee1722.c \ - packet-ieee17221.c \ - packet-ieee80211-netmon.c \ - packet-ieee80211-prism.c \ - packet-ieee80211-radio.c \ - packet-ieee80211-radiotap-iter.c\ - packet-ieee80211-radiotap.c \ - packet-ieee80211-wlancap.c \ - packet-ieee80211.c \ - packet-ieee802154.c \ - packet-ieee8021ah.c \ - packet-ieee8023.c \ - packet-ieee802a.c \ - packet-ifcp.c \ - packet-igap.c \ - packet-igmp.c \ - packet-igrp.c \ - packet-imap.c \ - packet-imf.c \ - packet-infiniband.c \ - packet-infiniband_sdp.c \ - packet-interlink.c \ - packet-ip.c \ - packet-ipars.c \ - packet-ipdc.c \ - packet-ipdr.c \ - packet-ipfc.c \ - packet-ipmi.c \ - packet-ipmi-app.c \ - packet-ipmi-bridge.c \ - packet-ipmi-chassis.c \ - packet-ipmi-picmg.c \ - packet-ipmi-se.c \ - packet-ipmi-session.c \ - packet-ipmi-storage.c \ - packet-ipmi-trace.c \ - packet-ipmi-transport.c \ - packet-ipmi-pps.c \ - packet-ipmi-update.c \ - packet-ipmi-vita.c \ - packet-ipnet.c \ - packet-ipoib.c \ - packet-ipos.c \ - packet-ipp.c \ - packet-ipsec-tcp.c \ - packet-ipsec-udp.c \ - packet-ipsec.c \ - packet-ipsi-ctl.c \ - packet-ipv6.c \ - packet-ipvs-syncd.c \ - packet-ipx.c \ - packet-ipxwan.c \ - packet-irc.c \ - packet-isakmp.c \ - packet-iscsi.c \ - packet-isdn.c \ - packet-iser.c \ - packet-isi.c \ - packet-isis-clv.c \ - packet-isis-hello.c \ - packet-isis-lsp.c \ - packet-isis-snp.c \ - packet-isis.c \ - packet-isl.c \ - packet-ismacryp.c \ - packet-ismp.c \ - packet-isns.c \ - packet-iso14443.c \ - packet-iso7816.c \ - packet-iso8583.c \ - packet-isup.c \ - packet-itdm.c \ - packet-iua.c \ - packet-iuup.c \ - packet-iwarp-ddp-rdmap.c\ - packet-iwarp-mpa.c \ - packet-ixiatrailer.c \ - packet-ixveriwave.c \ - packet-j1939.c \ - packet-jmirror.c \ - packet-jpeg.c \ - packet-json.c \ - packet-juniper.c \ - packet-jxta.c \ - packet-k12.c \ - packet-kadm5.c \ - packet-kafka.c \ - packet-kdp.c \ - packet-kdsp.c \ - packet-kerberos4.c \ - packet-kingfisher.c \ - packet-kink.c \ - packet-kismet.c \ - packet-klm.c \ - packet-knet.c \ - packet-knxnetip.c \ - packet-kpasswd.c \ - packet-kt.c \ - packet-l1-events.c \ - packet-l2tp.c \ - packet-lacp.c \ - packet-lanforge.c \ - packet-lapb.c \ - packet-lapbether.c \ - packet-lapd.c \ - packet-lapdm.c \ - packet-laplink.c \ - packet-lapsat.c \ - packet-lat.c \ - packet-lbm.c \ - packet-lbmc.c \ - packet-lbmpdm.c \ - packet-lbmpdmtcp.c \ - packet-lbmr.c \ - packet-lbtrm.c \ - packet-lbtru.c \ - packet-lbttcp.c \ - packet-ldp.c \ - packet-ldss.c \ - packet-lg8979.c \ - packet-lge_monitor.c \ - packet-link16.c \ - packet-linx.c \ - packet-lisp-data.c \ - packet-lisp-tcp.c \ - packet-lisp.c \ - packet-llc.c \ - packet-lldp.c \ - packet-llrp.c \ - packet-llt.c \ - packet-lltd.c \ - packet-lmi.c \ - packet-lmp.c \ - packet-logcat.c \ - packet-logcat-text.c \ - packet-lon.c \ - packet-loop.c \ - packet-lpd.c \ - packet-lsc.c \ - packet-ltp.c \ - packet-lwapp.c \ - packet-lwm.c \ - packet-lwm2mtlv.c \ - packet-lwres.c \ - packet-m2pa.c \ - packet-m2tp.c \ - packet-m2ua.c \ - packet-m3ua.c \ - packet-maap.c \ - packet-mac-lte-framed.c \ - packet-mac-lte.c \ - packet-maccontrol.c \ - packet-macsec.c \ - packet-mactelnet.c \ - packet-manolito.c \ - packet-marker.c \ - packet-mausb.c \ - packet-mbim.c \ - packet-mbtcp.c \ - packet-mcpe.c \ - packet-mdshdr.c \ - packet-media.c \ - packet-megaco.c \ - packet-memcache.c \ - packet-mesh.c \ - packet-meta.c \ - packet-metamako.c \ - packet-mgcp.c \ - packet-mih.c \ - packet-mikey.c \ - packet-mime-encap.c \ - packet-mint.c \ - packet-miop.c \ - packet-mip.c \ - packet-mip6.c \ - packet-mka.c \ - packet-mmse.c \ - packet-mndp.c \ - packet-mojito.c \ - packet-moldudp.c \ - packet-moldudp64.c \ - packet-mongo.c \ - packet-mount.c \ - packet-mp2t.c \ - packet-mp4ves.c \ - packet-mpeg-ca.c \ - packet-mpeg-descriptor.c \ - packet-mpeg-dsmcc.c \ - packet-mpeg-pat.c \ - packet-mpeg-pmt.c \ - packet-mpeg-sect.c \ - packet-mpeg1.c \ - packet-mpls-echo.c \ - packet-mpls-pm.c \ - packet-mpls-psc.c \ - packet-mplstp-oam.c \ - packet-mpls-y1711.c \ - packet-mpls.c \ - packet-mq-base.c \ - packet-mq-pcf.c \ - packet-mq.c \ - packet-mqtt.c \ - packet-mqtt-sn.c \ - packet-mrcpv2.c \ - packet-mrdisc.c \ - packet-mrp-mmrp.c \ - packet-mrp-msrp.c \ - packet-mrp-mvrp.c \ - packet-ms-mms.c \ - packet-msdp.c \ - packet-msn-messenger.c \ - packet-msnip.c \ - packet-msnlb.c \ - packet-msproxy.c \ - packet-msrp.c \ - packet-mstp.c \ - packet-mswsp.c \ - packet-mtp2.c \ - packet-mtp3.c \ - packet-mtp3mg.c \ - packet-multipart.c \ - packet-mux27010.c \ - packet-mysql.c \ - packet-nas_eps.c \ - packet-nasdaq-itch.c \ - packet-nasdaq-soup.c \ - packet-nat-pmp.c \ - packet-nb_rtpmux.c \ - packet-nbd.c \ - packet-nbipx.c \ - packet-nbt.c \ - packet-ncp-nmas.c \ - packet-ncp-sss.c \ - packet-ncp.c \ - packet-ncp2222.c \ - packet-ncs.c \ - packet-ndmp.c \ - packet-ndp.c \ - packet-ndps.c \ - packet-negoex.c \ - packet-netanalyzer.c \ - packet-netbios.c \ - packet-netdump.c \ - packet-netflow.c \ - packet-netlink-netfilter.c \ - packet-netlink-route.c \ - packet-netlink-sock_diag.c \ - packet-netlink.c \ - packet-netperfmeter.c \ - packet-netrom.c \ - packet-netsync.c \ - packet-nettl.c \ - packet-newmail.c \ - packet-nflog.c \ - packet-nfs.c \ - packet-nfsacl.c \ - packet-nfsauth.c \ - packet-nhrp.c \ - packet-nisplus.c \ - packet-nlm.c \ - packet-nlsp.c \ - packet-nntp.c \ - packet-noe.c \ - packet-nsip.c \ - packet-nsh.c \ - packet-nsrp.c \ - packet-nstrace.c \ - packet-nt-oui.c \ - packet-nt-tpcp.c \ - packet-ntlmssp.c \ - packet-ntp.c \ - packet-null.c \ - packet-nwmtp.c \ - packet-nwp.c \ - packet-oampdu.c \ - packet-obex.c \ - packet-ocfs2.c \ - packet-oicq.c \ - packet-oipf.c \ - packet-olsr.c \ - packet-omapi.c \ - packet-omron-fins.c \ - packet-opa.c \ - packet-opa-fe.c \ - packet-opa-mad.c \ - packet-opa-snc.c \ - packet-openflow.c \ - packet-openflow_v1.c \ - packet-openflow_v4.c \ - packet-openflow_v5.c \ - packet-opensafety.c \ - packet-openvpn.c \ - packet-openwire.c \ - packet-opsi.c \ - packet-optommp.c \ - packet-osc.c \ - packet-osi-options.c \ - packet-osi.c \ - packet-ositp.c \ - packet-ospf.c \ - packet-ossp.c \ - packet-ouch.c \ - packet-p_mul.c \ - packet-pathport.c \ - packet-packetbb.c \ - packet-packetlogger.c \ - packet-pagp.c \ - packet-paltalk.c \ - packet-pana.c \ - packet-pcap_pktdata.c \ - packet-pcapng_block.c \ - packet-pcep.c \ - packet-pcli.c \ - packet-pcnfsd.c \ - packet-pcp.c \ - packet-pdc.c \ - packet-pdcp-lte.c \ - packet-peekremote.c \ - packet-per.c \ - packet-pflog.c \ - packet-pgm.c \ - packet-pgsql.c \ - packet-pim.c \ - packet-pingpongprotocol.c \ - packet-pktap.c \ - packet-pktc.c \ - packet-pktgen.c \ - packet-pmproxy.c \ - packet-pnrp.c \ - packet-pop.c \ - packet-portmap.c \ - packet-ppcap.c \ - packet-ppi-antenna.c \ - packet-ppi-geolocation-common.c \ - packet-ppi-gps.c \ - packet-ppi-sensor.c \ - packet-ppi-vector.c \ - packet-ppi.c \ - packet-ppp.c \ - packet-pppoe.c \ - packet-pptp.c \ - packet-prp.c \ - packet-ptp.c \ - packet-ptpip.c \ - packet-pulse.c \ - packet-pvfs2.c \ - packet-pw-atm.c \ - packet-pw-cesopsn.c \ - packet-pw-common.c \ - packet-pw-eth.c \ - packet-pw-fr.c \ - packet-pw-hdlc.c \ - packet-pw-oam.c \ - packet-pw-satop.c \ - packet-q2931.c \ - packet-q708.c \ - packet-q931.c \ - packet-q933.c \ - packet-qllc.c \ - packet-qnet6.c \ - packet-quake.c \ - packet-quake2.c \ - packet-quake3.c \ - packet-quakeworld.c \ - packet-quic.c \ - packet-radius.c \ - packet-radius_packetcable.c \ - packet-raknet.c \ - packet-raw.c \ - packet-rdm.c \ - packet-rdp.c \ - packet-rdt.c \ - packet-redback.c \ - packet-redbackli.c \ - packet-reload-framing.c \ - packet-reload.c \ - packet-retix-bpdu.c \ - packet-rfc2190.c \ - packet-rfid-felica.c \ - packet-rfid-mifare.c \ - packet-rfid-pn532.c \ - packet-rfid-pn532-hci.c \ - packet-rgmp.c \ - packet-riemann.c \ - packet-rip.c \ - packet-ripng.c \ - packet-rlc-lte.c \ - packet-rlc.c \ - packet-rlm.c \ - packet-rlogin.c \ - packet-rmcp.c \ - packet-rmi.c \ - packet-rmp.c \ - packet-rmt-alc.c \ - packet-rmt-fec.c \ - packet-rmt-lct.c \ - packet-rmt-norm.c \ - packet-rohc.c \ - packet-roofnet.c \ - packet-rpc.c \ - packet-rpcap.c \ - packet-rpcrdma.c \ - packet-rpki-rtr.c \ - packet-rpl.c \ - packet-rquota.c \ - packet-rsh.c \ - packet-rsip.c \ - packet-rsl.c \ - packet-rstat.c \ - packet-rsvd.c \ - packet-rsvp.c \ - packet-rsync.c \ - packet-rtacser.c \ - packet-rtcdc.c \ - packet-rtcp.c \ - packet-rtitcp.c \ - packet-rtls.c \ - packet-rtmpt.c \ - packet-rtnet.c \ - packet-rtp-events.c \ - packet-rtp-midi.c \ - packet-rtp.c \ - packet-rtpproxy.c \ - packet-rtps.c \ - packet-rtsp.c \ - packet-rudp.c \ - packet-rwall.c \ - packet-rx.c \ - packet-s5066sis.c \ - packet-s5066dts.c \ - packet-s7comm.c \ - packet-s7comm_szl_ids.c \ - packet-sadmind.c \ - packet-sametime.c \ - packet-sap.c \ - packet-sasp.c \ - packet-sbus.c \ - packet-sbc.c \ - packet-sccp.c \ - packet-sccpmg.c \ - packet-scop.c \ - packet-scriptingservice.c \ - packet-scsi-mmc.c \ - packet-scsi-osd.c \ - packet-scsi-sbc.c \ - packet-scsi-smc.c \ - packet-scsi-ssc.c \ - packet-scsi.c \ - packet-sctp.c \ - packet-sdh.c \ - packet-sdlc.c \ - packet-sdp.c \ - packet-sebek.c \ - packet-selfm.c \ - packet-sercosiii.c \ - packet-ses.c \ - packet-sflow.c \ - packet-sgsap.c \ - packet-sigcomp.c \ - packet-simple.c \ - packet-simulcrypt.c \ - packet-sip.c \ - packet-sipfrag.c \ - packet-sita.c \ - packet-skinny.c \ - packet-skype.c \ - packet-slimp3.c \ - packet-sll.c \ - packet-slowprotocols.c \ - packet-slsk.c \ - packet-smb-browse.c \ - packet-smb-common.c \ - packet-smb-logon.c \ - packet-smb-mailslot.c \ - packet-smb-pipe.c \ - packet-smb-sidsnooping.c \ - packet-smb-direct.c \ - packet-smb.c \ - packet-smb2.c \ - packet-smcr.c \ - packet-sml.c \ - packet-smpp.c \ - packet-smtp.c \ - packet-sna.c \ - packet-snaeth.c \ - packet-sndcp-xid.c \ - packet-sndcp.c \ - packet-socketcan.c \ - packet-socks.c \ - packet-soupbintcp.c \ - packet-spdy.c \ - packet-spice.c \ - packet-spp.c \ - packet-spray.c \ - packet-sprt.c \ - packet-srp.c \ - packet-srvloc.c \ - packet-sscf-nni.c \ - packet-sscop.c \ - packet-ssh.c \ - packet-ssl-utils.c \ - packet-ssl.c \ - packet-sstp.c \ - packet-stanag4607.c \ - packet-starteam.c \ - packet-stat-notify.c \ - packet-stat.c \ - packet-stt.c \ - packet-stun.c \ - packet-sua.c \ - packet-swipe.c \ - packet-symantec.c \ - packet-sync.c \ - packet-synergy.c \ - packet-synphasor.c \ - packet-sysdig-event.c \ - packet-sysex.c \ - packet-syslog.c \ - packet-t30.c \ - packet-tacacs.c \ - packet-tali.c \ - packet-tapa.c \ - packet-tcp.c \ - packet-tcpros.c \ - packet-tdmoe.c \ - packet-tdmop.c \ - packet-tds.c \ - packet-teamspeak2.c \ - packet-teimanagement.c \ - packet-teklink.c \ - packet-telkonet.c \ - packet-telnet.c \ - packet-teredo.c \ - packet-text-media.c \ - packet-tfp.c \ - packet-tftp.c \ - packet-thrift.c \ - packet-time.c \ - packet-tipc.c \ - packet-tivoconnect.c \ - packet-tn3270.c \ - packet-tn5250.c \ - packet-tnef.c \ - packet-tns.c \ - packet-tpkt.c \ - packet-tpncp.c \ - packet-tr.c \ - packet-trill.c \ - packet-trmac.c \ - packet-tsp.c \ - packet-tte-pcf.c \ - packet-tte.c \ - packet-turbocell.c \ - packet-turnchannel.c \ - packet-tuxedo.c \ - packet-tzsp.c \ - packet-u3v.c \ - packet-ua.c \ - packet-ua3g.c \ - packet-uasip.c \ - packet-uaudp.c \ - packet-ubertooth.c \ - packet-ucp.c \ - packet-udld.c \ - packet-udp.c \ - packet-udt.c \ - packet-uhd.c \ - packet-uma.c \ - packet-umts_fp.c \ - packet-umts_mac.c \ - packet-usb-audio.c \ - packet-usb-ccid.c \ - packet-usb-com.c \ - packet-usb-dfu.c \ - packet-usb-hid.c \ - packet-usb-hub.c \ - packet-usb-masstorage.c \ - packet-usb-video.c \ - packet-usb.c \ - packet-usbip.c \ - packet-user_encap.c \ - packet-userlog.c \ - packet-uts.c \ - packet-v120.c \ - packet-v150fw.c \ - packet-v52.c \ - packet-v5dl.c \ - packet-v5ef.c \ - packet-v5ua.c \ - packet-vcdu.c \ - packet-vicp.c \ - packet-vines.c \ - packet-vlan.c \ - packet-vmlab.c \ - packet-vnc.c \ - packet-vntag.c \ - packet-vp8.c \ - packet-vrrp.c \ - packet-vrt.c \ - packet-vsip.c \ - packet-vssmonitoring.c \ - packet-vtp.c \ - packet-vuze-dht.c \ - packet-vxi11.c \ - packet-vxlan.c \ - packet-wai.c \ - packet-wap.c \ - packet-wassp.c \ - packet-waveagent.c \ - packet-wbxml.c \ - packet-wccp.c \ - packet-wcp.c \ - packet-websocket.c \ - packet-wfleet-hdlc.c \ - packet-who.c \ - packet-whois.c \ - packet-wifi-display.c \ - packet-wifi-p2p.c \ - packet-windows-common.c \ - packet-winsrepl.c \ - packet-wlccp.c \ - packet-wol.c \ - packet-wow.c \ - packet-wps.c \ - packet-wreth.c \ - packet-wsmp.c \ - packet-wsp.c \ - packet-wtls.c \ - packet-wtp.c \ - packet-x11.c \ - packet-x25.c \ - packet-x29.c \ - packet-xcsl.c \ - packet-xdmcp.c \ - packet-xip.c \ - packet-xip-serval.c \ - packet-xmcp.c \ - packet-xml.c \ - packet-xmpp-conference.c \ - packet-xmpp-core.c \ - packet-xmpp-gtalk.c \ - packet-xmpp-jingle.c \ - packet-xmpp-other.c \ - packet-xmpp-utils.c \ - packet-xmpp.c \ - packet-xot.c \ - packet-xtp.c \ - packet-xyplex.c \ - packet-yami.c \ - packet-yhoo.c \ - packet-ymsg.c \ - packet-ypbind.c \ - packet-yppasswd.c \ - packet-ypserv.c \ - packet-ypxfr.c \ - packet-zbee-aps.c \ - packet-zbee-nwk.c \ - packet-zbee-nwk-gp.c \ - packet-zbee-security.c \ - packet-zbee-zcl.c \ - packet-zbee-zcl-closures.c \ - packet-zbee-zcl-general.c \ - packet-zbee-zcl-ha.c \ - packet-zbee-zcl-hvac.c \ - packet-zbee-zcl-lighting.c \ - packet-zbee-zcl-meas-sensing.c \ - packet-zbee-zcl-misc.c \ - packet-zbee-zcl-sas.c \ - packet-zbee-zcl-se.c \ - packet-zbee-zdp.c \ - packet-zbee-zdp-binding.c \ - packet-zbee-zdp-discovery.c \ - packet-zbee-zdp-management.c \ - packet-zebra.c \ - packet-zep.c \ - packet-ziop.c \ - packet-zrtp.c \ - packet-zvt.c \ - $(CUSTOM_DISSECTOR_SRC) - -# -# Headers for file dissectors. -# -FILE_DISSECTOR_INCLUDES = \ - file-file.h - -# -# Headers for dissectors. -# -DISSECTOR_INCLUDES = \ - $(PIDL_DISSECTOR_INCLUDES) \ - packet-6lowpan.h \ - packet-a21.h \ - packet-acp133.h \ - packet-acse.h \ - packet-actrace.h \ - packet-adb_service.h \ - packet-afp.h \ - packet-aim.h \ - packet-alcap.h \ - packet-ansi_a.h \ - packet-ansi_map.h \ - packet-ansi_tcap.h \ - packet-arp.h \ - packet-atalk.h \ - packet-atm.h \ - packet-atn-ulcs.h \ - packet-ax25.h \ - packet-bacapp.h \ - packet-ber.h \ - packet-bfd.h \ - packet-bgp.h \ - packet-bluetooth.h \ - packet-bssap.h \ - packet-bssgp.h \ - packet-btatt.h \ - packet-btavctp.h \ - packet-btavdtp.h \ - packet-btavrcp.h \ - packet-bthci_acl.h \ - packet-bthci_cmd.h \ - packet-bthci_evt.h \ - packet-bthci_sco.h \ - packet-btl2cap.h \ - packet-btle.h \ - packet-btrfcomm.h \ - packet-btsdp.h \ - packet-c1222.h \ - packet-camel.h \ - packet-cdt.h \ - packet-cell_broadcast.h \ - packet-charging_ase.h \ - packet-chdlc.h \ - packet-cip.h \ - packet-cipsafety.h \ - packet-clearcase.h \ - packet-cmip.h \ - packet-cmp.h \ - packet-cms.h \ - packet-credssp.h \ - packet-crmf.h \ - packet-csn1.h \ - packet-dap.h \ - packet-dcc.h \ - packet-dccp.h \ - packet-dcerpc.h \ - packet-dcerpc-browser.h \ - packet-dcerpc-budb.h \ - packet-dcerpc-butc.h \ - packet-dcerpc-dce122.h \ - packet-dcerpc-dcom.h \ - packet-dcerpc-dnsserver.h \ - packet-dcerpc-drsuapi.h \ - packet-dcerpc-frsapi.h \ - packet-dcerpc-frsrpc.h \ - packet-dcerpc-netlogon.h \ - packet-dcerpc-nt.h \ - packet-dcerpc-pnp.h \ - packet-dcerpc-rras.h \ - packet-dcerpc-samr.h \ - packet-dcerpc-spoolss.h \ - packet-dcerpc-svcctl.h \ - packet-dcerpc-tapi.h \ - packet-dcom.h \ - packet-dcom-dispatch.h \ - packet-dcm.h \ - packet-diameter.h \ - packet-diffserv-mpls-common.h \ - packet-disp.h \ - packet-dns.h \ - packet-dop.h \ - packet-dsp.h \ - packet-dtls.h \ - packet-dtn.h \ - packet-dvbci.h \ - packet-enip.h \ - packet-erf.h \ - packet-e164.h \ - packet-e212.h \ - packet-edonkey.h \ - packet-epmd.h \ - packet-ess.h \ - packet-eth.h \ - packet-fc.h \ - packet-fcbls.h \ - packet-fcct.h \ - packet-fcels.h \ - packet-fcfcs.h \ - packet-fcfzs.h \ - packet-fclctl.h \ - packet-fcp.h \ - packet-fcsb3.h \ - packet-fcswils.h \ - packet-ff.h \ - packet-fix.h \ - packet-fmp.h \ - packet-frame.h \ - packet-ftam.h \ - packet-giop.h \ - packet-gluster.h \ - packet-gmr1_common.h \ - packet-gmr1_rr.h \ - packet-gnutella.h \ - packet-gprscdr.h \ - packet-gre.h \ - packet-gsm_a_common.h \ - packet-gsm_a_rr.h \ - packet-gsm_map.h \ - packet-gsm_rlcmac.h \ - packet-gsm_sms.h \ - packet-gssapi.h \ - packet-gtp.h \ - packet-gtpv2.h \ - packet-h223.h \ - packet-h225.h \ - packet-h235.h \ - packet-h245.h \ - packet-h248.h \ - packet-h263.h \ - packet-h264.h \ - packet-h323.h \ - packet-h450-ros.h \ - packet-hpext.h \ - packet-http.h \ - packet-iana-oui.h \ - packet-iax2.h \ - packet-icmp.h \ - packet-idmp.h \ - packet-idp.h \ - packet-ieee80211.h \ - packet-ieee80211-radiotap-iter.h \ - packet-ieee80211-radiotap-defs.h \ - packet-ieee802154.h \ - packet-ieee8023.h \ - packet-ieee802a.h \ - packet-igmp.h \ - packet-imf.h \ - packet-inap.h \ - packet-infiniband.h \ - packet-ip.h \ - packet-ipmi.h \ - packet-ipsec.h \ - packet-ipv6.h \ - packet-ipx.h \ - packet-isakmp.h \ - packet-isis.h \ - packet-isis-clv.h \ - packet-isl.h \ - packet-isup.h \ - packet-iwarp-ddp-rdmap.h \ - packet-juniper.h \ - packet-jxta.h \ - packet-kerberos.h \ - packet-klm.h \ - packet-l2tp.h \ - packet-lbm.h \ - packet-lbtrm.h \ - packet-lbtru.h \ - packet-lbttcp.h \ - packet-ldap.h \ - packet-lcsap.h \ - packet-ldp.h \ - packet-link16.h \ - packet-llc.h \ - packet-logotypecertextn.h \ - packet-lpp.h \ - packet-lte-rrc.h \ - packet-mac-lte.h \ - packet-mausb.h \ - packet-mbim.h \ - packet-mbtcp.h \ - packet-mgcp.h \ - packet-mms.h \ - packet-mount.h \ - packet-mp4ves.h \ - packet-mpeg-descriptor.h \ - packet-mpeg-pmt.h \ - packet-mpeg-sect.h \ - packet-mpls.h \ - packet-mq.h \ - packet-msrp.h \ - packet-mstp.h \ - packet-mtp3.h \ - packet-nbap.h \ - packet-ncp-int.h \ - packet-ncp-nmas.h \ - packet-ncp-sss.h \ - packet-ndmp.h \ - packet-ndps.h \ - packet-netbios.h \ - packet-netlink.h \ - packet-nfs.h \ - packet-nisplus.h \ - packet-nlm.h \ - packet-ntlmssp.h \ - packet-ntp.h \ - packet-ocsp.h \ - packet-opensafety.h \ - packet-osi.h \ - packet-osi-options.h \ - packet-p1.h \ - packet-p22.h \ - packet-p7.h \ - packet-p772.h \ - packet-pcap_pktdata.h \ - packet-pcnfsd.h \ - packet-pdcp-lte.h \ - packet-per.h \ - packet-pkcs1.h \ - packet-pkcs12.h \ - packet-pkix1explicit.h \ - packet-pkix1implicit.h \ - packet-pkixac.h \ - packet-pkixproxy.h \ - packet-pkixqualified.h \ - packet-pkixtsp.h \ - packet-pkinit.h \ - packet-pktc.h \ - packet-portmap.h \ - packet-ppi-geolocation-common.h \ - packet-ppp.h \ - packet-pres.h \ - packet-ptpip.h \ - packet-pw-atm.h \ - packet-pw-common.h \ - packet-q708.h \ - packet-q931.h \ - packet-q932.h \ - packet-qsig.h \ - packet-radius.h \ - packet-ranap.h \ - packet-rdm.h \ - packet-rdt.h \ - packet-reload.h \ - packet-rlc.h \ - packet-rlc-lte.h \ - packet-rmi.h \ - packet-rmt-common.h \ - packet-rohc.h \ - packet-ros.h \ - packet-rpc.h \ - packet-rquota.h \ - packet-rrc.h \ - packet-rsvp.h \ - packet-rtcp.h \ - packet-rtp.h \ - packet-rtps.h \ - packet-rtp-events.h \ - packet-rtse.h \ - packet-rtsp.h \ - packet-rwall.h \ - packet-rx.h \ - packet-s1ap.h \ - packet-s5066sis.h \ - packet-s7comm.h \ - packet-s7comm_szl_ids.h \ - packet-sccp.h \ - packet-scsi.h \ - packet-scsi-mmc.h \ - packet-scsi-osd.h \ - packet-scsi-sbc.h \ - packet-scsi-smc.h \ - packet-scsi-ssc.h \ - packet-sctp.h \ - packet-sdp.h \ - packet-ses.h \ - packet-sflow.h \ - packet-sip.h \ - packet-skinny.h \ - packet-sll.h \ - packet-smb.h \ - packet-smb2.h \ - packet-smb-browse.h \ - packet-smb-common.h \ - packet-smb-mailslot.h \ - packet-smb-pipe.h \ - packet-smb-sidsnooping.h \ - packet-smpp.h \ - packet-smrse.h \ - packet-snmp.h \ - packet-spice.h \ - packet-spray.h \ - packet-sprt.h \ - packet-sscop.h \ - packet-ssl.h \ - packet-ssl-utils.h \ - packet-stat.h \ - packet-stat-notify.h \ - packet-sv.h \ - packet-t124.h \ - packet-t30.h \ - packet-t38.h \ - packet-tacacs.h \ - packet-tcap.h \ - packet-tcp.h \ - packet-tetra.h \ - packet-tftp.h \ - packet-tn3270.h \ - packet-tn5250.h \ - packet-tns.h \ - packet-tpkt.h \ - packet-tr.h \ - packet-tte.h \ - packet-ua.h \ - packet-uaudp.h \ - packet-ubertooth.h \ - packet-udp.h \ - packet-umts_fp.h \ - packet-umts_mac.h \ - packet-usb.h \ - packet-usb-hid.h \ - packet-usbip.h \ - packet-wap.h \ - packet-wccp.h \ - packet-windows-common.h \ - packet-wlancertextn.h \ - packet-wps.h \ - packet-wsp.h \ - packet-wtls.h \ - packet-wtp.h \ - packet-x11.h \ - packet-x11-keysymdef.h \ - x11-keysym.h \ - x11-declarations.h \ - x11-register-info.h \ - x11-extension-implementation.h \ - x11-extension-errors.h \ - x11-glx-render-enum.h \ - x11-enum.h \ - packet-x509af.h \ - packet-x509ce.h \ - packet-x509if.h \ - packet-x509sat.h \ - packet-xml.h \ - packet-xmpp-conference.h \ - packet-xmpp-core.h \ - packet-xmpp-gtalk.h \ - packet-xmpp.h \ - packet-xmpp-jingle.h \ - packet-xmpp-other.h \ - packet-xmpp-utils.h \ - packet-ypbind.h \ - packet-yppasswd.h \ - packet-ypserv.h \ - packet-ypxfr.h \ - packet-zbee.h \ - packet-zbee-aps.h \ - packet-zbee-nwk.h \ - packet-zbee-security.h \ - packet-zbee-zcl.h \ - packet-zbee-zdp.h \ - packet-zep.h \ - packet-ziop.h \ - $(GENERATED_HEADER_FILES) \ - $(CUSTOM_HEADER_FILES) - -# Dissector helpers. They're included in the source files in this -# directory, but they're not dissectors themselves, i.e. they're not -# used to generate "register.c"). -DISSECTOR_SUPPORT_SRC = \ - packet-dcerpc-nt.c \ - usb.c \ - register.c - -# this target needed for distribution only -noinst_HEADERS = \ - $(DISSECTOR_INCLUDES) \ - $(FILE_DISSECTOR_INCLUDES) - -ALL_DISSECTORS_SRC = \ - $(DISSECTOR_SRC) \ - $(FILE_DISSECTOR_SRC) \ - $(PIDL_DISSECTOR_SRC) \ - $(ASN1_DISSECTOR_SRC) \ - $(DIRTY_ASN1_DISSECTOR_SRC) \ - $(CORBA_IDL_DISSECTOR_SRC) \ - $(DIRTY_CORBA_IDL_DISSECTOR_SRC) 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 diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am index 659865cc44..4256a6d0db 100644 --- a/epan/ftypes/Makefile.am +++ b/epan/ftypes/Makefile.am @@ -18,7 +18,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include Makefile.common include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan $(WS_CPPFLAGS) \ @@ -26,6 +25,27 @@ AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan $(WS_CPPFLAGS) \ noinst_LTLIBRARIES = libftypes.la +libftypes_la_SOURCES = \ + ftypes.c \ + ftype-bytes.c \ + ftype-double.c \ + ftype-ieee-11073-float.c \ + ftype-integer.c \ + ftype-ipv4.c \ + ftype-ipv6.c \ + ftype-guid.c \ + ftype-none.c \ + ftype-pcre.c \ + ftype-protocol.c \ + ftype-string.c \ + ftype-time.c \ + ftypes.h \ + ftypes-int.h + +EXTRA_DIST = \ + .editorconfig \ + CMakeLists.txt + CLEANFILES = \ libftypes.a \ libftypes.la \ @@ -34,14 +54,7 @@ CLEANFILES = \ MAINTAINERCLEANFILES = \ Makefile.in -libftypes_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES) - -EXTRA_DIST = \ - .editorconfig \ - Makefile.common \ - CMakeLists.txt - checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ -sourcedir=$(srcdir) \ - $(NONGENERATED_C_FILES) + $(libftypes_la_SOURCES) diff --git a/epan/ftypes/Makefile.common b/epan/ftypes/Makefile.common deleted file mode 100644 index b8b9042c9e..0000000000 --- a/epan/ftypes/Makefile.common +++ /dev/null @@ -1,47 +0,0 @@ -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# C source files that are part of the display filter source; this includes only -# .c files, not YACC or Lex or... files (as Makefile.nmake maps this list -# into a list of object files by replacing ".c" with ".obj") or files -# generated from YACC or Lex files (as Automake doesn't want them in -# _SOURCES variables). -NONGENERATED_C_FILES = \ - ftypes.c \ - ftype-bytes.c \ - ftype-double.c \ - ftype-ieee-11073-float.c \ - ftype-integer.c \ - ftype-ipv4.c \ - ftype-ipv6.c \ - ftype-guid.c \ - ftype-none.c \ - ftype-pcre.c \ - ftype-protocol.c \ - ftype-string.c \ - ftype-time.c - -# Header files that are not generated from other files -NONGENERATED_HEADER_FILES = \ - ftypes.h \ - ftypes-int.h diff --git a/epan/nghttp2/Makefile.am b/epan/nghttp2/Makefile.am index 0845718d99..d5b8323b0d 100644 --- a/epan/nghttp2/Makefile.am +++ b/epan/nghttp2/Makefile.am @@ -19,7 +19,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include Makefile.common include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LIBNGHTTP2_CFLAGS) \ @@ -27,6 +26,29 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LIBNGHTTP2_CFLAGS) \ noinst_LTLIBRARIES = libnghttp2.la +libnghttp2_la_SOURCES = \ + nghttp2_buf.c \ + nghttp2_hd.c \ + nghttp2_hd_huffman.c \ + nghttp2_hd_huffman_data.c \ + nghttp2_helper.c \ + nghttp2_mem.c \ + nghttp2_rcbuf.c \ + nghttp2_buf.h \ + nghttp2_hd.h \ + nghttp2_hd_huffman.h \ + nghttp2_helper.h \ + nghttp2_int.h \ + nghttp2_mem.h \ + nghttp2_rcbuf.h \ + nghttp2.h \ + nghttp2ver.h + +EXTRA_DIST = \ + .editorconfig \ + README.nghttp2 \ + CMakeLists.txt + CLEANFILES = \ libnghttp2.a \ libnghttp2.la \ @@ -37,16 +59,6 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = \ Makefile.in -libnghttp2_la_SOURCES = \ - $(LIBNGHTTP2_SRC) \ - $(LIBNGHTTP2_INCLUDES) - -EXTRA_DIST = \ - .editorconfig \ - Makefile.common \ - README.nghttp2 \ - CMakeLists.txt - # # Editor modelines - https://www.wireshark.org/tools/modelines.html # diff --git a/epan/nghttp2/Makefile.common b/epan/nghttp2/Makefile.common deleted file mode 100644 index 277993be72..0000000000 --- a/epan/nghttp2/Makefile.common +++ /dev/null @@ -1,56 +0,0 @@ -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -LIBNGHTTP2_SRC = \ - nghttp2_buf.c \ - nghttp2_hd.c \ - nghttp2_hd_huffman.c \ - nghttp2_hd_huffman_data.c \ - nghttp2_helper.c \ - nghttp2_mem.c \ - nghttp2_rcbuf.c - -LIBNGHTTP2_INCLUDES = \ - nghttp2_buf.h \ - nghttp2_hd.h \ - nghttp2_hd_huffman.h \ - nghttp2_helper.h \ - nghttp2_int.h \ - nghttp2_mem.h \ - nghttp2_rcbuf.h \ - nghttp2.h \ - nghttp2ver.h - - -# -# Editor modelines - https://www.wireshark.org/tools/modelines.html -# -# Local variables: -# c-basic-offset: 8 -# tab-width: 8 -# indent-tabs-mode: t -# End: -# -# vi: set shiftwidth=8 tabstop=8 noexpandtab: -# :indentSize=8:tabSize=8:noTabs=false: -# diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am index 99f519af83..6fa68a6fa8 100644 --- a/epan/wmem/Makefile.am +++ b/epan/wmem/Makefile.am @@ -19,7 +19,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include Makefile.common include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LIBWMEM_CFLAGS) \ @@ -29,12 +28,52 @@ noinst_LTLIBRARIES = libwmem.la EXTRA_PROGRAMS = wmem_test +libwmem_la_SOURCES = \ + wmem_array.c \ + wmem_core.c \ + wmem_allocator_block.c \ + wmem_allocator_block_fast.c \ + wmem_allocator_simple.c \ + wmem_allocator_strict.c \ + wmem_list.c \ + wmem_map.c \ + wmem_miscutl.c \ + wmem_scopes.c \ + wmem_stack.c \ + wmem_strbuf.c \ + wmem_strutl.c \ + wmem_tree.c \ + wmem_interval_tree.c \ + wmem_user_cb.c \ + wmem.h \ + wmem_array.h \ + wmem_core.h \ + wmem_allocator.h \ + wmem_allocator_block.h \ + wmem_allocator_block_fast.h \ + wmem_allocator_simple.h \ + wmem_allocator_strict.h \ + wmem_list.h \ + wmem_map.h \ + wmem_map_int.h \ + wmem_miscutl.h \ + wmem_queue.h \ + wmem_scopes.h \ + wmem_stack.h \ + wmem_strbuf.h \ + wmem_strutl.h \ + wmem_tree.h \ + wmem_tree-int.h \ + wmem_interval_tree.h \ + wmem_user_cb.h \ + wmem_user_cb_int.h + +wmem_test_SOURCES = wmem_test.c + wmem_test_LDADD = \ libwmem.la \ $(GLIB_LIBS) -test-programs: wmem_test - CLEANFILES = \ libwmem.a \ libwmem.la \ @@ -42,21 +81,16 @@ CLEANFILES = \ DISTCLEANFILES = -MAINTAINERCLEANFILES = \ +MAINTAINERCLEANFILES = \ Makefile.in -libwmem_la_SOURCES = \ - $(LIBWMEM_SRC) \ - $(LIBWMEM_INCLUDES) - EXTRA_DIST = \ - Makefile.common \ CMakeLists.txt checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ -sourcedir=$(srcdir) \ - $(LIBWMEM_SRC) + $(libwmem_la_SOURCES) # # Editor modelines - https://www.wireshark.org/tools/modelines.html diff --git a/epan/wmem/Makefile.common b/epan/wmem/Makefile.common deleted file mode 100644 index 10d734a414..0000000000 --- a/epan/wmem/Makefile.common +++ /dev/null @@ -1,78 +0,0 @@ -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -LIBWMEM_SRC = \ - wmem_array.c \ - wmem_core.c \ - wmem_allocator_block.c \ - wmem_allocator_block_fast.c \ - wmem_allocator_simple.c \ - wmem_allocator_strict.c \ - wmem_list.c \ - wmem_map.c \ - wmem_miscutl.c \ - wmem_scopes.c \ - wmem_stack.c \ - wmem_strbuf.c \ - wmem_strutl.c \ - wmem_tree.c \ - wmem_interval_tree.c \ - wmem_user_cb.c - -LIBWMEM_INCLUDES = \ - wmem.h \ - wmem_array.h \ - wmem_core.h \ - wmem_allocator.h \ - wmem_allocator_block.h \ - wmem_allocator_block_fast.h \ - wmem_allocator_simple.h \ - wmem_allocator_strict.h \ - wmem_list.h \ - wmem_map.h \ - wmem_map_int.h \ - wmem_miscutl.h \ - wmem_queue.h \ - wmem_scopes.h \ - wmem_stack.h \ - wmem_strbuf.h \ - wmem_strutl.h \ - wmem_tree.h \ - wmem_tree-int.h \ - wmem_interval_tree.h \ - wmem_user_cb.h \ - wmem_user_cb_int.h - - -# -# Editor modelines - https://www.wireshark.org/tools/modelines.html -# -# Local variables: -# c-basic-offset: 8 -# tab-width: 8 -# indent-tabs-mode: t -# End: -# -# vi: set shiftwidth=8 tabstop=8 noexpandtab: -# :indentSize=8:tabSize=8:noTabs=false: -# |