diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-10-18 23:37:49 +0100 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2017-10-20 04:37:16 +0000 |
commit | e6e8b7b662419466a264201a6d08af2dc9a737e9 (patch) | |
tree | a4fbb48640dacaeaca3926ff7470a211d24b37d4 /plugins | |
parent | d64c300522ffa830e061adeb81e75255b3f955ac (diff) |
autotools: Sort out how we handle plugin.c
Change-Id: Ie9570a63a1479021753807f76dd5e98fbbec7b86
Reviewed-on: https://code.wireshark.org/review/23995
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Makefile.am.inc | 20 | ||||
-rw-r--r-- | plugins/docsis/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/ethercat/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/gryphon/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/irda/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/mate/Makefile.am | 13 | ||||
-rw-r--r-- | plugins/opcua/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/pluginifdemo/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/profinet/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/transum/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/unistim/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/wimax/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/wimaxasncp/Makefile.am | 13 | ||||
-rw-r--r-- | plugins/wimaxmacphy/Makefile.am | 7 |
14 files changed, 82 insertions, 41 deletions
diff --git a/plugins/Makefile.am.inc b/plugins/Makefile.am.inc index 5d905c2840..0f58a827b7 100644 --- a/plugins/Makefile.am.inc +++ b/plugins/Makefile.am.inc @@ -147,7 +147,7 @@ CPP_FILES = \ $(NONGENERATED_CPP_FILES) # -# Build plugin.c, which contains the plugin version[] string, a +# 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. @@ -179,24 +179,6 @@ plugin.c: $(REGISTER_SRC_FILES) $(top_srcdir)/tools/make-dissector-reg.py @$(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) \ diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index d497f1db54..84c966a008 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -24,6 +24,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = docsis +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ packet-docsis.c \ @@ -46,11 +49,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = docsis.la docsis_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_docsis_la_SOURCES = \ + plugin.c + docsis_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) docsis_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index 70bf2a7e0c..3605caffdc 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -24,6 +24,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = ethercat +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ packet-ams.c \ @@ -53,11 +56,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = ethercat.la ethercat_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_ethercat_la_SOURCES = \ + plugin.c + ethercat_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) ethercat_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index 26e76c1ae9..0cc60840ae 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -24,6 +24,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = gryphon +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ packet-gryphon.c @@ -42,11 +45,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = gryphon.la gryphon_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_gryphon_la_SOURCES = \ + plugin.c + gryphon_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) gryphon_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index f164717aa5..a477f539aa 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -24,6 +24,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = irda +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ packet-ircomm.c \ @@ -44,11 +47,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = irda.la irda_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_irda_la_SOURCES = \ + plugin.c + irda_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) irda_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 710e11a9c9..63cf870735 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -24,6 +24,11 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = mate +BUILT_SOURCES = \ + plugin.c \ + $(LEMON_GENERATED_HEADER_FILES) \ + $(FLEX_GENERATED_HEADER_FILES) + # # Files generated by Flex. # @@ -72,14 +77,14 @@ HEADER_FILES = \ plugin_LTLIBRARIES = mate.la mate_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) nodist_mate_la_SOURCES = \ $(NODIST_SRC_FILES) \ - $(NODIST_HEADER_FILES) + $(NODIST_HEADER_FILES) \ + plugin.c mate_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) @@ -87,10 +92,6 @@ mate_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) mate_la_LDFLAGS = $(PLUGIN_LDFLAGS) -BUILT_SOURCES = \ - $(LEMON_GENERATED_HEADER_FILES) \ - $(FLEX_GENERATED_HEADER_FILES) - CLEANFILES = \ mate \ *~ diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index bf6e274fde..af3ab23435 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -25,6 +25,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = opcua +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ opcua.c @@ -66,11 +69,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = opcua.la opcua_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_opcua_la_SOURCES = \ + plugin.c + opcua_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) opcua_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) diff --git a/plugins/pluginifdemo/Makefile.am b/plugins/pluginifdemo/Makefile.am index e4a2b1a81e..020dad7aff 100644 --- a/plugins/pluginifdemo/Makefile.am +++ b/plugins/pluginifdemo/Makefile.am @@ -24,6 +24,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = pluginifdemo +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ pluginifdemo.c @@ -42,11 +45,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = pluginifdemo.la pluginifdemo_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_pluginifdemo_la_SOURCES = \ + plugin.c + pluginifdemo_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) pluginifdemo_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index 5f4e67e520..7bbfe6c618 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -24,6 +24,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = profinet +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ packet-dcerpc-pn-io.c \ @@ -52,11 +55,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = profinet.la profinet_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_profinet_la_SOURCES = \ + plugin.c + profinet_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) profinet_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) diff --git a/plugins/transum/Makefile.am b/plugins/transum/Makefile.am index d2910c695e..05b3dfcdd3 100644 --- a/plugins/transum/Makefile.am +++ b/plugins/transum/Makefile.am @@ -24,6 +24,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = transum +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ packet-transum.c @@ -47,11 +50,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = transum.la transum_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_transum_la_SOURCES = \ + plugin.c + transum_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) transum_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index 397e300aca..783277cfc2 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -24,6 +24,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = unistim +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ packet-unistim.c @@ -51,11 +54,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = unistim.la unistim_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_unistim_la_SOURCES = \ + plugin.c + unistim_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) unistim_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index cfb9aacfb2..748c76b4ec 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -24,6 +24,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = wimax +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ packet-m2m.c \ @@ -91,11 +94,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = wimax.la wimax_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_wimax_la_SOURCES = \ + plugin.c + wimax_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) wimax_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index 142ed7da55..ccc20edc89 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -24,6 +24,11 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = wimaxasncp +BUILT_SOURCES = \ + plugin.c \ + $(LEMON_GENERATED_HEADER_FILES) \ + $(FLEX_GENERATED_HEADER_FILES) + # # Files generated by Flex. # @@ -59,21 +64,19 @@ HEADER_FILES = \ plugin_LTLIBRARIES = wimaxasncp.la wimaxasncp_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_wimaxasncp_la_SOURCES = \ + plugin.c + wimaxasncp_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) wimaxasncp_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) wimaxasncp_la_LDFLAGS = $(PLUGIN_LDFLAGS) -BUILT_SOURCES = \ - $(LEMON_GENERATED_HEADER_FILES) \ - $(FLEX_GENERATED_HEADER_FILES) - CLEANFILES = \ wimaxasncp \ *~ diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am index 64ba6dfecd..7a7d2751ea 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/wimaxmacphy/Makefile.am @@ -24,6 +24,9 @@ include ../Makefile.am.inc # the name of the plugin PLUGIN_NAME = wimaxmacphy +BUILT_SOURCES = \ + plugin.c + # Non-generated sources to be scanned for registration routines NONGENERATED_REGISTER_C_FILES = \ packet-wimaxmacphy.c @@ -42,11 +45,13 @@ HEADER_FILES = \ plugin_LTLIBRARIES = wimaxmacphy.la wimaxmacphy_la_SOURCES = \ - plugin.c \ moduleinfo.h \ $(SRC_FILES) \ $(HEADER_FILES) +nodist_wimaxmacphy_la_SOURCES = \ + plugin.c + wimaxmacphy_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) wimaxmacphy_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) |