diff options
| -rw-r--r-- | plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/Makefile.am.inc | 81 | ||||
| -rw-r--r-- | plugins/docsis/Makefile.am | 67 | ||||
| -rw-r--r-- | plugins/ethercat/Makefile.am | 67 | ||||
| -rw-r--r-- | plugins/gryphon/Makefile.am | 67 | ||||
| -rw-r--r-- | plugins/irda/Makefile.am | 67 | ||||
| -rw-r--r-- | plugins/m2m/Makefile.am | 67 | ||||
| -rw-r--r-- | plugins/mate/Makefile.am | 66 | ||||
| -rw-r--r-- | plugins/opcua/Makefile.am | 67 | ||||
| -rw-r--r-- | plugins/profinet/Makefile.am | 67 | ||||
| -rw-r--r-- | plugins/stats_tree/Makefile.am | 16 | ||||
| -rw-r--r-- | plugins/tpg/Makefile.am | 11 | ||||
| -rw-r--r-- | plugins/unistim/Makefile.am | 68 | ||||
| -rw-r--r-- | plugins/wimax/Makefile.am | 67 | ||||
| -rw-r--r-- | plugins/wimaxasncp/Makefile.am | 66 | ||||
| -rw-r--r-- | plugins/wimaxmacphy/Makefile.am | 67 |
16 files changed, 109 insertions, 804 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 3e0a7a9257..f12b3390b2 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -37,8 +37,6 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \ wimaxasncp \ wimaxmacphy -plugindir = @plugindir@ - EXTRA_DIST = \ $(_CUSTOM_EXTRA_DIST_) \ Makefile.common.inc \ diff --git a/plugins/Makefile.am.inc b/plugins/Makefile.am.inc new file mode 100644 index 0000000000..7513ca7912 --- /dev/null +++ b/plugins/Makefile.am.inc @@ -0,0 +1,81 @@ +# Makefile.am.inc +# Include file with common automake definitions for plugins +# +# 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. +# + +LIBS = @PLUGIN_LIBS@ + +PLUGIN_LDFLAGS = -module -avoid-version + +# +# 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 +# registration routines for all protocols. +# +# We do this by scanning sources. If that turns out to be too slow, +# maybe we could just require every .o file to have an register routine +# of a given name (packet-aarp.o -> proto_register_aarp, etc.). +# +# Formatting conventions: The name of the proto_register_* routines an +# proto_reg_handoff_* routines must start in column zero, or must be +# preceded only by "void " starting in column zero, and must not be +# inside #if. +# +# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. +# +# For some unknown reason, having a big "for" loop in the Makefile +# to scan all the files doesn't work with some "make"s; they seem to +# pass only the first few names in the list to the shell, for some +# reason. +# +# Therefore, we use a script to generate the register.c file. +# The first argument is the directory in which the source files live. +# The second argument is "plugin", to indicate that we should build +# 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 + @echo Making plugin.c + @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ + plugin $(REGISTER_SRC_FILES) + +# +# Currently plugin.c can be included in the distribution because +# we always build all protocol dissectors. We used to have to check +# whether or not to build the snmp dissector. If we again need to +# variably build something, making plugin.c non-portable, uncomment +# the dist-hook line below. +# +# Oh, yuk. We don't want to include "plugin.c" in the distribution, as +# its contents depend on the configuration, and therefore we want it +# to be built when the first "make" is done; however, Automake insists +# on putting *all* source into the distribution. +# +# We work around this by having a "dist-hook" rule that deletes +# "plugin.c", so that "dist" won't pick it up. +# +#dist-hook: +# @rm -f $(distdir)/plugin.c + +checkapi: + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ + -sourcedir=$(srcdir) \ + $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index b40f3c227f..39708d6c2d 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = docsis.la @@ -33,64 +32,7 @@ docsis_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -docsis_la_LDFLAGS = -module -avoid-version -docsis_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +docsis_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ docsis \ @@ -107,8 +49,3 @@ EXTRA_DIST = \ plugin.rc.in \ README \ CMakeLists.txt - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index ed61c3b575..427773e6ba 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = ethercat.la @@ -33,64 +32,7 @@ ethercat_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -ethercat_la_LDFLAGS = -module -avoid-version -ethercat_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +ethercat_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ ethercat \ @@ -106,8 +48,3 @@ EXTRA_DIST = \ moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index e77d4728b0..41e57a6871 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -24,8 +24,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = gryphon.la @@ -35,64 +34,7 @@ gryphon_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -gryphon_la_LDFLAGS = -module -avoid-version -gryphon_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +gryphon_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ gryphon \ @@ -108,8 +50,3 @@ EXTRA_DIST = \ moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index 7fa3b57dcc..a9a7d62189 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = irda.la @@ -33,64 +32,7 @@ irda_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -irda_la_LDFLAGS = -module -avoid-version -irda_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +irda_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ irda \ @@ -112,8 +54,3 @@ EXTRA_DIST = \ moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am index 4d04434431..e60b5f41f4 100644 --- a/plugins/m2m/Makefile.am +++ b/plugins/m2m/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = m2m.la @@ -33,64 +32,7 @@ m2m_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -m2m_la_LDFLAGS = -module -avoid-version -m2m_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +m2m_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ m2m \ @@ -106,8 +48,3 @@ EXTRA_DIST = \ moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 3214887c74..634a9b4b94 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -22,6 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc +include ../Makefile.am.inc # # XXX - how to make this apply only to clean files? @@ -30,8 +31,6 @@ include $(top_srcdir)/Makefile.am.inc #AM_CFLAGS += -Werror #endif -plugindir = @plugindir@ - plugin_LTLIBRARIES = mate.la mate_la_SOURCES = \ @@ -45,64 +44,8 @@ nodist_mate_la_SOURCES = \ $(NODIST_HEADER_FILES) mate_la_CFLAGS = $(GENERATED_CFLAGS) -mate_la_LDFLAGS = -module -avoid-version -mate_la_LIBADD = @PLUGIN_LIBS@ -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +mate_la_LDFLAGS = $(PLUGIN_LDFLAGS) BUILT_SOURCES = \ $(LEMON_GENERATED_HEADER_FILES) @@ -150,8 +93,3 @@ mate_grammar.h : mate_grammar.c mate_grammar.c : mate_grammar.lemon mate.h mate_util.h $(LEMON) $(AM_V_LEMON)$(LEMON) T=$(lemon_srcdir)/lempar.c $(srcdir)/mate_grammar.lemon || \ (rm -f grammar.c grammar.h ; false) - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index 5b0770a6e2..97358600d9 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -23,8 +23,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = opcua.la @@ -34,64 +33,7 @@ opcua_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -opcua_la_LDFLAGS = -module -avoid-version -opcua_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +opcua_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ opcua \ @@ -108,8 +50,3 @@ EXTRA_DIST = \ plugin.rc.in \ README \ CMakeLists.txt - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index 5df2178f14..e15192daff 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = profinet.la @@ -33,64 +32,7 @@ profinet_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -profinet_la_LDFLAGS = -module -avoid-version -profinet_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +profinet_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ profinet \ @@ -106,8 +48,3 @@ EXTRA_DIST = \ moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am index 02b2b6815a..065a2964e2 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/stats_tree/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = stats_tree.la @@ -31,13 +30,7 @@ stats_tree_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -stats_tree_la_LDFLAGS = -module -avoid-version -stats_tree_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = +stats_tree_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ stats_tree \ @@ -52,8 +45,3 @@ EXTRA_DIST = \ moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am index ae7d302b2f..e45f8c880e 100644 --- a/plugins/tpg/Makefile.am +++ b/plugins/tpg/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = tpg.la @@ -33,13 +32,7 @@ tpg_la_SOURCES = \ http-parser.h \ packet-http.c -tpg_la_LDFLAGS = -module -avoid-version -tpg_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = +tpg_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ tpg \ diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index 7ace5332d5..10b576bf0f 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -23,8 +23,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = unistim.la @@ -34,64 +33,7 @@ unistim_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -unistim_la_LDFLAGS = -module -avoid-version -unistim_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +unistim_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ unistim \ @@ -107,9 +49,3 @@ EXTRA_DIST = \ moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt - - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index a5a799c2a9..7dea8a681f 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = wimax.la @@ -33,64 +32,7 @@ wimax_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -wimax_la_LDFLAGS = -module -avoid-version -wimax_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +wimax_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ wimax \ @@ -107,8 +49,3 @@ EXTRA_DIST = \ plugin.rc.in \ CMakeLists.txt \ README.wimax - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index bd02bc0b40..6f3d00c492 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -22,6 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc +include ../Makefile.am.inc # # XXX - how to make this apply only to clean files? @@ -30,8 +31,6 @@ include $(top_srcdir)/Makefile.am.inc #AM_CFLAGS += -Werror #endif -plugindir = @plugindir@ - plugin_LTLIBRARIES = wimaxasncp.la wimaxasncp_la_SOURCES = \ @@ -41,64 +40,8 @@ wimaxasncp_la_SOURCES = \ $(HEADER_FILES) wimaxasncp_la_CFLAGS = $(GENERATED_CFLAGS) -wimaxasncp_la_LDFLAGS = -module -avoid-version -wimaxasncp_la_LIBADD = @PLUGIN_LIBS@ -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +wimaxasncp_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ wimaxasncp \ @@ -127,8 +70,3 @@ wimaxasncp_dict.c: wimaxasncp_dict.h # subdirectory of $(pkgdatadir) # wimaxasncpdir = $(pkgdatadir)/wimaxasncp - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am index 0bb38d7223..b6c89efbdc 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/wimaxmacphy/Makefile.am @@ -22,8 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc - -plugindir = @plugindir@ +include ../Makefile.am.inc plugin_LTLIBRARIES = wimaxmacphy.la @@ -33,64 +32,7 @@ wimaxmacphy_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -wimaxmacphy_la_LDFLAGS = -module -avoid-version -wimaxmacphy_la_LIBADD = @PLUGIN_LIBS@ - -# Libs must be cleared, or else libtool won't create a shared module. -# If your module needs to be linked against any particular libraries, -# add them here. -LIBS = - -# -# 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 -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# 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 - @echo Making plugin.c - @$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \ - plugin $(REGISTER_SRC_FILES) - -# -# Currently plugin.c can be included in the distribution because -# we always build all protocol dissectors. We used to have to check -# whether or not to build the snmp dissector. If we again need to -# variably build something, making plugin.c non-portable, uncomment -# the dist-hook line below. -# -# Oh, yuk. We don't want to include "plugin.c" in the distribution, as -# its contents depend on the configuration, and therefore we want it -# to be built when the first "make" is done; however, Automake insists -# on putting *all* source into the distribution. -# -# We work around this by having a "dist-hook" rule that deletes -# "plugin.c", so that "dist" won't pick it up. -# -#dist-hook: -# @rm -f $(distdir)/plugin.c +wimaxmacphy_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ wimaxmacphy \ @@ -106,8 +48,3 @@ EXTRA_DIST = \ moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt - -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) |