diff options
Diffstat (limited to 'plugins')
32 files changed, 546 insertions, 966 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 1a389dc6e5..6b11b4ea71 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -39,7 +39,6 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \ EXTRA_DIST = \ $(_CUSTOM_EXTRA_DIST_) \ - Makefile.common.inc \ Custom.make.example \ Custom.m4.example diff --git a/plugins/Makefile.am.inc b/plugins/Makefile.am.inc index 8423121e05..5d905c2840 100644 --- a/plugins/Makefile.am.inc +++ b/plugins/Makefile.am.inc @@ -29,6 +29,124 @@ PLUGIN_CFLAGS = PLUGIN_LDFLAGS = -module -avoid-version # +# Source files are divided up along several axes: +# +# C vs. C++ - this is used on Windows to generated lists of object files +# with .c=.obj or .cpp=.obj +# +# Register vs. non-register - register files are scanned for registration +# functions, non-register files aren't. +# +# Flex-generated, Lemon-generated, and non-generated: +# +# we distribute non-generated files, as they're part of the source, +# and distribute Flex-generated files, as we don't require that +# people have Flex installed and don't distribute it ourself and +# thus can't guarantee that we can run Flex in the build process, +# but we don't distribute Lemon-generated files, as we distribute +# Lemon and can run it in the build process; +# +# "make maintainer-clean" on UN*X remove all generated files; +# +# "make distclean" on UN*X removes Lemon-generated files, as they're +# not in the distribution, but not Flex-generated files, as they +# are in the distribution; +# +# "make distclean" on Windows removes both Lemon-generated and +# Flex-generated files, as the Flex-generated files in the +# distribution were generated by Flex on UN*X, and won't compile +# on Windows; +# +# Flex-generated files can't be built with full warnings +# turned on, and can't be run through the checkAPI scripts, +# as they generate code that won't pass (we've tweaked +# Lemon to generate code that will pass). +# + +# +# All source files to be scanned for registration routines. +# +REGISTER_SRC_FILES = \ + $(FLEX_GENERATED_REGISTER_C_FILES) \ + $(FLEX_GENERATED_REGISTER_CPP_FILES) \ + $(LEMON_GENERATED_REGISTER_C_FILES) \ + $(LEMON_GENERATED_REGISTER_CPP_FILES) \ + $(NONGENERATED_REGISTER_C_FILES) \ + $(NONGENERATED_REGISTER_CPP_FILES) + +# +# All distributed source files. +# +SRC_FILES = \ + $(FLEX_GENERATED_C_FILES) \ + $(FLEX_GENERATED_CPP_FILES) \ + $(NONGENERATED_C_FILES) \ + $(NONGENERATED_CPP_FILES) + +# +# All non-distributed source files. +# +NODIST_SRC_FILES = \ + $(LEMON_GENERATED_C_FILES) \ + $(LEMON_GENERATED_CPP_FILES) + +# +# All non-distributed header files. +# +NODIST_HEADER_FILES = \ + $(LEMON_GENERATED_HEADER_FILES) + +# +# All Flex-generated source files. +# +FLEX_GENERATED_SRC_FILES = \ + $(FLEX_GENERATED_C_FILES) \ + $(FLEX_GENERATED_CPP_FILES) + +# +# All Lemon-generated source files. +# +LEMON_GENERATED_SRC_FILES = \ + $(LEMON_GENERATED_C_FILES) \ + $(LEMON_GENERATED_CPP_FILES) + +# +# All generated source files. +# +GENERATED_SRC_FILES = \ + $(FLEX_GENERATED_SRC_FILES) \ + $(LEMON_GENERATED_SRC_FILES) + +# +# All generated header files. +# +GENERATED_HEADER_FILES = \ + $(FLEX_GENERATED_HEADER_FILES) \ + $(LEMON_GENERATED_HEADER_FILES) + +# +# All "clean" source files; they can be compiled with the regular +# warning options, including -Werror with GCC-compatible compilers, +# and can be run through checkAPI. Neither Flex-generated nor +# Lemon-generated files can currently be guaranteed to be clean. +# +CLEAN_SRC_FILES = \ + $(NONGENERATED_C_FILES) \ + $(NONGENERATED_CPP_FILES) + +# C source files +C_FILES = \ + $(FLEX_GENERATED_C_FILES) \ + $(LEMON_GENERATED_C_FILES) \ + $(NONGENERATED_C_FILES) + +# C++ source files +CPP_FILES = \ + $(FLEX_GENERATED_CPP_FILES) \ + $(LEMON_GENERATED_CPP_FILES) \ + $(NONGENERATED_CPP_FILES) + +# # Build plugin.c, which contains the plugin version[] string, a # function plugin_register() that calls the register routines for all # protocols, and a function plugin_reg_handoff() that calls the handoff @@ -56,7 +174,7 @@ PLUGIN_LDFLAGS = -module -avoid-version # a plugin.c file for a plugin. # All subsequent arguments are the files to scan. # -plugin.c: $(REGISTER_SRC_FILES) Makefile.common $(top_srcdir)/tools/make-dissector-reg.py +plugin.c: $(REGISTER_SRC_FILES) $(top_srcdir)/tools/make-dissector-reg.py @echo Making plugin.c @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ plugin $(REGISTER_SRC_FILES) diff --git a/plugins/Makefile.common.inc b/plugins/Makefile.common.inc deleted file mode 100644 index c28b6a3dfe..0000000000 --- a/plugins/Makefile.common.inc +++ /dev/null @@ -1,138 +0,0 @@ -# -# Common definitions for plugin Makefile.common 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. - -# -# Source files are divided up along several axes: -# -# C vs. C++ - this is used on Windows to generated lists of object files -# with .c=.obj or .cpp=.obj -# -# Register vs. non-register - register files are scanned for registration -# functions, non-register files aren't. -# -# Flex-generated, Lemon-generated, and non-generated: -# -# we distribute non-generated files, as they're part of the source, -# and distribute Flex-generated files, as we don't require that -# people have Flex installed and don't distribute it ourself and -# thus can't guarantee that we can run Flex in the build process, -# but we don't distribute Lemon-generated files, as we distribute -# Lemon and can run it in the build process; -# -# "make maintainer-clean" on UN*X remove all generated files; -# -# "make distclean" on UN*X removes Lemon-generated files, as they're -# not in the distribution, but not Flex-generated files, as they -# are in the distribution; -# -# "make distclean" on Windows removes both Lemon-generated and -# Flex-generated files, as the Flex-generated files in the -# distribution were generated by Flex on UN*X, and won't compile -# on Windows; -# -# Flex-generated files can't be built with full warnings -# turned on, and can't be run through the checkAPI scripts, -# as they generate code that won't pass (we've tweaked -# Lemon to generate code that will pass). -# - -# -# All source files to be scanned for registration routines. -# -REGISTER_SRC_FILES = \ - $(FLEX_GENERATED_REGISTER_C_FILES) \ - $(FLEX_GENERATED_REGISTER_CPP_FILES) \ - $(LEMON_GENERATED_REGISTER_C_FILES) \ - $(LEMON_GENERATED_REGISTER_CPP_FILES) \ - $(NONGENERATED_REGISTER_C_FILES) \ - $(NONGENERATED_REGISTER_CPP_FILES) - -# -# All distributed source files. -# -SRC_FILES = \ - $(FLEX_GENERATED_C_FILES) \ - $(FLEX_GENERATED_CPP_FILES) \ - $(NONGENERATED_C_FILES) \ - $(NONGENERATED_CPP_FILES) - -# -# All non-distributed source files. -# -NODIST_SRC_FILES = \ - $(LEMON_GENERATED_C_FILES) \ - $(LEMON_GENERATED_CPP_FILES) - -# -# All non-distributed header files. -# -NODIST_HEADER_FILES = \ - $(LEMON_GENERATED_HEADER_FILES) - -# -# All Flex-generated source files. -# -FLEX_GENERATED_SRC_FILES = \ - $(FLEX_GENERATED_C_FILES) \ - $(FLEX_GENERATED_CPP_FILES) - -# -# All Lemon-generated source files. -# -LEMON_GENERATED_SRC_FILES = \ - $(LEMON_GENERATED_C_FILES) \ - $(LEMON_GENERATED_CPP_FILES) - -# -# All generated source files. -# -GENERATED_SRC_FILES = \ - $(FLEX_GENERATED_SRC_FILES) \ - $(LEMON_GENERATED_SRC_FILES) - -# -# All generated header files. -# -GENERATED_HEADER_FILES = \ - $(FLEX_GENERATED_HEADER_FILES) \ - $(LEMON_GENERATED_HEADER_FILES) - -# -# All "clean" source files; they can be compiled with the regular -# warning options, including -Werror with GCC-compatible compilers, -# and can be run through checkAPI. Neither Flex-generated nor -# Lemon-generated files can currently be guaranteed to be clean. -# -CLEAN_SRC_FILES = \ - $(NONGENERATED_C_FILES) \ - $(NONGENERATED_CPP_FILES) - -# C source files -C_FILES = \ - $(FLEX_GENERATED_C_FILES) \ - $(LEMON_GENERATED_C_FILES) \ - $(NONGENERATED_C_FILES) - -# C++ source files -CPP_FILES = \ - $(FLEX_GENERATED_CPP_FILES) \ - $(LEMON_GENERATED_CPP_FILES) \ - $(NONGENERATED_CPP_FILES) diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index 39cda1e095..4bae2791c1 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for DOCSIS plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,74 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = docsis + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-bintrngreq.c \ + packet-bpkmattr.c \ + packet-bpkmreq.c \ + packet-bpkmrsp.c \ + packet-cmctrlreq.c \ + packet-cmctrlrsp.c \ + packet-cmstatus.c \ + packet-intrngreq.c \ + packet-dbcreq.c \ + packet-dbcrsp.c \ + packet-dbcack.c \ + packet-dccack.c \ + packet-dccreq.c \ + packet-dccrsp.c \ + packet-dcd.c \ + packet-dpvreq.c \ + packet-dpvrsp.c \ + packet-docsis.c \ + packet-dsaack.c \ + packet-dsareq.c \ + packet-dsarsp.c \ + packet-dscack.c \ + packet-dscreq.c \ + packet-dscrsp.c \ + packet-dsdreq.c \ + packet-dsdrsp.c \ + packet-macmgmt.c \ + packet-map.c \ + packet-mdd.c \ + packet-ocd.c \ + packet-regack.c \ + packet-regreq.c \ + packet-regreqmp.c \ + packet-regrsp.c \ + packet-regrspmp.c \ + packet-rngreq.c \ + packet-rngrsp.c \ + packet-sync.c \ + packet-tlv.c \ + packet-tlv-cmctrl.c \ + packet-type29ucd.c \ + packet-type35ucd.c \ + packet-uccreq.c \ + packet-uccrsp.c \ + packet-ucd.c \ + packet-vendor.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +# Headers. +CLEAN_HEADER_FILES = \ + packet-tlv.h + +HEADER_FILES = \ + $(FLEX_GENERATED_HEADER_FILES) \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = docsis.la docsis_la_SOURCES = \ @@ -47,7 +108,6 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ README \ CMakeLists.txt diff --git a/plugins/docsis/Makefile.common b/plugins/docsis/Makefile.common deleted file mode 100644 index 0e3085904a..0000000000 --- a/plugins/docsis/Makefile.common +++ /dev/null @@ -1,88 +0,0 @@ -# Makefile.common for DOCSIS plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = docsis - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-bintrngreq.c \ - packet-bpkmattr.c \ - packet-bpkmreq.c \ - packet-bpkmrsp.c \ - packet-cmctrlreq.c \ - packet-cmctrlrsp.c \ - packet-cmstatus.c \ - packet-intrngreq.c \ - packet-dbcreq.c \ - packet-dbcrsp.c \ - packet-dbcack.c \ - packet-dccack.c \ - packet-dccreq.c \ - packet-dccrsp.c \ - packet-dcd.c \ - packet-dpvreq.c \ - packet-dpvrsp.c \ - packet-docsis.c \ - packet-dsaack.c \ - packet-dsareq.c \ - packet-dsarsp.c \ - packet-dscack.c \ - packet-dscreq.c \ - packet-dscrsp.c \ - packet-dsdreq.c \ - packet-dsdrsp.c \ - packet-macmgmt.c \ - packet-map.c \ - packet-mdd.c \ - packet-ocd.c \ - packet-regack.c \ - packet-regreq.c \ - packet-regreqmp.c \ - packet-regrsp.c \ - packet-regrspmp.c \ - packet-rngreq.c \ - packet-rngrsp.c \ - packet-sync.c \ - packet-tlv.c \ - packet-tlv-cmctrl.c \ - packet-type29ucd.c \ - packet-type35ucd.c \ - packet-uccreq.c \ - packet-uccrsp.c \ - packet-ucd.c \ - packet-vendor.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) - -# Headers. -CLEAN_HEADER_FILES = \ - packet-tlv.h - -HEADER_FILES = \ - $(FLEX_GENERATED_HEADER_FILES) \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/easy_codec/Makefile.am b/plugins/easy_codec/Makefile.am index e3ffb3cf92..b24f1d3936 100644 --- a/plugins/easy_codec/Makefile.am +++ b/plugins/easy_codec/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for the easy_codec plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -19,12 +18,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.common +# the name of the plugin +PLUGIN_NAME = easy_codec + +# Non-generated sources +NONGENERATED_C_FILES = \ + easy_codec_plugin.c \ + codec-g729a.c \ + codec-g7231.c \ + codec-g722.c + +# Headers. +CLEAN_HEADER_FILES = \ + codec-g729a.h \ + codec-g7231.h \ + codec-g722.h + +HEADER_FILES = \ + $(FLEX_GENERATED_HEADER_FILES) \ + $(CLEAN_HEADER_FILES) EXTRA_DIST = \ $(NONGENERATED_C_FILES) \ $(CLEAN_HEADER_FILES) \ - Makefile.common \ plugin.rc.in \ ReadMe.txt diff --git a/plugins/easy_codec/Makefile.common b/plugins/easy_codec/Makefile.common deleted file mode 100644 index 3fd0ac602c..0000000000 --- a/plugins/easy_codec/Makefile.common +++ /dev/null @@ -1,44 +0,0 @@ -# Makefile.common for Easy codec plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = easy_codec - -# Non-generated sources -NONGENERATED_C_FILES = \ - easy_codec_plugin.c \ - codec-g729a.c \ - codec-g7231.c \ - codec-g722.c - -# Headers. -CLEAN_HEADER_FILES = \ - codec-g729a.h \ - codec-g7231.h \ - codec-g722.h - -HEADER_FILES = \ - $(FLEX_GENERATED_HEADER_FILES) \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index ef85f4189d..c1bedc99e8 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for EtherCAT plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,39 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = ethercat + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-ams.c \ + packet-ecatmb.c \ + packet-esl.c \ + packet-ethercat-datagram.c \ + packet-ethercat-frame.c \ + packet-ioraw.c \ + packet-nv.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +# Headers. +CLEAN_HEADER_FILES = \ + packet-ams.h \ + packet-ecatmb.h \ + packet-ethercat-datagram.h \ + packet-ethercat-frame.h \ + packet-ioraw.h \ + packet-nv.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = ethercat.la ethercat_la_SOURCES = \ @@ -47,6 +73,5 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/ethercat/Makefile.common b/plugins/ethercat/Makefile.common deleted file mode 100644 index 6a39cff77d..0000000000 --- a/plugins/ethercat/Makefile.common +++ /dev/null @@ -1,53 +0,0 @@ -# Makefile.common for EtherCAT plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = ethercat - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-ams.c \ - packet-ecatmb.c \ - packet-esl.c \ - packet-ethercat-datagram.c \ - packet-ethercat-frame.c \ - packet-ioraw.c \ - packet-nv.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) - -# Headers. -CLEAN_HEADER_FILES = \ - packet-ams.h \ - packet-ecatmb.h \ - packet-ethercat-datagram.h \ - packet-ethercat-frame.h \ - packet-ioraw.h \ - packet-nv.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index 9028d6d9eb..f1896282c6 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -1,7 +1,4 @@ # Makefile.am -# Automake file for Gryphon plugin -# By Steve Limkemann <stevelim@dgtech.com> -# Copyright 1998 Steve Limkemann # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -20,12 +17,28 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = gryphon + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-gryphon.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +# Headers. +CLEAN_HEADER_FILES = \ + packet-gryphon.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = gryphon.la gryphon_la_SOURCES = \ @@ -49,6 +62,5 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/gryphon/Makefile.common b/plugins/gryphon/Makefile.common deleted file mode 100644 index 52958ec54b..0000000000 --- a/plugins/gryphon/Makefile.common +++ /dev/null @@ -1,42 +0,0 @@ -# Makefile.common for Gryphon plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = gryphon - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-gryphon.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) - -# Headers. -CLEAN_HEADER_FILES = \ - packet-gryphon.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index f9a11d5d47..afbec5f504 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for IrDA plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,30 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = irda + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-ircomm.c \ + packet-irda.c \ + packet-sir.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +# Headers. +CLEAN_HEADER_FILES = \ + irda-appl.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = irda.la irda_la_SOURCES = \ @@ -53,6 +70,5 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/irda/Makefile.common b/plugins/irda/Makefile.common deleted file mode 100644 index 6bc31cd240..0000000000 --- a/plugins/irda/Makefile.common +++ /dev/null @@ -1,44 +0,0 @@ -# Makefile.common for IrDA plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = irda - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-ircomm.c \ - packet-irda.c \ - packet-sir.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) - -# Headers. -CLEAN_HEADER_FILES = \ - irda-appl.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am index 41114481c1..e1aa3e88ed 100644 --- a/plugins/m2m/Makefile.am +++ b/plugins/m2m/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for M2M plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,23 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = m2m + +# the dissector sources (without any helpers) +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-m2m.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) \ + wimax_tlv.c + plugin_LTLIBRARIES = m2m.la m2m_la_SOURCES = \ @@ -47,6 +57,5 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/m2m/Makefile.common b/plugins/m2m/Makefile.common deleted file mode 100644 index 4070690d38..0000000000 --- a/plugins/m2m/Makefile.common +++ /dev/null @@ -1,37 +0,0 @@ -# Makefile.common for M2M plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = m2m - -# the dissector sources (without any helpers) -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-m2m.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) \ - wimax_tlv.c - -include ../Makefile.common.inc diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index ec98924550..a3fa4c6042 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for MATE Wireshark plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,51 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = mate + +# +# Files generated by Flex. +# +FLEX_GENERATED_C_FILES = \ + mate_parser.c + +FLEX_GENERATED_HEADER_FILES = \ + mate_parser_lex.h + +# +# Files generated by Lemon. +# +LEMON_GENERATED_C_FILES = \ + mate_grammar.c + +LEMON_GENERATED_HEADER_FILES = \ + mate_grammar.h + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-mate.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) \ + mate_setup.c \ + mate_runtime.c \ + mate_util.c + +# Headers. +CLEAN_HEADER_FILES = \ + mate.h \ + mate_util.h + +HEADER_FILES = \ + $(FLEX_GENERATED_HEADER_FILES) \ + $(CLEAN_HEADER_FILES) + # # XXX - how to make this apply only to clean files? # @@ -71,7 +109,6 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ mate_grammar.lemon \ mate_parser.l \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt \ examples/call.mate \ diff --git a/plugins/mate/Makefile.common b/plugins/mate/Makefile.common deleted file mode 100644 index 4395d23acb..0000000000 --- a/plugins/mate/Makefile.common +++ /dev/null @@ -1,65 +0,0 @@ -# Makefile.common for mate plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = mate - -# -# Files generated by Flex. -# -FLEX_GENERATED_C_FILES = \ - mate_parser.c - -FLEX_GENERATED_HEADER_FILES = \ - mate_parser_lex.h - -# -# Files generated by Lemon. -# -LEMON_GENERATED_C_FILES = \ - mate_grammar.c - -LEMON_GENERATED_HEADER_FILES = \ - mate_grammar.h - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-mate.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) \ - mate_setup.c \ - mate_runtime.c \ - mate_util.c - -# Headers. -CLEAN_HEADER_FILES = \ - mate.h \ - mate_util.h - -HEADER_FILES = \ - $(FLEX_GENERATED_HEADER_FILES) \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index 94279a1788..391635319c 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for OpcUa plugin # # Adapted by Gerhard Gappmeier for OpcUa # Wireshark - Network traffic analyzer @@ -19,12 +18,51 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = opcua + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + opcua.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) \ + opcua_transport_layer.c \ + opcua_security_layer.c \ + opcua_application_layer.c \ + opcua_serviceparser.c \ + opcua_complextypeparser.c \ + opcua_enumparser.c \ + opcua_simpletypes.c \ + opcua_servicetable.c \ + opcua_extensionobjecttable.c \ + opcua_hfindeces.c \ + opcua_statuscode.c + +# Headers. +CLEAN_HEADER_FILES = \ + opcua_complextypeparser.h \ + opcua_enumparser.h \ + opcua_hfindeces.h \ + opcua_statuscode.h \ + opcua_identifiers.h \ + opcua_serviceparser.h \ + opcua_simpletypes.h \ + opcua_servicetable.h \ + opcua_application_layer.h \ + opcua_security_layer.h \ + opcua_transport_layer.h \ + opcua_extensionobjectids.h \ + opcua_serviceids.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = opcua.la opcua_la_SOURCES = \ @@ -48,7 +86,6 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ README \ CMakeLists.txt diff --git a/plugins/opcua/Makefile.common b/plugins/opcua/Makefile.common deleted file mode 100644 index a7781f7587..0000000000 --- a/plugins/opcua/Makefile.common +++ /dev/null @@ -1,66 +0,0 @@ -# Makefile.common for OpcUa plugin -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Adapted by Gerhard Gappmeier for OpcUa -# 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. - -# the name of the plugin -PLUGIN_NAME = opcua - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - opcua.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) \ - opcua_transport_layer.c \ - opcua_security_layer.c \ - opcua_application_layer.c \ - opcua_serviceparser.c \ - opcua_complextypeparser.c \ - opcua_enumparser.c \ - opcua_simpletypes.c \ - opcua_servicetable.c \ - opcua_extensionobjecttable.c \ - opcua_hfindeces.c \ - opcua_statuscode.c - -# Headers. -CLEAN_HEADER_FILES = \ - opcua_complextypeparser.h \ - opcua_enumparser.h \ - opcua_hfindeces.h \ - opcua_statuscode.h \ - opcua_identifiers.h \ - opcua_serviceparser.h \ - opcua_simpletypes.h \ - opcua_servicetable.h \ - opcua_application_layer.h \ - opcua_security_layer.h \ - opcua_transport_layer.h \ - opcua_extensionobjectids.h \ - opcua_serviceids.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index e650ce0bbe..b48d696bb5 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for PROFINET plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,38 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = profinet + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-dcerpc-pn-io.c \ + packet-dcom-cba.c \ + packet-dcom-cba-acco.c \ + packet-pn-dcp.c \ + packet-pn-mrp.c \ + packet-pn-mrrt.c \ + packet-pn-ptcp.c \ + packet-pn-rt.c \ + packet-pn-rtc-one.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) \ + packet-pn.c + +# Headers. +CLEAN_HEADER_FILES = \ + packet-dcom-cba-acco.h \ + packet-pn.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = profinet.la profinet_la_SOURCES = \ @@ -47,6 +72,5 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/profinet/Makefile.common b/plugins/profinet/Makefile.common deleted file mode 100644 index 49c63f0c1a..0000000000 --- a/plugins/profinet/Makefile.common +++ /dev/null @@ -1,52 +0,0 @@ -# Makefile.common for PROFINET plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = profinet - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-dcerpc-pn-io.c \ - packet-dcom-cba.c \ - packet-dcom-cba-acco.c \ - packet-pn-dcp.c \ - packet-pn-mrp.c \ - packet-pn-mrrt.c \ - packet-pn-ptcp.c \ - packet-pn-rt.c \ - packet-pn-rtc-one.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) \ - packet-pn.c - -# Headers. -CLEAN_HEADER_FILES = \ - packet-dcom-cba-acco.h \ - packet-pn.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am index fe1f099439..ab1704f907 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/stats_tree/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for stats_tree Wireshark plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,26 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = stats_tree + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) \ + stats_tree_plugin.c \ + pinfo_stats_tree.c + +# Headers. +CLEAN_HEADER_FILES = \ + pinfo_stats_tree.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = stats_tree.la stats_tree_la_SOURCES = \ @@ -44,6 +57,5 @@ MAINTAINERCLEANFILES = \ Makefile.in EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/stats_tree/Makefile.common b/plugins/stats_tree/Makefile.common deleted file mode 100644 index b3ed2f30a1..0000000000 --- a/plugins/stats_tree/Makefile.common +++ /dev/null @@ -1,40 +0,0 @@ -# Makefile.common for stats tree plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = stats_tree - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) \ - stats_tree_plugin.c \ - pinfo_stats_tree.c - -# Headers. -CLEAN_HEADER_FILES = \ - pinfo_stats_tree.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am index 890d289132..930043fea9 100644 --- a/plugins/tpg/Makefile.am +++ b/plugins/tpg/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for MATE Wireshark plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -20,7 +19,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -include Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index 2664f724db..df5f4d7e36 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -1,6 +1,4 @@ # Makefile.am -# Automake file for Nortel Unistim plugin -# Copyright 2007, Don Newton <dnewton@cypresscom.net> # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -19,12 +17,37 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = unistim + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-unistim.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +# Headers. +CLEAN_HEADER_FILES = \ + audio.h \ + basic.h \ + broadcast.h \ + defines.h \ + display.h \ + expansion.h \ + key.h \ + network.h \ + uftp.h \ + packet-unistim.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = unistim.la unistim_la_SOURCES = \ @@ -48,6 +71,5 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/unistim/Makefile.common b/plugins/unistim/Makefile.common deleted file mode 100644 index 3d059764f6..0000000000 --- a/plugins/unistim/Makefile.common +++ /dev/null @@ -1,52 +0,0 @@ -# Makefile.common for unistim plugin -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# Copyright 2007 Don Newton <dnewton@cypresscom.net> -# -# 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. - -# the name of the plugin -PLUGIN_NAME = unistim - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-unistim.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) - -# Headers. -CLEAN_HEADER_FILES = \ - audio.h \ - basic.h \ - broadcast.h \ - defines.h \ - display.h \ - expansion.h \ - key.h \ - network.h \ - uftp.h \ - packet-unistim.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index e4d6bd64e2..5cfaa06276 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for Wireshark WiMAX Plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,75 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = wimax + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-wmx.c \ + wimax_cdma_code_decoder.c \ + wimax_compact_dlmap_ie_decoder.c \ + wimax_compact_ulmap_ie_decoder.c \ + wimax_fch_decoder.c \ + wimax_ffb_decoder.c \ + wimax_hack_decoder.c \ + wimax_harq_map_decoder.c \ + wimax_pdu_decoder.c \ + wimax_phy_attributes_decoder.c \ + mac_hd_generic_decoder.c \ + mac_hd_type1_decoder.c \ + mac_hd_type2_decoder.c \ + mac_mgmt_msg_decoder.c \ + msg_aas_fbck.c \ + msg_aas_beam.c \ + msg_arq.c \ + msg_clk_cmp.c \ + msg_dcd.c \ + msg_dlmap.c \ + msg_dreg.c \ + msg_dsa.c \ + msg_dsc.c \ + msg_dsd.c \ + msg_dsx_rvd.c \ + msg_fpc.c \ + msg_pkm.c \ + msg_pmc.c \ + msg_prc_lt_ctrl.c \ + msg_reg_req.c \ + msg_reg_rsp.c \ + msg_rep.c \ + msg_res_cmd.c \ + msg_rng_req.c \ + msg_rng_rsp.c \ + msg_sbc.c \ + msg_ucd.c \ + msg_ulmap.c \ + wimax_utils.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) \ + crc.c \ + crc_data.c \ + wimax_tlv.c + +# Headers. +CLEAN_HEADER_FILES = \ + crc.h \ + wimax_bits.h \ + wimax_compact_dlmap_ie_decoder.h \ + wimax_compact_ulmap_ie_decoder.h \ + wimax_mac.h \ + wimax_tlv.h \ + wimax_utils.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = wimax.la wimax_la_SOURCES = \ @@ -47,7 +109,6 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt \ README.wimax diff --git a/plugins/wimax/Makefile.common b/plugins/wimax/Makefile.common deleted file mode 100644 index 68f795e97f..0000000000 --- a/plugins/wimax/Makefile.common +++ /dev/null @@ -1,89 +0,0 @@ -# Makefile.common for WiMAX plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = wimax - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-wmx.c \ - wimax_cdma_code_decoder.c \ - wimax_compact_dlmap_ie_decoder.c \ - wimax_compact_ulmap_ie_decoder.c \ - wimax_fch_decoder.c \ - wimax_ffb_decoder.c \ - wimax_hack_decoder.c \ - wimax_harq_map_decoder.c \ - wimax_pdu_decoder.c \ - wimax_phy_attributes_decoder.c \ - mac_hd_generic_decoder.c \ - mac_hd_type1_decoder.c \ - mac_hd_type2_decoder.c \ - mac_mgmt_msg_decoder.c \ - msg_aas_fbck.c \ - msg_aas_beam.c \ - msg_arq.c \ - msg_clk_cmp.c \ - msg_dcd.c \ - msg_dlmap.c \ - msg_dreg.c \ - msg_dsa.c \ - msg_dsc.c \ - msg_dsd.c \ - msg_dsx_rvd.c \ - msg_fpc.c \ - msg_pkm.c \ - msg_pmc.c \ - msg_prc_lt_ctrl.c \ - msg_reg_req.c \ - msg_reg_rsp.c \ - msg_rep.c \ - msg_res_cmd.c \ - msg_rng_req.c \ - msg_rng_rsp.c \ - msg_sbc.c \ - msg_ucd.c \ - msg_ulmap.c \ - wimax_utils.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) \ - crc.c \ - crc_data.c \ - wimax_tlv.c - -# Headers. -CLEAN_HEADER_FILES = \ - crc.h \ - wimax_bits.h \ - wimax_compact_dlmap_ie_decoder.h \ - wimax_compact_ulmap_ie_decoder.h \ - wimax_mac.h \ - wimax_tlv.h \ - wimax_utils.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index 8aa916d36e..d86ca72aa8 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for wimaxasncp plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,38 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = wimaxasncp + +# +# Files generated by Flex. +# +FLEX_GENERATED_C_FILES = \ + wimaxasncp_dict.c + +FLEX_GENERATED_HEADER_FILES = \ + wimaxasncp_dict_lex.h + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-wimaxasncp.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +# Headers. +CLEAN_HEADER_FILES = \ + wimaxasncp_dict.h + +HEADER_FILES = \ + $(FLEX_GENERATED_HEADER_FILES) \ + $(CLEAN_HEADER_FILES) + # # XXX - how to make this apply only to clean files? # @@ -60,7 +85,6 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ wimaxasncp_dict.l \ CMakeLists.txt diff --git a/plugins/wimaxasncp/Makefile.common b/plugins/wimaxasncp/Makefile.common deleted file mode 100644 index 630c4c82ef..0000000000 --- a/plugins/wimaxasncp/Makefile.common +++ /dev/null @@ -1,52 +0,0 @@ -# Makefile.common for wimaxasncp plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = wimaxasncp - -# -# Files generated by Flex. -# -FLEX_GENERATED_C_FILES = \ - wimaxasncp_dict.c - -FLEX_GENERATED_HEADER_FILES = \ - wimaxasncp_dict_lex.h - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-wimaxasncp.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) - -# Headers. -CLEAN_HEADER_FILES = \ - wimaxasncp_dict.h - -HEADER_FILES = \ - $(FLEX_GENERATED_HEADER_FILES) \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am index d7b7360395..c4d79a08ce 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/wimaxmacphy/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for wimaxmacphy plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,28 @@ # 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 Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = wimaxmacphy + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-wimaxmacphy.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +# Headers. +CLEAN_HEADER_FILES = \ + packet-wimaxmacphy.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = wimaxmacphy.la wimaxmacphy_la_SOURCES = \ @@ -47,6 +62,5 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/wimaxmacphy/Makefile.common b/plugins/wimaxmacphy/Makefile.common deleted file mode 100644 index d8d9953d26..0000000000 --- a/plugins/wimaxmacphy/Makefile.common +++ /dev/null @@ -1,42 +0,0 @@ -# Makefile.common for wimaxmacphy plugin -# 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. - -# the name of the plugin -PLUGIN_NAME = wimaxmacphy - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-wimaxmacphy.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) - -# Headers. -CLEAN_HEADER_FILES = \ - packet-wimaxmacphy.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc |