aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2018-01-15 12:40:55 +0000
committerJoão Valverde <j@v6e.pt>2018-01-16 08:51:37 +0000
commit5352ef42f94b5c14a24eb2e5559440c71fdcae8f (patch)
tree22901b1d228d76360b22af10021564bcee36390e
parenta069a4f856c29b25bae05f2a91d7b2b71e1905f3 (diff)
plugins: Add source tree subfolder for plugin library
This allows some simplification and makes things more consistent, particularly for loading plugins from the build dir. Also fixes the issue reported here: https://www.wireshark.org/lists/wireshark-dev/201801/msg00061.html Change-Id: I0d8a000ee679172bccad546a3b0c47a79486f44d Reviewed-on: https://code.wireshark.org/review/25329 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r--CMakeLists.txt26
-rw-r--r--cmake/modules/WiresharkPlugin.cmake12
-rw-r--r--configure.ac26
-rw-r--r--plugins/Custom.m4.example2
-rw-r--r--plugins/Custom.make.example2
-rw-r--r--plugins/Makefile.am26
-rw-r--r--plugins/epan/docsis/AUTHORS (renamed from plugins/docsis/AUTHORS)0
-rw-r--r--plugins/epan/docsis/CMakeLists.txt (renamed from plugins/docsis/CMakeLists.txt)0
-rw-r--r--plugins/epan/docsis/ChangeLog (renamed from plugins/docsis/ChangeLog)0
-rw-r--r--plugins/epan/docsis/Makefile.am (renamed from plugins/docsis/Makefile.am)2
-rw-r--r--plugins/epan/docsis/README (renamed from plugins/docsis/README)0
-rw-r--r--plugins/epan/docsis/packet-docsis.c (renamed from plugins/docsis/packet-docsis.c)0
-rw-r--r--plugins/epan/docsis/packet-macmgmt.c (renamed from plugins/docsis/packet-macmgmt.c)0
-rw-r--r--plugins/epan/docsis/packet-tlv.c (renamed from plugins/docsis/packet-tlv.c)0
-rw-r--r--plugins/epan/docsis/packet-tlv.h (renamed from plugins/docsis/packet-tlv.h)0
-rw-r--r--plugins/epan/docsis/packet-vendor.c (renamed from plugins/docsis/packet-vendor.c)0
-rw-r--r--plugins/epan/ethercat/AUTHORS (renamed from plugins/ethercat/AUTHORS)0
-rw-r--r--plugins/epan/ethercat/CMakeLists.txt (renamed from plugins/ethercat/CMakeLists.txt)0
-rw-r--r--plugins/epan/ethercat/Makefile.am (renamed from plugins/ethercat/Makefile.am)2
-rw-r--r--plugins/epan/ethercat/packet-ams.c (renamed from plugins/ethercat/packet-ams.c)0
-rw-r--r--plugins/epan/ethercat/packet-ams.h (renamed from plugins/ethercat/packet-ams.h)0
-rw-r--r--plugins/epan/ethercat/packet-ecatmb.c (renamed from plugins/ethercat/packet-ecatmb.c)0
-rw-r--r--plugins/epan/ethercat/packet-ecatmb.h (renamed from plugins/ethercat/packet-ecatmb.h)0
-rw-r--r--plugins/epan/ethercat/packet-esl.c (renamed from plugins/ethercat/packet-esl.c)0
-rw-r--r--plugins/epan/ethercat/packet-ethercat-datagram.c (renamed from plugins/ethercat/packet-ethercat-datagram.c)0
-rw-r--r--plugins/epan/ethercat/packet-ethercat-datagram.h (renamed from plugins/ethercat/packet-ethercat-datagram.h)0
-rw-r--r--plugins/epan/ethercat/packet-ethercat-frame.c (renamed from plugins/ethercat/packet-ethercat-frame.c)0
-rw-r--r--plugins/epan/ethercat/packet-ethercat-frame.h (renamed from plugins/ethercat/packet-ethercat-frame.h)0
-rw-r--r--plugins/epan/ethercat/packet-ioraw.c (renamed from plugins/ethercat/packet-ioraw.c)0
-rw-r--r--plugins/epan/ethercat/packet-ioraw.h (renamed from plugins/ethercat/packet-ioraw.h)0
-rw-r--r--plugins/epan/ethercat/packet-nv.c (renamed from plugins/ethercat/packet-nv.c)0
-rw-r--r--plugins/epan/ethercat/packet-nv.h (renamed from plugins/ethercat/packet-nv.h)0
-rw-r--r--plugins/epan/gryphon/AUTHORS (renamed from plugins/gryphon/AUTHORS)0
-rw-r--r--plugins/epan/gryphon/CMakeLists.txt (renamed from plugins/gryphon/CMakeLists.txt)0
-rw-r--r--plugins/epan/gryphon/Makefile.am (renamed from plugins/gryphon/Makefile.am)2
-rw-r--r--plugins/epan/gryphon/README (renamed from plugins/gryphon/README)0
-rw-r--r--plugins/epan/gryphon/packet-gryphon.c (renamed from plugins/gryphon/packet-gryphon.c)0
-rw-r--r--plugins/epan/gryphon/packet-gryphon.h (renamed from plugins/gryphon/packet-gryphon.h)0
-rw-r--r--plugins/epan/irda/CMakeLists.txt (renamed from plugins/irda/CMakeLists.txt)0
-rw-r--r--plugins/epan/irda/Makefile.am (renamed from plugins/irda/Makefile.am)2
-rw-r--r--plugins/epan/irda/irda-appl.h (renamed from plugins/irda/irda-appl.h)0
-rw-r--r--plugins/epan/irda/packet-ircomm.c (renamed from plugins/irda/packet-ircomm.c)0
-rw-r--r--plugins/epan/irda/packet-irda.c (renamed from plugins/irda/packet-irda.c)0
-rw-r--r--plugins/epan/irda/packet-sir.c (renamed from plugins/irda/packet-sir.c)0
-rw-r--r--plugins/epan/mate/AUTHORS (renamed from plugins/mate/AUTHORS)0
-rw-r--r--plugins/epan/mate/CMakeLists.txt (renamed from plugins/mate/CMakeLists.txt)0
-rw-r--r--plugins/epan/mate/Makefile.am (renamed from plugins/mate/Makefile.am)2
-rw-r--r--plugins/epan/mate/examples/call.mate (renamed from plugins/mate/examples/call.mate)0
-rw-r--r--plugins/epan/mate/examples/mms.mate (renamed from plugins/mate/examples/mms.mate)0
-rw-r--r--plugins/epan/mate/examples/pasv_ftp.mate (renamed from plugins/mate/examples/pasv_ftp.mate)0
-rw-r--r--plugins/epan/mate/examples/tcp.mate (renamed from plugins/mate/examples/tcp.mate)0
-rw-r--r--plugins/epan/mate/examples/web.mate (renamed from plugins/mate/examples/web.mate)0
-rw-r--r--plugins/epan/mate/mate.h (renamed from plugins/mate/mate.h)0
-rw-r--r--plugins/epan/mate/mate_grammar.lemon (renamed from plugins/mate/mate_grammar.lemon)0
-rw-r--r--plugins/epan/mate/mate_parser.l (renamed from plugins/mate/mate_parser.l)0
-rw-r--r--plugins/epan/mate/mate_runtime.c (renamed from plugins/mate/mate_runtime.c)0
-rw-r--r--plugins/epan/mate/mate_setup.c (renamed from plugins/mate/mate_setup.c)0
-rw-r--r--plugins/epan/mate/mate_util.c (renamed from plugins/mate/mate_util.c)0
-rw-r--r--plugins/epan/mate/mate_util.h (renamed from plugins/mate/mate_util.h)0
-rw-r--r--plugins/epan/mate/matelib/dns.mate (renamed from plugins/mate/matelib/dns.mate)0
-rw-r--r--plugins/epan/mate/matelib/h225_ras.mate (renamed from plugins/mate/matelib/h225_ras.mate)0
-rw-r--r--plugins/epan/mate/matelib/isup.mate (renamed from plugins/mate/matelib/isup.mate)0
-rw-r--r--plugins/epan/mate/matelib/megaco.mate (renamed from plugins/mate/matelib/megaco.mate)0
-rw-r--r--plugins/epan/mate/matelib/q931.mate (renamed from plugins/mate/matelib/q931.mate)0
-rw-r--r--plugins/epan/mate/matelib/radius.mate (renamed from plugins/mate/matelib/radius.mate)0
-rw-r--r--plugins/epan/mate/matelib/rtsp.mate (renamed from plugins/mate/matelib/rtsp.mate)0
-rw-r--r--plugins/epan/mate/matelib/sip.mate (renamed from plugins/mate/matelib/sip.mate)0
-rw-r--r--plugins/epan/mate/packet-mate.c (renamed from plugins/mate/packet-mate.c)0
-rw-r--r--plugins/epan/opcua/AUTHORS (renamed from plugins/opcua/AUTHORS)0
-rw-r--r--plugins/epan/opcua/CMakeLists.txt (renamed from plugins/opcua/CMakeLists.txt)0
-rw-r--r--plugins/epan/opcua/ChangeLog (renamed from plugins/opcua/ChangeLog)0
-rw-r--r--plugins/epan/opcua/Doxyfile (renamed from plugins/opcua/Doxyfile)0
-rw-r--r--plugins/epan/opcua/Makefile.am (renamed from plugins/opcua/Makefile.am)2
-rw-r--r--plugins/epan/opcua/README (renamed from plugins/opcua/README)0
-rw-r--r--plugins/epan/opcua/opcua.c (renamed from plugins/opcua/opcua.c)0
-rw-r--r--plugins/epan/opcua/opcua_application_layer.c (renamed from plugins/opcua/opcua_application_layer.c)0
-rw-r--r--plugins/epan/opcua/opcua_application_layer.h (renamed from plugins/opcua/opcua_application_layer.h)0
-rw-r--r--plugins/epan/opcua/opcua_complextypeparser.c (renamed from plugins/opcua/opcua_complextypeparser.c)0
-rw-r--r--plugins/epan/opcua/opcua_complextypeparser.h (renamed from plugins/opcua/opcua_complextypeparser.h)0
-rw-r--r--plugins/epan/opcua/opcua_enumparser.c (renamed from plugins/opcua/opcua_enumparser.c)0
-rw-r--r--plugins/epan/opcua/opcua_enumparser.h (renamed from plugins/opcua/opcua_enumparser.h)0
-rw-r--r--plugins/epan/opcua/opcua_extensionobjectids.h (renamed from plugins/opcua/opcua_extensionobjectids.h)0
-rw-r--r--plugins/epan/opcua/opcua_extensionobjecttable.c (renamed from plugins/opcua/opcua_extensionobjecttable.c)0
-rw-r--r--plugins/epan/opcua/opcua_hfindeces.c (renamed from plugins/opcua/opcua_hfindeces.c)0
-rw-r--r--plugins/epan/opcua/opcua_hfindeces.h (renamed from plugins/opcua/opcua_hfindeces.h)0
-rw-r--r--plugins/epan/opcua/opcua_identifiers.h (renamed from plugins/opcua/opcua_identifiers.h)0
-rw-r--r--plugins/epan/opcua/opcua_security_layer.c (renamed from plugins/opcua/opcua_security_layer.c)0
-rw-r--r--plugins/epan/opcua/opcua_security_layer.h (renamed from plugins/opcua/opcua_security_layer.h)0
-rw-r--r--plugins/epan/opcua/opcua_serviceids.h (renamed from plugins/opcua/opcua_serviceids.h)0
-rw-r--r--plugins/epan/opcua/opcua_serviceparser.c (renamed from plugins/opcua/opcua_serviceparser.c)0
-rw-r--r--plugins/epan/opcua/opcua_serviceparser.h (renamed from plugins/opcua/opcua_serviceparser.h)0
-rw-r--r--plugins/epan/opcua/opcua_servicetable.c (renamed from plugins/opcua/opcua_servicetable.c)0
-rw-r--r--plugins/epan/opcua/opcua_servicetable.h (renamed from plugins/opcua/opcua_servicetable.h)0
-rw-r--r--plugins/epan/opcua/opcua_simpletypes.c (renamed from plugins/opcua/opcua_simpletypes.c)0
-rw-r--r--plugins/epan/opcua/opcua_simpletypes.h (renamed from plugins/opcua/opcua_simpletypes.h)0
-rw-r--r--plugins/epan/opcua/opcua_statuscode.c (renamed from plugins/opcua/opcua_statuscode.c)0
-rw-r--r--plugins/epan/opcua/opcua_statuscode.h (renamed from plugins/opcua/opcua_statuscode.h)0
-rw-r--r--plugins/epan/opcua/opcua_transport_layer.c (renamed from plugins/opcua/opcua_transport_layer.c)0
-rw-r--r--plugins/epan/opcua/opcua_transport_layer.h (renamed from plugins/opcua/opcua_transport_layer.h)0
-rw-r--r--plugins/epan/pluginifdemo/AUTHORS (renamed from plugins/pluginifdemo/AUTHORS)0
-rw-r--r--plugins/epan/pluginifdemo/CMakeLists.txt (renamed from plugins/pluginifdemo/CMakeLists.txt)0
-rw-r--r--plugins/epan/pluginifdemo/Makefile.am (renamed from plugins/pluginifdemo/Makefile.am)2
-rw-r--r--plugins/epan/pluginifdemo/README (renamed from plugins/pluginifdemo/README)0
-rw-r--r--plugins/epan/pluginifdemo/pluginifdemo.c (renamed from plugins/pluginifdemo/pluginifdemo.c)0
-rw-r--r--plugins/epan/pluginifdemo/pluginifdemo.h (renamed from plugins/pluginifdemo/pluginifdemo.h)0
-rw-r--r--plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp (renamed from plugins/pluginifdemo/ui/pluginifdemo_about.cpp)0
-rw-r--r--plugins/epan/pluginifdemo/ui/pluginifdemo_about.h (renamed from plugins/pluginifdemo/ui/pluginifdemo_about.h)0
-rw-r--r--plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui (renamed from plugins/pluginifdemo/ui/pluginifdemo_about.ui)0
-rw-r--r--plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp (renamed from plugins/pluginifdemo/ui/pluginifdemo_main.cpp)0
-rw-r--r--plugins/epan/pluginifdemo/ui/pluginifdemo_main.h (renamed from plugins/pluginifdemo/ui/pluginifdemo_main.h)0
-rw-r--r--plugins/epan/pluginifdemo/ui/pluginifdemo_main.ui (renamed from plugins/pluginifdemo/ui/pluginifdemo_main.ui)0
-rw-r--r--plugins/epan/pluginifdemo/ui/uiclasshandler.cpp (renamed from plugins/pluginifdemo/ui/uiclasshandler.cpp)0
-rw-r--r--plugins/epan/pluginifdemo/ui/uihandler.cpp (renamed from plugins/pluginifdemo/ui/uihandler.cpp)0
-rw-r--r--plugins/epan/pluginifdemo/ui/uihandler.h (renamed from plugins/pluginifdemo/ui/uihandler.h)0
-rw-r--r--plugins/epan/profinet/AUTHORS (renamed from plugins/profinet/AUTHORS)0
-rw-r--r--plugins/epan/profinet/CMakeLists.txt (renamed from plugins/profinet/CMakeLists.txt)0
-rw-r--r--plugins/epan/profinet/ChangeLog (renamed from plugins/profinet/ChangeLog)0
-rw-r--r--plugins/epan/profinet/Makefile.am (renamed from plugins/profinet/Makefile.am)2
-rw-r--r--plugins/epan/profinet/packet-dcerpc-pn-io.c (renamed from plugins/profinet/packet-dcerpc-pn-io.c)0
-rw-r--r--plugins/epan/profinet/packet-dcom-cba-acco.c (renamed from plugins/profinet/packet-dcom-cba-acco.c)0
-rw-r--r--plugins/epan/profinet/packet-dcom-cba-acco.h (renamed from plugins/profinet/packet-dcom-cba-acco.h)0
-rw-r--r--plugins/epan/profinet/packet-dcom-cba.c (renamed from plugins/profinet/packet-dcom-cba.c)0
-rw-r--r--plugins/epan/profinet/packet-pn-dcp.c (renamed from plugins/profinet/packet-pn-dcp.c)0
-rw-r--r--plugins/epan/profinet/packet-pn-mrp.c (renamed from plugins/profinet/packet-pn-mrp.c)0
-rw-r--r--plugins/epan/profinet/packet-pn-mrrt.c (renamed from plugins/profinet/packet-pn-mrrt.c)0
-rw-r--r--plugins/epan/profinet/packet-pn-ptcp.c (renamed from plugins/profinet/packet-pn-ptcp.c)0
-rw-r--r--plugins/epan/profinet/packet-pn-rt.c (renamed from plugins/profinet/packet-pn-rt.c)0
-rw-r--r--plugins/epan/profinet/packet-pn-rtc-one.c (renamed from plugins/profinet/packet-pn-rtc-one.c)0
-rw-r--r--plugins/epan/profinet/packet-pn.c (renamed from plugins/profinet/packet-pn.c)0
-rw-r--r--plugins/epan/profinet/packet-pn.h (renamed from plugins/profinet/packet-pn.h)0
-rw-r--r--plugins/epan/stats_tree/AUTHORS (renamed from plugins/stats_tree/AUTHORS)0
-rw-r--r--plugins/epan/stats_tree/CMakeLists.txt (renamed from plugins/stats_tree/CMakeLists.txt)0
-rw-r--r--plugins/epan/stats_tree/Makefile.am (renamed from plugins/stats_tree/Makefile.am)2
-rw-r--r--plugins/epan/stats_tree/pinfo_stats_tree.c (renamed from plugins/stats_tree/pinfo_stats_tree.c)0
-rw-r--r--plugins/epan/stats_tree/pinfo_stats_tree.h (renamed from plugins/stats_tree/pinfo_stats_tree.h)0
-rw-r--r--plugins/epan/stats_tree/stats_tree_plugin.c (renamed from plugins/stats_tree/stats_tree_plugin.c)0
-rw-r--r--plugins/epan/transum/AUTHORS (renamed from plugins/transum/AUTHORS)0
-rw-r--r--plugins/epan/transum/CMakeLists.txt (renamed from plugins/transum/CMakeLists.txt)0
-rw-r--r--plugins/epan/transum/Makefile.am (renamed from plugins/transum/Makefile.am)2
-rw-r--r--plugins/epan/transum/README (renamed from plugins/transum/README)0
-rw-r--r--plugins/epan/transum/decoders.c (renamed from plugins/transum/decoders.c)0
-rw-r--r--plugins/epan/transum/decoders.h (renamed from plugins/transum/decoders.h)0
-rw-r--r--plugins/epan/transum/extractors.c (renamed from plugins/transum/extractors.c)0
-rw-r--r--plugins/epan/transum/extractors.h (renamed from plugins/transum/extractors.h)0
-rw-r--r--plugins/epan/transum/packet-transum.c (renamed from plugins/transum/packet-transum.c)0
-rw-r--r--plugins/epan/transum/packet-transum.h (renamed from plugins/transum/packet-transum.h)0
-rw-r--r--plugins/epan/transum/preferences.h (renamed from plugins/transum/preferences.h)0
-rw-r--r--plugins/epan/unistim/AUTHORS (renamed from plugins/unistim/AUTHORS)0
-rw-r--r--plugins/epan/unistim/CMakeLists.txt (renamed from plugins/unistim/CMakeLists.txt)0
-rw-r--r--plugins/epan/unistim/ChangeLog (renamed from plugins/unistim/ChangeLog)0
-rw-r--r--plugins/epan/unistim/Makefile.am (renamed from plugins/unistim/Makefile.am)2
-rw-r--r--plugins/epan/unistim/TODO (renamed from plugins/unistim/TODO)0
-rw-r--r--plugins/epan/unistim/audio.h (renamed from plugins/unistim/audio.h)0
-rw-r--r--plugins/epan/unistim/basic.h (renamed from plugins/unistim/basic.h)0
-rw-r--r--plugins/epan/unistim/broadcast.h (renamed from plugins/unistim/broadcast.h)0
-rw-r--r--plugins/epan/unistim/defines.h (renamed from plugins/unistim/defines.h)0
-rw-r--r--plugins/epan/unistim/display.h (renamed from plugins/unistim/display.h)0
-rw-r--r--plugins/epan/unistim/expansion.h (renamed from plugins/unistim/expansion.h)0
-rw-r--r--plugins/epan/unistim/key.h (renamed from plugins/unistim/key.h)0
-rw-r--r--plugins/epan/unistim/network.h (renamed from plugins/unistim/network.h)0
-rw-r--r--plugins/epan/unistim/packet-unistim.c (renamed from plugins/unistim/packet-unistim.c)0
-rw-r--r--plugins/epan/unistim/packet-unistim.h (renamed from plugins/unistim/packet-unistim.h)0
-rw-r--r--plugins/epan/unistim/uftp.h (renamed from plugins/unistim/uftp.h)0
-rw-r--r--plugins/epan/wimax/AUTHORS (renamed from plugins/wimax/AUTHORS)0
-rw-r--r--plugins/epan/wimax/CMakeLists.txt (renamed from plugins/wimax/CMakeLists.txt)0
-rw-r--r--plugins/epan/wimax/Makefile.am (renamed from plugins/wimax/Makefile.am)2
-rw-r--r--plugins/epan/wimax/README.wimax (renamed from plugins/wimax/README.wimax)0
-rw-r--r--plugins/epan/wimax/crc.c (renamed from plugins/wimax/crc.c)0
-rw-r--r--plugins/epan/wimax/crc.h (renamed from plugins/wimax/crc.h)0
-rw-r--r--plugins/epan/wimax/crc_data.c (renamed from plugins/wimax/crc_data.c)0
-rw-r--r--plugins/epan/wimax/mac_hd_generic_decoder.c (renamed from plugins/wimax/mac_hd_generic_decoder.c)0
-rw-r--r--plugins/epan/wimax/mac_hd_type1_decoder.c (renamed from plugins/wimax/mac_hd_type1_decoder.c)0
-rw-r--r--plugins/epan/wimax/mac_hd_type2_decoder.c (renamed from plugins/wimax/mac_hd_type2_decoder.c)0
-rw-r--r--plugins/epan/wimax/mac_mgmt_msg_decoder.c (renamed from plugins/wimax/mac_mgmt_msg_decoder.c)0
-rw-r--r--plugins/epan/wimax/msg_aas_beam.c (renamed from plugins/wimax/msg_aas_beam.c)0
-rw-r--r--plugins/epan/wimax/msg_aas_fbck.c (renamed from plugins/wimax/msg_aas_fbck.c)0
-rw-r--r--plugins/epan/wimax/msg_arq.c (renamed from plugins/wimax/msg_arq.c)0
-rw-r--r--plugins/epan/wimax/msg_clk_cmp.c (renamed from plugins/wimax/msg_clk_cmp.c)0
-rw-r--r--plugins/epan/wimax/msg_dcd.c (renamed from plugins/wimax/msg_dcd.c)0
-rw-r--r--plugins/epan/wimax/msg_dlmap.c (renamed from plugins/wimax/msg_dlmap.c)0
-rw-r--r--plugins/epan/wimax/msg_dreg.c (renamed from plugins/wimax/msg_dreg.c)0
-rw-r--r--plugins/epan/wimax/msg_dsa.c (renamed from plugins/wimax/msg_dsa.c)0
-rw-r--r--plugins/epan/wimax/msg_dsc.c (renamed from plugins/wimax/msg_dsc.c)0
-rw-r--r--plugins/epan/wimax/msg_dsd.c (renamed from plugins/wimax/msg_dsd.c)0
-rw-r--r--plugins/epan/wimax/msg_dsx_rvd.c (renamed from plugins/wimax/msg_dsx_rvd.c)0
-rw-r--r--plugins/epan/wimax/msg_fpc.c (renamed from plugins/wimax/msg_fpc.c)0
-rw-r--r--plugins/epan/wimax/msg_pkm.c (renamed from plugins/wimax/msg_pkm.c)0
-rw-r--r--plugins/epan/wimax/msg_pmc.c (renamed from plugins/wimax/msg_pmc.c)0
-rw-r--r--plugins/epan/wimax/msg_prc_lt_ctrl.c (renamed from plugins/wimax/msg_prc_lt_ctrl.c)0
-rw-r--r--plugins/epan/wimax/msg_reg_req.c (renamed from plugins/wimax/msg_reg_req.c)0
-rw-r--r--plugins/epan/wimax/msg_reg_rsp.c (renamed from plugins/wimax/msg_reg_rsp.c)0
-rw-r--r--plugins/epan/wimax/msg_rep.c (renamed from plugins/wimax/msg_rep.c)0
-rw-r--r--plugins/epan/wimax/msg_res_cmd.c (renamed from plugins/wimax/msg_res_cmd.c)0
-rw-r--r--plugins/epan/wimax/msg_rng_req.c (renamed from plugins/wimax/msg_rng_req.c)0
-rw-r--r--plugins/epan/wimax/msg_rng_rsp.c (renamed from plugins/wimax/msg_rng_rsp.c)0
-rw-r--r--plugins/epan/wimax/msg_sbc.c (renamed from plugins/wimax/msg_sbc.c)0
-rw-r--r--plugins/epan/wimax/msg_ucd.c (renamed from plugins/wimax/msg_ucd.c)0
-rw-r--r--plugins/epan/wimax/msg_ulmap.c (renamed from plugins/wimax/msg_ulmap.c)0
-rw-r--r--plugins/epan/wimax/packet-m2m.c (renamed from plugins/wimax/packet-m2m.c)0
-rw-r--r--plugins/epan/wimax/packet-wmx.c (renamed from plugins/wimax/packet-wmx.c)0
-rw-r--r--plugins/epan/wimax/wimax-int.h (renamed from plugins/wimax/wimax-int.h)0
-rw-r--r--plugins/epan/wimax/wimax_bits.h (renamed from plugins/wimax/wimax_bits.h)0
-rw-r--r--plugins/epan/wimax/wimax_cdma_code_decoder.c (renamed from plugins/wimax/wimax_cdma_code_decoder.c)0
-rw-r--r--plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c (renamed from plugins/wimax/wimax_compact_dlmap_ie_decoder.c)0
-rw-r--r--plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h (renamed from plugins/wimax/wimax_compact_dlmap_ie_decoder.h)0
-rw-r--r--plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c (renamed from plugins/wimax/wimax_compact_ulmap_ie_decoder.c)0
-rw-r--r--plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h (renamed from plugins/wimax/wimax_compact_ulmap_ie_decoder.h)0
-rw-r--r--plugins/epan/wimax/wimax_fch_decoder.c (renamed from plugins/wimax/wimax_fch_decoder.c)0
-rw-r--r--plugins/epan/wimax/wimax_ffb_decoder.c (renamed from plugins/wimax/wimax_ffb_decoder.c)0
-rw-r--r--plugins/epan/wimax/wimax_hack_decoder.c (renamed from plugins/wimax/wimax_hack_decoder.c)0
-rw-r--r--plugins/epan/wimax/wimax_harq_map_decoder.c (renamed from plugins/wimax/wimax_harq_map_decoder.c)0
-rw-r--r--plugins/epan/wimax/wimax_mac.h (renamed from plugins/wimax/wimax_mac.h)0
-rw-r--r--plugins/epan/wimax/wimax_pdu_decoder.c (renamed from plugins/wimax/wimax_pdu_decoder.c)0
-rw-r--r--plugins/epan/wimax/wimax_phy_attributes_decoder.c (renamed from plugins/wimax/wimax_phy_attributes_decoder.c)0
-rw-r--r--plugins/epan/wimax/wimax_tlv.c (renamed from plugins/wimax/wimax_tlv.c)0
-rw-r--r--plugins/epan/wimax/wimax_tlv.h (renamed from plugins/wimax/wimax_tlv.h)0
-rw-r--r--plugins/epan/wimax/wimax_utils.c (renamed from plugins/wimax/wimax_utils.c)0
-rw-r--r--plugins/epan/wimax/wimax_utils.h (renamed from plugins/wimax/wimax_utils.h)0
-rw-r--r--plugins/epan/wimaxasncp/AUTHORS (renamed from plugins/wimaxasncp/AUTHORS)0
-rw-r--r--plugins/epan/wimaxasncp/CMakeLists.txt (renamed from plugins/wimaxasncp/CMakeLists.txt)0
-rw-r--r--plugins/epan/wimaxasncp/ChangeLog (renamed from plugins/wimaxasncp/ChangeLog)0
-rw-r--r--plugins/epan/wimaxasncp/Makefile.am (renamed from plugins/wimaxasncp/Makefile.am)2
-rw-r--r--plugins/epan/wimaxasncp/packet-wimaxasncp.c (renamed from plugins/wimaxasncp/packet-wimaxasncp.c)0
-rw-r--r--plugins/epan/wimaxasncp/wimaxasncp_dict.h (renamed from plugins/wimaxasncp/wimaxasncp_dict.h)0
-rw-r--r--plugins/epan/wimaxasncp/wimaxasncp_dict.l (renamed from plugins/wimaxasncp/wimaxasncp_dict.l)0
-rw-r--r--plugins/epan/wimaxmacphy/AUTHORS (renamed from plugins/wimaxmacphy/AUTHORS)0
-rw-r--r--plugins/epan/wimaxmacphy/CMakeLists.txt (renamed from plugins/wimaxmacphy/CMakeLists.txt)0
-rw-r--r--plugins/epan/wimaxmacphy/ChangeLog (renamed from plugins/wimaxmacphy/ChangeLog)0
-rw-r--r--plugins/epan/wimaxmacphy/Makefile.am (renamed from plugins/wimaxmacphy/Makefile.am)2
-rw-r--r--plugins/epan/wimaxmacphy/packet-wimaxmacphy.c (renamed from plugins/wimaxmacphy/packet-wimaxmacphy.c)0
-rw-r--r--plugins/epan/wimaxmacphy/packet-wimaxmacphy.h (renamed from plugins/wimaxmacphy/packet-wimaxmacphy.h)0
-rw-r--r--ui/voip_calls.c2
-rw-r--r--wsutil/plugins.c144
233 files changed, 131 insertions, 137 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f6bbd59ce..ad3f4b9221 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1370,19 +1370,19 @@ if(ENABLE_PLUGINS)
add_custom_target(plugins)
set_target_properties(plugins PROPERTIES FOLDER "Plugins")
set(PLUGIN_SRC_DIRS
- plugins/docsis
- plugins/ethercat
- plugins/gryphon
- plugins/irda
- plugins/mate
- plugins/opcua
- plugins/profinet
- plugins/stats_tree
- plugins/transum
- plugins/unistim
- plugins/wimax
- plugins/wimaxasncp
- plugins/wimaxmacphy
+ plugins/epan/docsis
+ plugins/epan/ethercat
+ plugins/epan/gryphon
+ plugins/epan/irda
+ plugins/epan/mate
+ plugins/epan/opcua
+ plugins/epan/profinet
+ plugins/epan/stats_tree
+ plugins/epan/transum
+ plugins/epan/unistim
+ plugins/epan/wimax
+ plugins/epan/wimaxasncp
+ plugins/epan/wimaxmacphy
${CUSTOM_PLUGIN_SRC_DIR}
)
diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake
index 23db9b30c7..0cf67debcd 100644
--- a/cmake/modules/WiresharkPlugin.cmake
+++ b/cmake/modules/WiresharkPlugin.cmake
@@ -40,17 +40,9 @@ macro(ADD_PLUGIN_LIBRARY _plugin _subfolder)
FOLDER "Plugins"
)
- if(ENABLE_APPLICATION_BUNDLE)
- set_target_properties(${_plugin} PROPERTIES
- LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR}/${_subfolder}
- )
- else()
- # Why don't we just write to ${PLUGIN_DIR}/${_subfolder}
- # everywhere?
- set_target_properties(${_plugin} PROPERTIES
- LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR}
+ set_target_properties(${_plugin} PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR}/${_subfolder}
)
-endif()
# Try to force output to ${PLUGIN_DIR} without the configuration
# type appended. Needed on Windows.
diff --git a/configure.ac b/configure.ac
index 7b0ecfddaf..07a03466fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2809,19 +2809,19 @@ AC_CONFIG_FILES(
packaging/rpm/SPECS/wireshark.spec
packaging/wix/Makefile
plugins/Makefile
- plugins/docsis/Makefile
- plugins/ethercat/Makefile
- plugins/gryphon/Makefile
- plugins/irda/Makefile
- plugins/mate/Makefile
- plugins/opcua/Makefile
- plugins/profinet/Makefile
- plugins/stats_tree/Makefile
- plugins/transum/Makefile
- plugins/unistim/Makefile
- plugins/wimax/Makefile
- plugins/wimaxasncp/Makefile
- plugins/wimaxmacphy/Makefile
+ plugins/epan/docsis/Makefile
+ plugins/epan/ethercat/Makefile
+ plugins/epan/gryphon/Makefile
+ plugins/epan/irda/Makefile
+ plugins/epan/mate/Makefile
+ plugins/epan/opcua/Makefile
+ plugins/epan/profinet/Makefile
+ plugins/epan/stats_tree/Makefile
+ plugins/epan/transum/Makefile
+ plugins/epan/unistim/Makefile
+ plugins/epan/wimax/Makefile
+ plugins/epan/wimaxasncp/Makefile
+ plugins/epan/wimaxmacphy/Makefile
_CUSTOM_PLUGIN_CONFIG_FILES_
randpkt_core/doxygen.cfg
randpkt_core/Makefile
diff --git a/plugins/Custom.m4.example b/plugins/Custom.m4.example
index 34bb80a4c3..adbf02fa16 100644
--- a/plugins/Custom.m4.example
+++ b/plugins/Custom.m4.example
@@ -1,3 +1,3 @@
#
-m4_define([_CUSTOM_PLUGIN_CONFIG_FILES_], [plugins/foo/Makefile])
+m4_define([_CUSTOM_PLUGIN_CONFIG_FILES_], [plugins/epan/foo/Makefile])
diff --git a/plugins/Custom.make.example b/plugins/Custom.make.example
index d17d062bc5..d3020ae430 100644
--- a/plugins/Custom.make.example
+++ b/plugins/Custom.make.example
@@ -1,7 +1,7 @@
#
_CUSTOM_SUBDIRS_ = \
- foo
+ epan/foo
_CUSTOM_EXTRA_DIST_ = \
Custom.m4 \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 481cc29f17..267e8873ae 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -23,19 +23,19 @@
SUBDIRS = \
$(_CUSTOM_SUBDIRS_) \
- docsis \
- ethercat \
- gryphon \
- irda \
- mate \
- opcua \
- profinet \
- stats_tree \
- transum \
- unistim \
- wimax \
- wimaxasncp \
- wimaxmacphy
+ epan/docsis \
+ epan/ethercat \
+ epan/gryphon \
+ epan/irda \
+ epan/mate \
+ epan/opcua \
+ epan/profinet \
+ epan/stats_tree \
+ epan/transum \
+ epan/unistim \
+ epan/wimax \
+ epan/wimaxasncp \
+ epan/wimaxmacphy
EXTRA_DIST = \
$(_CUSTOM_EXTRA_DIST_) \
diff --git a/plugins/docsis/AUTHORS b/plugins/epan/docsis/AUTHORS
index b9ad1a9152..b9ad1a9152 100644
--- a/plugins/docsis/AUTHORS
+++ b/plugins/epan/docsis/AUTHORS
diff --git a/plugins/docsis/CMakeLists.txt b/plugins/epan/docsis/CMakeLists.txt
index 190a6491eb..190a6491eb 100644
--- a/plugins/docsis/CMakeLists.txt
+++ b/plugins/epan/docsis/CMakeLists.txt
diff --git a/plugins/docsis/ChangeLog b/plugins/epan/docsis/ChangeLog
index 9251dbc0e2..9251dbc0e2 100644
--- a/plugins/docsis/ChangeLog
+++ b/plugins/epan/docsis/ChangeLog
diff --git a/plugins/docsis/Makefile.am b/plugins/epan/docsis/Makefile.am
index d81ed2e767..3137cbab87 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/epan/docsis/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = docsis
diff --git a/plugins/docsis/README b/plugins/epan/docsis/README
index 2e083a81c8..2e083a81c8 100644
--- a/plugins/docsis/README
+++ b/plugins/epan/docsis/README
diff --git a/plugins/docsis/packet-docsis.c b/plugins/epan/docsis/packet-docsis.c
index 1e7d7725d9..1e7d7725d9 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/epan/docsis/packet-docsis.c
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/epan/docsis/packet-macmgmt.c
index aa0cbb29e4..aa0cbb29e4 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/epan/docsis/packet-macmgmt.c
diff --git a/plugins/docsis/packet-tlv.c b/plugins/epan/docsis/packet-tlv.c
index 2976bcc5d8..2976bcc5d8 100644
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/epan/docsis/packet-tlv.c
diff --git a/plugins/docsis/packet-tlv.h b/plugins/epan/docsis/packet-tlv.h
index 80f362645c..80f362645c 100644
--- a/plugins/docsis/packet-tlv.h
+++ b/plugins/epan/docsis/packet-tlv.h
diff --git a/plugins/docsis/packet-vendor.c b/plugins/epan/docsis/packet-vendor.c
index 08f00c63ab..08f00c63ab 100644
--- a/plugins/docsis/packet-vendor.c
+++ b/plugins/epan/docsis/packet-vendor.c
diff --git a/plugins/ethercat/AUTHORS b/plugins/epan/ethercat/AUTHORS
index 8e9f8dae72..8e9f8dae72 100644
--- a/plugins/ethercat/AUTHORS
+++ b/plugins/epan/ethercat/AUTHORS
diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/epan/ethercat/CMakeLists.txt
index 6c227b46ec..6c227b46ec 100644
--- a/plugins/ethercat/CMakeLists.txt
+++ b/plugins/epan/ethercat/CMakeLists.txt
diff --git a/plugins/ethercat/Makefile.am b/plugins/epan/ethercat/Makefile.am
index a924abbdec..e9cde19249 100644
--- a/plugins/ethercat/Makefile.am
+++ b/plugins/epan/ethercat/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = ethercat
diff --git a/plugins/ethercat/packet-ams.c b/plugins/epan/ethercat/packet-ams.c
index f91c344aa6..f91c344aa6 100644
--- a/plugins/ethercat/packet-ams.c
+++ b/plugins/epan/ethercat/packet-ams.c
diff --git a/plugins/ethercat/packet-ams.h b/plugins/epan/ethercat/packet-ams.h
index fc1d4e9857..fc1d4e9857 100644
--- a/plugins/ethercat/packet-ams.h
+++ b/plugins/epan/ethercat/packet-ams.h
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/epan/ethercat/packet-ecatmb.c
index 0f34931852..0f34931852 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/epan/ethercat/packet-ecatmb.c
diff --git a/plugins/ethercat/packet-ecatmb.h b/plugins/epan/ethercat/packet-ecatmb.h
index 1e58f3a815..1e58f3a815 100644
--- a/plugins/ethercat/packet-ecatmb.h
+++ b/plugins/epan/ethercat/packet-ecatmb.h
diff --git a/plugins/ethercat/packet-esl.c b/plugins/epan/ethercat/packet-esl.c
index 38049d63b2..38049d63b2 100644
--- a/plugins/ethercat/packet-esl.c
+++ b/plugins/epan/ethercat/packet-esl.c
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/epan/ethercat/packet-ethercat-datagram.c
index e7f48ba645..e7f48ba645 100644
--- a/plugins/ethercat/packet-ethercat-datagram.c
+++ b/plugins/epan/ethercat/packet-ethercat-datagram.c
diff --git a/plugins/ethercat/packet-ethercat-datagram.h b/plugins/epan/ethercat/packet-ethercat-datagram.h
index 3e6c2b1e15..3e6c2b1e15 100644
--- a/plugins/ethercat/packet-ethercat-datagram.h
+++ b/plugins/epan/ethercat/packet-ethercat-datagram.h
diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/epan/ethercat/packet-ethercat-frame.c
index bf59d6ca45..bf59d6ca45 100644
--- a/plugins/ethercat/packet-ethercat-frame.c
+++ b/plugins/epan/ethercat/packet-ethercat-frame.c
diff --git a/plugins/ethercat/packet-ethercat-frame.h b/plugins/epan/ethercat/packet-ethercat-frame.h
index 087219f294..087219f294 100644
--- a/plugins/ethercat/packet-ethercat-frame.h
+++ b/plugins/epan/ethercat/packet-ethercat-frame.h
diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/epan/ethercat/packet-ioraw.c
index 125de9ebbe..125de9ebbe 100644
--- a/plugins/ethercat/packet-ioraw.c
+++ b/plugins/epan/ethercat/packet-ioraw.c
diff --git a/plugins/ethercat/packet-ioraw.h b/plugins/epan/ethercat/packet-ioraw.h
index 4c45b12e59..4c45b12e59 100644
--- a/plugins/ethercat/packet-ioraw.h
+++ b/plugins/epan/ethercat/packet-ioraw.h
diff --git a/plugins/ethercat/packet-nv.c b/plugins/epan/ethercat/packet-nv.c
index 10e2750fe9..10e2750fe9 100644
--- a/plugins/ethercat/packet-nv.c
+++ b/plugins/epan/ethercat/packet-nv.c
diff --git a/plugins/ethercat/packet-nv.h b/plugins/epan/ethercat/packet-nv.h
index 5fe9e681ae..5fe9e681ae 100644
--- a/plugins/ethercat/packet-nv.h
+++ b/plugins/epan/ethercat/packet-nv.h
diff --git a/plugins/gryphon/AUTHORS b/plugins/epan/gryphon/AUTHORS
index e2fa6a7963..e2fa6a7963 100644
--- a/plugins/gryphon/AUTHORS
+++ b/plugins/epan/gryphon/AUTHORS
diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/epan/gryphon/CMakeLists.txt
index d6ecb662f4..d6ecb662f4 100644
--- a/plugins/gryphon/CMakeLists.txt
+++ b/plugins/epan/gryphon/CMakeLists.txt
diff --git a/plugins/gryphon/Makefile.am b/plugins/epan/gryphon/Makefile.am
index c87bc8f915..81495fdd7c 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/epan/gryphon/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = gryphon
diff --git a/plugins/gryphon/README b/plugins/epan/gryphon/README
index a8e963f9a9..a8e963f9a9 100644
--- a/plugins/gryphon/README
+++ b/plugins/epan/gryphon/README
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/epan/gryphon/packet-gryphon.c
index 3aad5e4bc0..3aad5e4bc0 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/epan/gryphon/packet-gryphon.c
diff --git a/plugins/gryphon/packet-gryphon.h b/plugins/epan/gryphon/packet-gryphon.h
index 3d7b9a5a3c..3d7b9a5a3c 100644
--- a/plugins/gryphon/packet-gryphon.h
+++ b/plugins/epan/gryphon/packet-gryphon.h
diff --git a/plugins/irda/CMakeLists.txt b/plugins/epan/irda/CMakeLists.txt
index c30026b91d..c30026b91d 100644
--- a/plugins/irda/CMakeLists.txt
+++ b/plugins/epan/irda/CMakeLists.txt
diff --git a/plugins/irda/Makefile.am b/plugins/epan/irda/Makefile.am
index a2e499a871..1678d88874 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/epan/irda/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = irda
diff --git a/plugins/irda/irda-appl.h b/plugins/epan/irda/irda-appl.h
index a030a506c3..a030a506c3 100644
--- a/plugins/irda/irda-appl.h
+++ b/plugins/epan/irda/irda-appl.h
diff --git a/plugins/irda/packet-ircomm.c b/plugins/epan/irda/packet-ircomm.c
index e3a8b16c3a..e3a8b16c3a 100644
--- a/plugins/irda/packet-ircomm.c
+++ b/plugins/epan/irda/packet-ircomm.c
diff --git a/plugins/irda/packet-irda.c b/plugins/epan/irda/packet-irda.c
index a6035efa07..a6035efa07 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/epan/irda/packet-irda.c
diff --git a/plugins/irda/packet-sir.c b/plugins/epan/irda/packet-sir.c
index 54457069e0..54457069e0 100644
--- a/plugins/irda/packet-sir.c
+++ b/plugins/epan/irda/packet-sir.c
diff --git a/plugins/mate/AUTHORS b/plugins/epan/mate/AUTHORS
index e37df0dd7d..e37df0dd7d 100644
--- a/plugins/mate/AUTHORS
+++ b/plugins/epan/mate/AUTHORS
diff --git a/plugins/mate/CMakeLists.txt b/plugins/epan/mate/CMakeLists.txt
index da7451b3e3..da7451b3e3 100644
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/epan/mate/CMakeLists.txt
diff --git a/plugins/mate/Makefile.am b/plugins/epan/mate/Makefile.am
index 0d425aa293..bb1f576f74 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/epan/mate/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = mate
diff --git a/plugins/mate/examples/call.mate b/plugins/epan/mate/examples/call.mate
index 0dbbb45ef8..0dbbb45ef8 100644
--- a/plugins/mate/examples/call.mate
+++ b/plugins/epan/mate/examples/call.mate
diff --git a/plugins/mate/examples/mms.mate b/plugins/epan/mate/examples/mms.mate
index 7554b11932..7554b11932 100644
--- a/plugins/mate/examples/mms.mate
+++ b/plugins/epan/mate/examples/mms.mate
diff --git a/plugins/mate/examples/pasv_ftp.mate b/plugins/epan/mate/examples/pasv_ftp.mate
index 24ef7ab470..24ef7ab470 100644
--- a/plugins/mate/examples/pasv_ftp.mate
+++ b/plugins/epan/mate/examples/pasv_ftp.mate
diff --git a/plugins/mate/examples/tcp.mate b/plugins/epan/mate/examples/tcp.mate
index 2abe3e8882..2abe3e8882 100644
--- a/plugins/mate/examples/tcp.mate
+++ b/plugins/epan/mate/examples/tcp.mate
diff --git a/plugins/mate/examples/web.mate b/plugins/epan/mate/examples/web.mate
index fd00c651de..fd00c651de 100644
--- a/plugins/mate/examples/web.mate
+++ b/plugins/epan/mate/examples/web.mate
diff --git a/plugins/mate/mate.h b/plugins/epan/mate/mate.h
index 5e538dfa32..5e538dfa32 100644
--- a/plugins/mate/mate.h
+++ b/plugins/epan/mate/mate.h
diff --git a/plugins/mate/mate_grammar.lemon b/plugins/epan/mate/mate_grammar.lemon
index 4b9ac3195f..4b9ac3195f 100644
--- a/plugins/mate/mate_grammar.lemon
+++ b/plugins/epan/mate/mate_grammar.lemon
diff --git a/plugins/mate/mate_parser.l b/plugins/epan/mate/mate_parser.l
index b2ff7117cc..b2ff7117cc 100644
--- a/plugins/mate/mate_parser.l
+++ b/plugins/epan/mate/mate_parser.l
diff --git a/plugins/mate/mate_runtime.c b/plugins/epan/mate/mate_runtime.c
index 82c7af26ea..82c7af26ea 100644
--- a/plugins/mate/mate_runtime.c
+++ b/plugins/epan/mate/mate_runtime.c
diff --git a/plugins/mate/mate_setup.c b/plugins/epan/mate/mate_setup.c
index f58309ad68..f58309ad68 100644
--- a/plugins/mate/mate_setup.c
+++ b/plugins/epan/mate/mate_setup.c
diff --git a/plugins/mate/mate_util.c b/plugins/epan/mate/mate_util.c
index 8e4c5dd8ad..8e4c5dd8ad 100644
--- a/plugins/mate/mate_util.c
+++ b/plugins/epan/mate/mate_util.c
diff --git a/plugins/mate/mate_util.h b/plugins/epan/mate/mate_util.h
index 651136b97c..651136b97c 100644
--- a/plugins/mate/mate_util.h
+++ b/plugins/epan/mate/mate_util.h
diff --git a/plugins/mate/matelib/dns.mate b/plugins/epan/mate/matelib/dns.mate
index be426bc555..be426bc555 100644
--- a/plugins/mate/matelib/dns.mate
+++ b/plugins/epan/mate/matelib/dns.mate
diff --git a/plugins/mate/matelib/h225_ras.mate b/plugins/epan/mate/matelib/h225_ras.mate
index 7c6698ef90..7c6698ef90 100644
--- a/plugins/mate/matelib/h225_ras.mate
+++ b/plugins/epan/mate/matelib/h225_ras.mate
diff --git a/plugins/mate/matelib/isup.mate b/plugins/epan/mate/matelib/isup.mate
index 8ff6d3099a..8ff6d3099a 100644
--- a/plugins/mate/matelib/isup.mate
+++ b/plugins/epan/mate/matelib/isup.mate
diff --git a/plugins/mate/matelib/megaco.mate b/plugins/epan/mate/matelib/megaco.mate
index 044aba7837..044aba7837 100644
--- a/plugins/mate/matelib/megaco.mate
+++ b/plugins/epan/mate/matelib/megaco.mate
diff --git a/plugins/mate/matelib/q931.mate b/plugins/epan/mate/matelib/q931.mate
index 5bea5b1a97..5bea5b1a97 100644
--- a/plugins/mate/matelib/q931.mate
+++ b/plugins/epan/mate/matelib/q931.mate
diff --git a/plugins/mate/matelib/radius.mate b/plugins/epan/mate/matelib/radius.mate
index 66a910b85e..66a910b85e 100644
--- a/plugins/mate/matelib/radius.mate
+++ b/plugins/epan/mate/matelib/radius.mate
diff --git a/plugins/mate/matelib/rtsp.mate b/plugins/epan/mate/matelib/rtsp.mate
index 35f25ab246..35f25ab246 100644
--- a/plugins/mate/matelib/rtsp.mate
+++ b/plugins/epan/mate/matelib/rtsp.mate
diff --git a/plugins/mate/matelib/sip.mate b/plugins/epan/mate/matelib/sip.mate
index 593c915b06..593c915b06 100644
--- a/plugins/mate/matelib/sip.mate
+++ b/plugins/epan/mate/matelib/sip.mate
diff --git a/plugins/mate/packet-mate.c b/plugins/epan/mate/packet-mate.c
index 56cdb5defa..56cdb5defa 100644
--- a/plugins/mate/packet-mate.c
+++ b/plugins/epan/mate/packet-mate.c
diff --git a/plugins/opcua/AUTHORS b/plugins/epan/opcua/AUTHORS
index fffa8685d1..fffa8685d1 100644
--- a/plugins/opcua/AUTHORS
+++ b/plugins/epan/opcua/AUTHORS
diff --git a/plugins/opcua/CMakeLists.txt b/plugins/epan/opcua/CMakeLists.txt
index ca1dc9e34e..ca1dc9e34e 100644
--- a/plugins/opcua/CMakeLists.txt
+++ b/plugins/epan/opcua/CMakeLists.txt
diff --git a/plugins/opcua/ChangeLog b/plugins/epan/opcua/ChangeLog
index 5ebfc8f91a..5ebfc8f91a 100644
--- a/plugins/opcua/ChangeLog
+++ b/plugins/epan/opcua/ChangeLog
diff --git a/plugins/opcua/Doxyfile b/plugins/epan/opcua/Doxyfile
index 478bcdb878..478bcdb878 100644
--- a/plugins/opcua/Doxyfile
+++ b/plugins/epan/opcua/Doxyfile
diff --git a/plugins/opcua/Makefile.am b/plugins/epan/opcua/Makefile.am
index bd88fd1c2b..1023747325 100644
--- a/plugins/opcua/Makefile.am
+++ b/plugins/epan/opcua/Makefile.am
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = opcua
diff --git a/plugins/opcua/README b/plugins/epan/opcua/README
index 116de2aa66..116de2aa66 100644
--- a/plugins/opcua/README
+++ b/plugins/epan/opcua/README
diff --git a/plugins/opcua/opcua.c b/plugins/epan/opcua/opcua.c
index 91f1d02333..91f1d02333 100644
--- a/plugins/opcua/opcua.c
+++ b/plugins/epan/opcua/opcua.c
diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/epan/opcua/opcua_application_layer.c
index df627b3210..df627b3210 100644
--- a/plugins/opcua/opcua_application_layer.c
+++ b/plugins/epan/opcua/opcua_application_layer.c
diff --git a/plugins/opcua/opcua_application_layer.h b/plugins/epan/opcua/opcua_application_layer.h
index c74238ab0b..c74238ab0b 100644
--- a/plugins/opcua/opcua_application_layer.h
+++ b/plugins/epan/opcua/opcua_application_layer.h
diff --git a/plugins/opcua/opcua_complextypeparser.c b/plugins/epan/opcua/opcua_complextypeparser.c
index 2c90fa63d4..2c90fa63d4 100644
--- a/plugins/opcua/opcua_complextypeparser.c
+++ b/plugins/epan/opcua/opcua_complextypeparser.c
diff --git a/plugins/opcua/opcua_complextypeparser.h b/plugins/epan/opcua/opcua_complextypeparser.h
index ef1de8855a..ef1de8855a 100644
--- a/plugins/opcua/opcua_complextypeparser.h
+++ b/plugins/epan/opcua/opcua_complextypeparser.h
diff --git a/plugins/opcua/opcua_enumparser.c b/plugins/epan/opcua/opcua_enumparser.c
index 2cd7054ba1..2cd7054ba1 100644
--- a/plugins/opcua/opcua_enumparser.c
+++ b/plugins/epan/opcua/opcua_enumparser.c
diff --git a/plugins/opcua/opcua_enumparser.h b/plugins/epan/opcua/opcua_enumparser.h
index 584aa8e035..584aa8e035 100644
--- a/plugins/opcua/opcua_enumparser.h
+++ b/plugins/epan/opcua/opcua_enumparser.h
diff --git a/plugins/opcua/opcua_extensionobjectids.h b/plugins/epan/opcua/opcua_extensionobjectids.h
index 95fce73cde..95fce73cde 100644
--- a/plugins/opcua/opcua_extensionobjectids.h
+++ b/plugins/epan/opcua/opcua_extensionobjectids.h
diff --git a/plugins/opcua/opcua_extensionobjecttable.c b/plugins/epan/opcua/opcua_extensionobjecttable.c
index 7d84a1068f..7d84a1068f 100644
--- a/plugins/opcua/opcua_extensionobjecttable.c
+++ b/plugins/epan/opcua/opcua_extensionobjecttable.c
diff --git a/plugins/opcua/opcua_hfindeces.c b/plugins/epan/opcua/opcua_hfindeces.c
index dd84925a51..dd84925a51 100644
--- a/plugins/opcua/opcua_hfindeces.c
+++ b/plugins/epan/opcua/opcua_hfindeces.c
diff --git a/plugins/opcua/opcua_hfindeces.h b/plugins/epan/opcua/opcua_hfindeces.h
index b04025b189..b04025b189 100644
--- a/plugins/opcua/opcua_hfindeces.h
+++ b/plugins/epan/opcua/opcua_hfindeces.h
diff --git a/plugins/opcua/opcua_identifiers.h b/plugins/epan/opcua/opcua_identifiers.h
index 18891834da..18891834da 100644
--- a/plugins/opcua/opcua_identifiers.h
+++ b/plugins/epan/opcua/opcua_identifiers.h
diff --git a/plugins/opcua/opcua_security_layer.c b/plugins/epan/opcua/opcua_security_layer.c
index 2acd8f85ff..2acd8f85ff 100644
--- a/plugins/opcua/opcua_security_layer.c
+++ b/plugins/epan/opcua/opcua_security_layer.c
diff --git a/plugins/opcua/opcua_security_layer.h b/plugins/epan/opcua/opcua_security_layer.h
index c168452242..c168452242 100644
--- a/plugins/opcua/opcua_security_layer.h
+++ b/plugins/epan/opcua/opcua_security_layer.h
diff --git a/plugins/opcua/opcua_serviceids.h b/plugins/epan/opcua/opcua_serviceids.h
index cd61c36dac..cd61c36dac 100644
--- a/plugins/opcua/opcua_serviceids.h
+++ b/plugins/epan/opcua/opcua_serviceids.h
diff --git a/plugins/opcua/opcua_serviceparser.c b/plugins/epan/opcua/opcua_serviceparser.c
index d203149a8b..d203149a8b 100644
--- a/plugins/opcua/opcua_serviceparser.c
+++ b/plugins/epan/opcua/opcua_serviceparser.c
diff --git a/plugins/opcua/opcua_serviceparser.h b/plugins/epan/opcua/opcua_serviceparser.h
index 48ba77d900..48ba77d900 100644
--- a/plugins/opcua/opcua_serviceparser.h
+++ b/plugins/epan/opcua/opcua_serviceparser.h
diff --git a/plugins/opcua/opcua_servicetable.c b/plugins/epan/opcua/opcua_servicetable.c
index c257100e1b..c257100e1b 100644
--- a/plugins/opcua/opcua_servicetable.c
+++ b/plugins/epan/opcua/opcua_servicetable.c
diff --git a/plugins/opcua/opcua_servicetable.h b/plugins/epan/opcua/opcua_servicetable.h
index 870cda9898..870cda9898 100644
--- a/plugins/opcua/opcua_servicetable.h
+++ b/plugins/epan/opcua/opcua_servicetable.h
diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/epan/opcua/opcua_simpletypes.c
index 005106d2f6..005106d2f6 100644
--- a/plugins/opcua/opcua_simpletypes.c
+++ b/plugins/epan/opcua/opcua_simpletypes.c
diff --git a/plugins/opcua/opcua_simpletypes.h b/plugins/epan/opcua/opcua_simpletypes.h
index 982d0e8fcc..982d0e8fcc 100644
--- a/plugins/opcua/opcua_simpletypes.h
+++ b/plugins/epan/opcua/opcua_simpletypes.h
diff --git a/plugins/opcua/opcua_statuscode.c b/plugins/epan/opcua/opcua_statuscode.c
index 07b067fce3..07b067fce3 100644
--- a/plugins/opcua/opcua_statuscode.c
+++ b/plugins/epan/opcua/opcua_statuscode.c
diff --git a/plugins/opcua/opcua_statuscode.h b/plugins/epan/opcua/opcua_statuscode.h
index 50e7f94fbb..50e7f94fbb 100644
--- a/plugins/opcua/opcua_statuscode.h
+++ b/plugins/epan/opcua/opcua_statuscode.h
diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/epan/opcua/opcua_transport_layer.c
index 38fdac75af..38fdac75af 100644
--- a/plugins/opcua/opcua_transport_layer.c
+++ b/plugins/epan/opcua/opcua_transport_layer.c
diff --git a/plugins/opcua/opcua_transport_layer.h b/plugins/epan/opcua/opcua_transport_layer.h
index 2993a4e8cf..2993a4e8cf 100644
--- a/plugins/opcua/opcua_transport_layer.h
+++ b/plugins/epan/opcua/opcua_transport_layer.h
diff --git a/plugins/pluginifdemo/AUTHORS b/plugins/epan/pluginifdemo/AUTHORS
index ca50630cb9..ca50630cb9 100644
--- a/plugins/pluginifdemo/AUTHORS
+++ b/plugins/epan/pluginifdemo/AUTHORS
diff --git a/plugins/pluginifdemo/CMakeLists.txt b/plugins/epan/pluginifdemo/CMakeLists.txt
index 2125a1e9b3..2125a1e9b3 100644
--- a/plugins/pluginifdemo/CMakeLists.txt
+++ b/plugins/epan/pluginifdemo/CMakeLists.txt
diff --git a/plugins/pluginifdemo/Makefile.am b/plugins/epan/pluginifdemo/Makefile.am
index f1e4edf608..aca6a56b94 100644
--- a/plugins/pluginifdemo/Makefile.am
+++ b/plugins/epan/pluginifdemo/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = pluginifdemo
diff --git a/plugins/pluginifdemo/README b/plugins/epan/pluginifdemo/README
index 7aa753f711..7aa753f711 100644
--- a/plugins/pluginifdemo/README
+++ b/plugins/epan/pluginifdemo/README
diff --git a/plugins/pluginifdemo/pluginifdemo.c b/plugins/epan/pluginifdemo/pluginifdemo.c
index deb938fb6e..deb938fb6e 100644
--- a/plugins/pluginifdemo/pluginifdemo.c
+++ b/plugins/epan/pluginifdemo/pluginifdemo.c
diff --git a/plugins/pluginifdemo/pluginifdemo.h b/plugins/epan/pluginifdemo/pluginifdemo.h
index 59b2a649c1..59b2a649c1 100644
--- a/plugins/pluginifdemo/pluginifdemo.h
+++ b/plugins/epan/pluginifdemo/pluginifdemo.h
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_about.cpp b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp
index 048bcc1a84..048bcc1a84 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_about.cpp
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_about.h b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.h
index aa4bb4726d..aa4bb4726d 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_about.h
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.h
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_about.ui b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui
index 2353dd76ac..2353dd76ac 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_about.ui
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_main.cpp b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp
index d29c47ad50..d29c47ad50 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_main.cpp
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_main.h b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.h
index 3854967d1d..3854967d1d 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_main.h
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.h
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_main.ui b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.ui
index 467ec85e07..467ec85e07 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_main.ui
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.ui
diff --git a/plugins/pluginifdemo/ui/uiclasshandler.cpp b/plugins/epan/pluginifdemo/ui/uiclasshandler.cpp
index e88f17a35e..e88f17a35e 100644
--- a/plugins/pluginifdemo/ui/uiclasshandler.cpp
+++ b/plugins/epan/pluginifdemo/ui/uiclasshandler.cpp
diff --git a/plugins/pluginifdemo/ui/uihandler.cpp b/plugins/epan/pluginifdemo/ui/uihandler.cpp
index 8dc3940669..8dc3940669 100644
--- a/plugins/pluginifdemo/ui/uihandler.cpp
+++ b/plugins/epan/pluginifdemo/ui/uihandler.cpp
diff --git a/plugins/pluginifdemo/ui/uihandler.h b/plugins/epan/pluginifdemo/ui/uihandler.h
index ce78a23940..ce78a23940 100644
--- a/plugins/pluginifdemo/ui/uihandler.h
+++ b/plugins/epan/pluginifdemo/ui/uihandler.h
diff --git a/plugins/profinet/AUTHORS b/plugins/epan/profinet/AUTHORS
index 4979d26040..4979d26040 100644
--- a/plugins/profinet/AUTHORS
+++ b/plugins/epan/profinet/AUTHORS
diff --git a/plugins/profinet/CMakeLists.txt b/plugins/epan/profinet/CMakeLists.txt
index 86798676f1..86798676f1 100644
--- a/plugins/profinet/CMakeLists.txt
+++ b/plugins/epan/profinet/CMakeLists.txt
diff --git a/plugins/profinet/ChangeLog b/plugins/epan/profinet/ChangeLog
index 5298f56783..5298f56783 100644
--- a/plugins/profinet/ChangeLog
+++ b/plugins/epan/profinet/ChangeLog
diff --git a/plugins/profinet/Makefile.am b/plugins/epan/profinet/Makefile.am
index e638ecedfd..ce0888690c 100644
--- a/plugins/profinet/Makefile.am
+++ b/plugins/epan/profinet/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = profinet
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c
index 44aa77d092..44aa77d092 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/epan/profinet/packet-dcom-cba-acco.c
index 9537ef36df..9537ef36df 100644
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/epan/profinet/packet-dcom-cba-acco.c
diff --git a/plugins/profinet/packet-dcom-cba-acco.h b/plugins/epan/profinet/packet-dcom-cba-acco.h
index 356d540377..356d540377 100644
--- a/plugins/profinet/packet-dcom-cba-acco.h
+++ b/plugins/epan/profinet/packet-dcom-cba-acco.h
diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/epan/profinet/packet-dcom-cba.c
index 244b102cb0..244b102cb0 100644
--- a/plugins/profinet/packet-dcom-cba.c
+++ b/plugins/epan/profinet/packet-dcom-cba.c
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/epan/profinet/packet-pn-dcp.c
index 2838663b5c..2838663b5c 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/epan/profinet/packet-pn-dcp.c
diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/epan/profinet/packet-pn-mrp.c
index 7aa57c0ab5..7aa57c0ab5 100644
--- a/plugins/profinet/packet-pn-mrp.c
+++ b/plugins/epan/profinet/packet-pn-mrp.c
diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/epan/profinet/packet-pn-mrrt.c
index 269fe015dd..269fe015dd 100644
--- a/plugins/profinet/packet-pn-mrrt.c
+++ b/plugins/epan/profinet/packet-pn-mrrt.c
diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/epan/profinet/packet-pn-ptcp.c
index d7771f3d06..d7771f3d06 100644
--- a/plugins/profinet/packet-pn-ptcp.c
+++ b/plugins/epan/profinet/packet-pn-ptcp.c
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/epan/profinet/packet-pn-rt.c
index 3e4e1f5f80..3e4e1f5f80 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/epan/profinet/packet-pn-rt.c
diff --git a/plugins/profinet/packet-pn-rtc-one.c b/plugins/epan/profinet/packet-pn-rtc-one.c
index f908fbb851..f908fbb851 100644
--- a/plugins/profinet/packet-pn-rtc-one.c
+++ b/plugins/epan/profinet/packet-pn-rtc-one.c
diff --git a/plugins/profinet/packet-pn.c b/plugins/epan/profinet/packet-pn.c
index de7c4aada5..de7c4aada5 100644
--- a/plugins/profinet/packet-pn.c
+++ b/plugins/epan/profinet/packet-pn.c
diff --git a/plugins/profinet/packet-pn.h b/plugins/epan/profinet/packet-pn.h
index 77cd635348..77cd635348 100644
--- a/plugins/profinet/packet-pn.h
+++ b/plugins/epan/profinet/packet-pn.h
diff --git a/plugins/stats_tree/AUTHORS b/plugins/epan/stats_tree/AUTHORS
index e37df0dd7d..e37df0dd7d 100644
--- a/plugins/stats_tree/AUTHORS
+++ b/plugins/epan/stats_tree/AUTHORS
diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/epan/stats_tree/CMakeLists.txt
index 92172c72d3..92172c72d3 100644
--- a/plugins/stats_tree/CMakeLists.txt
+++ b/plugins/epan/stats_tree/CMakeLists.txt
diff --git a/plugins/stats_tree/Makefile.am b/plugins/epan/stats_tree/Makefile.am
index 7bb578b133..1b4c9326cf 100644
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/epan/stats_tree/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = stats_tree
diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/epan/stats_tree/pinfo_stats_tree.c
index 9ac702dab5..9ac702dab5 100644
--- a/plugins/stats_tree/pinfo_stats_tree.c
+++ b/plugins/epan/stats_tree/pinfo_stats_tree.c
diff --git a/plugins/stats_tree/pinfo_stats_tree.h b/plugins/epan/stats_tree/pinfo_stats_tree.h
index ef8952ca5a..ef8952ca5a 100644
--- a/plugins/stats_tree/pinfo_stats_tree.h
+++ b/plugins/epan/stats_tree/pinfo_stats_tree.h
diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/epan/stats_tree/stats_tree_plugin.c
index 16d65526a3..16d65526a3 100644
--- a/plugins/stats_tree/stats_tree_plugin.c
+++ b/plugins/epan/stats_tree/stats_tree_plugin.c
diff --git a/plugins/transum/AUTHORS b/plugins/epan/transum/AUTHORS
index 109c3fcdaa..109c3fcdaa 100644
--- a/plugins/transum/AUTHORS
+++ b/plugins/epan/transum/AUTHORS
diff --git a/plugins/transum/CMakeLists.txt b/plugins/epan/transum/CMakeLists.txt
index c814704da8..c814704da8 100644
--- a/plugins/transum/CMakeLists.txt
+++ b/plugins/epan/transum/CMakeLists.txt
diff --git a/plugins/transum/Makefile.am b/plugins/epan/transum/Makefile.am
index cf787e6592..615255c66b 100644
--- a/plugins/transum/Makefile.am
+++ b/plugins/epan/transum/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = transum
diff --git a/plugins/transum/README b/plugins/epan/transum/README
index af6b86e93b..af6b86e93b 100644
--- a/plugins/transum/README
+++ b/plugins/epan/transum/README
diff --git a/plugins/transum/decoders.c b/plugins/epan/transum/decoders.c
index e47539e5ac..e47539e5ac 100644
--- a/plugins/transum/decoders.c
+++ b/plugins/epan/transum/decoders.c
diff --git a/plugins/transum/decoders.h b/plugins/epan/transum/decoders.h
index 05d4ac1da1..05d4ac1da1 100644
--- a/plugins/transum/decoders.h
+++ b/plugins/epan/transum/decoders.h
diff --git a/plugins/transum/extractors.c b/plugins/epan/transum/extractors.c
index b07708d69a..b07708d69a 100644
--- a/plugins/transum/extractors.c
+++ b/plugins/epan/transum/extractors.c
diff --git a/plugins/transum/extractors.h b/plugins/epan/transum/extractors.h
index c1c0ff3b83..c1c0ff3b83 100644
--- a/plugins/transum/extractors.h
+++ b/plugins/epan/transum/extractors.h
diff --git a/plugins/transum/packet-transum.c b/plugins/epan/transum/packet-transum.c
index 6343bf1863..6343bf1863 100644
--- a/plugins/transum/packet-transum.c
+++ b/plugins/epan/transum/packet-transum.c
diff --git a/plugins/transum/packet-transum.h b/plugins/epan/transum/packet-transum.h
index f633e80b9a..f633e80b9a 100644
--- a/plugins/transum/packet-transum.h
+++ b/plugins/epan/transum/packet-transum.h
diff --git a/plugins/transum/preferences.h b/plugins/epan/transum/preferences.h
index 50b68419c9..50b68419c9 100644
--- a/plugins/transum/preferences.h
+++ b/plugins/epan/transum/preferences.h
diff --git a/plugins/unistim/AUTHORS b/plugins/epan/unistim/AUTHORS
index d71dd2908d..d71dd2908d 100644
--- a/plugins/unistim/AUTHORS
+++ b/plugins/epan/unistim/AUTHORS
diff --git a/plugins/unistim/CMakeLists.txt b/plugins/epan/unistim/CMakeLists.txt
index e9472df64e..e9472df64e 100644
--- a/plugins/unistim/CMakeLists.txt
+++ b/plugins/epan/unistim/CMakeLists.txt
diff --git a/plugins/unistim/ChangeLog b/plugins/epan/unistim/ChangeLog
index ddacecff3a..ddacecff3a 100644
--- a/plugins/unistim/ChangeLog
+++ b/plugins/epan/unistim/ChangeLog
diff --git a/plugins/unistim/Makefile.am b/plugins/epan/unistim/Makefile.am
index 0142166151..8c1ea042f1 100644
--- a/plugins/unistim/Makefile.am
+++ b/plugins/epan/unistim/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = unistim
diff --git a/plugins/unistim/TODO b/plugins/epan/unistim/TODO
index 7c86c58e21..7c86c58e21 100644
--- a/plugins/unistim/TODO
+++ b/plugins/epan/unistim/TODO
diff --git a/plugins/unistim/audio.h b/plugins/epan/unistim/audio.h
index 16a6b42661..16a6b42661 100644
--- a/plugins/unistim/audio.h
+++ b/plugins/epan/unistim/audio.h
diff --git a/plugins/unistim/basic.h b/plugins/epan/unistim/basic.h
index 35835c0621..35835c0621 100644
--- a/plugins/unistim/basic.h
+++ b/plugins/epan/unistim/basic.h
diff --git a/plugins/unistim/broadcast.h b/plugins/epan/unistim/broadcast.h
index 786745b6d7..786745b6d7 100644
--- a/plugins/unistim/broadcast.h
+++ b/plugins/epan/unistim/broadcast.h
diff --git a/plugins/unistim/defines.h b/plugins/epan/unistim/defines.h
index 631ef039b4..631ef039b4 100644
--- a/plugins/unistim/defines.h
+++ b/plugins/epan/unistim/defines.h
diff --git a/plugins/unistim/display.h b/plugins/epan/unistim/display.h
index cb90c0c5f5..cb90c0c5f5 100644
--- a/plugins/unistim/display.h
+++ b/plugins/epan/unistim/display.h
diff --git a/plugins/unistim/expansion.h b/plugins/epan/unistim/expansion.h
index 954c511778..954c511778 100644
--- a/plugins/unistim/expansion.h
+++ b/plugins/epan/unistim/expansion.h
diff --git a/plugins/unistim/key.h b/plugins/epan/unistim/key.h
index f886cbfd38..f886cbfd38 100644
--- a/plugins/unistim/key.h
+++ b/plugins/epan/unistim/key.h
diff --git a/plugins/unistim/network.h b/plugins/epan/unistim/network.h
index 2fb2e63282..2fb2e63282 100644
--- a/plugins/unistim/network.h
+++ b/plugins/epan/unistim/network.h
diff --git a/plugins/unistim/packet-unistim.c b/plugins/epan/unistim/packet-unistim.c
index 70d4622d5b..70d4622d5b 100644
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/epan/unistim/packet-unistim.c
diff --git a/plugins/unistim/packet-unistim.h b/plugins/epan/unistim/packet-unistim.h
index 7093bb0125..7093bb0125 100644
--- a/plugins/unistim/packet-unistim.h
+++ b/plugins/epan/unistim/packet-unistim.h
diff --git a/plugins/unistim/uftp.h b/plugins/epan/unistim/uftp.h
index 4752a8fd57..4752a8fd57 100644
--- a/plugins/unistim/uftp.h
+++ b/plugins/epan/unistim/uftp.h
diff --git a/plugins/wimax/AUTHORS b/plugins/epan/wimax/AUTHORS
index f7c8e66c71..f7c8e66c71 100644
--- a/plugins/wimax/AUTHORS
+++ b/plugins/epan/wimax/AUTHORS
diff --git a/plugins/wimax/CMakeLists.txt b/plugins/epan/wimax/CMakeLists.txt
index 8d7d201060..8d7d201060 100644
--- a/plugins/wimax/CMakeLists.txt
+++ b/plugins/epan/wimax/CMakeLists.txt
diff --git a/plugins/wimax/Makefile.am b/plugins/epan/wimax/Makefile.am
index 82474f0053..3074a525a5 100644
--- a/plugins/wimax/Makefile.am
+++ b/plugins/epan/wimax/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = wimax
diff --git a/plugins/wimax/README.wimax b/plugins/epan/wimax/README.wimax
index 4f7981fc72..4f7981fc72 100644
--- a/plugins/wimax/README.wimax
+++ b/plugins/epan/wimax/README.wimax
diff --git a/plugins/wimax/crc.c b/plugins/epan/wimax/crc.c
index dca0e72794..dca0e72794 100644
--- a/plugins/wimax/crc.c
+++ b/plugins/epan/wimax/crc.c
diff --git a/plugins/wimax/crc.h b/plugins/epan/wimax/crc.h
index 71079ddd2e..71079ddd2e 100644
--- a/plugins/wimax/crc.h
+++ b/plugins/epan/wimax/crc.h
diff --git a/plugins/wimax/crc_data.c b/plugins/epan/wimax/crc_data.c
index 3bcf8ceb1e..3bcf8ceb1e 100644
--- a/plugins/wimax/crc_data.c
+++ b/plugins/epan/wimax/crc_data.c
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/epan/wimax/mac_hd_generic_decoder.c
index 168f1458bd..168f1458bd 100644
--- a/plugins/wimax/mac_hd_generic_decoder.c
+++ b/plugins/epan/wimax/mac_hd_generic_decoder.c
diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/epan/wimax/mac_hd_type1_decoder.c
index 50a9178710..50a9178710 100644
--- a/plugins/wimax/mac_hd_type1_decoder.c
+++ b/plugins/epan/wimax/mac_hd_type1_decoder.c
diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/epan/wimax/mac_hd_type2_decoder.c
index 4cb74c96b6..4cb74c96b6 100644
--- a/plugins/wimax/mac_hd_type2_decoder.c
+++ b/plugins/epan/wimax/mac_hd_type2_decoder.c
diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/epan/wimax/mac_mgmt_msg_decoder.c
index 2eed2e5c36..2eed2e5c36 100644
--- a/plugins/wimax/mac_mgmt_msg_decoder.c
+++ b/plugins/epan/wimax/mac_mgmt_msg_decoder.c
diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/epan/wimax/msg_aas_beam.c
index a3bfa467bf..a3bfa467bf 100644
--- a/plugins/wimax/msg_aas_beam.c
+++ b/plugins/epan/wimax/msg_aas_beam.c
diff --git a/plugins/wimax/msg_aas_fbck.c b/plugins/epan/wimax/msg_aas_fbck.c
index 311e608b48..311e608b48 100644
--- a/plugins/wimax/msg_aas_fbck.c
+++ b/plugins/epan/wimax/msg_aas_fbck.c
diff --git a/plugins/wimax/msg_arq.c b/plugins/epan/wimax/msg_arq.c
index 87e5bf8a8d..87e5bf8a8d 100644
--- a/plugins/wimax/msg_arq.c
+++ b/plugins/epan/wimax/msg_arq.c
diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/epan/wimax/msg_clk_cmp.c
index 5958bafbaf..5958bafbaf 100644
--- a/plugins/wimax/msg_clk_cmp.c
+++ b/plugins/epan/wimax/msg_clk_cmp.c
diff --git a/plugins/wimax/msg_dcd.c b/plugins/epan/wimax/msg_dcd.c
index e0e6fcb6c9..e0e6fcb6c9 100644
--- a/plugins/wimax/msg_dcd.c
+++ b/plugins/epan/wimax/msg_dcd.c
diff --git a/plugins/wimax/msg_dlmap.c b/plugins/epan/wimax/msg_dlmap.c
index 6e2a0e4352..6e2a0e4352 100644
--- a/plugins/wimax/msg_dlmap.c
+++ b/plugins/epan/wimax/msg_dlmap.c
diff --git a/plugins/wimax/msg_dreg.c b/plugins/epan/wimax/msg_dreg.c
index ec612cbbed..ec612cbbed 100644
--- a/plugins/wimax/msg_dreg.c
+++ b/plugins/epan/wimax/msg_dreg.c
diff --git a/plugins/wimax/msg_dsa.c b/plugins/epan/wimax/msg_dsa.c
index 6fb2b67ac1..6fb2b67ac1 100644
--- a/plugins/wimax/msg_dsa.c
+++ b/plugins/epan/wimax/msg_dsa.c
diff --git a/plugins/wimax/msg_dsc.c b/plugins/epan/wimax/msg_dsc.c
index 192e9f4a2a..192e9f4a2a 100644
--- a/plugins/wimax/msg_dsc.c
+++ b/plugins/epan/wimax/msg_dsc.c
diff --git a/plugins/wimax/msg_dsd.c b/plugins/epan/wimax/msg_dsd.c
index ce558df2f1..ce558df2f1 100644
--- a/plugins/wimax/msg_dsd.c
+++ b/plugins/epan/wimax/msg_dsd.c
diff --git a/plugins/wimax/msg_dsx_rvd.c b/plugins/epan/wimax/msg_dsx_rvd.c
index a6ea77eb2f..a6ea77eb2f 100644
--- a/plugins/wimax/msg_dsx_rvd.c
+++ b/plugins/epan/wimax/msg_dsx_rvd.c
diff --git a/plugins/wimax/msg_fpc.c b/plugins/epan/wimax/msg_fpc.c
index 9658ab28c4..9658ab28c4 100644
--- a/plugins/wimax/msg_fpc.c
+++ b/plugins/epan/wimax/msg_fpc.c
diff --git a/plugins/wimax/msg_pkm.c b/plugins/epan/wimax/msg_pkm.c
index d375f3d350..d375f3d350 100644
--- a/plugins/wimax/msg_pkm.c
+++ b/plugins/epan/wimax/msg_pkm.c
diff --git a/plugins/wimax/msg_pmc.c b/plugins/epan/wimax/msg_pmc.c
index 5ec213576e..5ec213576e 100644
--- a/plugins/wimax/msg_pmc.c
+++ b/plugins/epan/wimax/msg_pmc.c
diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/epan/wimax/msg_prc_lt_ctrl.c
index 38733a7ace..38733a7ace 100644
--- a/plugins/wimax/msg_prc_lt_ctrl.c
+++ b/plugins/epan/wimax/msg_prc_lt_ctrl.c
diff --git a/plugins/wimax/msg_reg_req.c b/plugins/epan/wimax/msg_reg_req.c
index 1feefbeb68..1feefbeb68 100644
--- a/plugins/wimax/msg_reg_req.c
+++ b/plugins/epan/wimax/msg_reg_req.c
diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/epan/wimax/msg_reg_rsp.c
index 6ffbfbdd58..6ffbfbdd58 100644
--- a/plugins/wimax/msg_reg_rsp.c
+++ b/plugins/epan/wimax/msg_reg_rsp.c
diff --git a/plugins/wimax/msg_rep.c b/plugins/epan/wimax/msg_rep.c
index 4b1f60ccff..4b1f60ccff 100644
--- a/plugins/wimax/msg_rep.c
+++ b/plugins/epan/wimax/msg_rep.c
diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/epan/wimax/msg_res_cmd.c
index d02164f316..d02164f316 100644
--- a/plugins/wimax/msg_res_cmd.c
+++ b/plugins/epan/wimax/msg_res_cmd.c
diff --git a/plugins/wimax/msg_rng_req.c b/plugins/epan/wimax/msg_rng_req.c
index cad39d71db..cad39d71db 100644
--- a/plugins/wimax/msg_rng_req.c
+++ b/plugins/epan/wimax/msg_rng_req.c
diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/epan/wimax/msg_rng_rsp.c
index ea85a2b9cd..ea85a2b9cd 100644
--- a/plugins/wimax/msg_rng_rsp.c
+++ b/plugins/epan/wimax/msg_rng_rsp.c
diff --git a/plugins/wimax/msg_sbc.c b/plugins/epan/wimax/msg_sbc.c
index 783aebe81a..783aebe81a 100644
--- a/plugins/wimax/msg_sbc.c
+++ b/plugins/epan/wimax/msg_sbc.c
diff --git a/plugins/wimax/msg_ucd.c b/plugins/epan/wimax/msg_ucd.c
index 985450e90e..985450e90e 100644
--- a/plugins/wimax/msg_ucd.c
+++ b/plugins/epan/wimax/msg_ucd.c
diff --git a/plugins/wimax/msg_ulmap.c b/plugins/epan/wimax/msg_ulmap.c
index 28e63fd68a..28e63fd68a 100644
--- a/plugins/wimax/msg_ulmap.c
+++ b/plugins/epan/wimax/msg_ulmap.c
diff --git a/plugins/wimax/packet-m2m.c b/plugins/epan/wimax/packet-m2m.c
index 0fa36e1ccf..0fa36e1ccf 100644
--- a/plugins/wimax/packet-m2m.c
+++ b/plugins/epan/wimax/packet-m2m.c
diff --git a/plugins/wimax/packet-wmx.c b/plugins/epan/wimax/packet-wmx.c
index 1cdbd97e82..1cdbd97e82 100644
--- a/plugins/wimax/packet-wmx.c
+++ b/plugins/epan/wimax/packet-wmx.c
diff --git a/plugins/wimax/wimax-int.h b/plugins/epan/wimax/wimax-int.h
index c22c1dd14b..c22c1dd14b 100644
--- a/plugins/wimax/wimax-int.h
+++ b/plugins/epan/wimax/wimax-int.h
diff --git a/plugins/wimax/wimax_bits.h b/plugins/epan/wimax/wimax_bits.h
index ae0ab4e3a8..ae0ab4e3a8 100644
--- a/plugins/wimax/wimax_bits.h
+++ b/plugins/epan/wimax/wimax_bits.h
diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/epan/wimax/wimax_cdma_code_decoder.c
index b9b504f8df..b9b504f8df 100644
--- a/plugins/wimax/wimax_cdma_code_decoder.c
+++ b/plugins/epan/wimax/wimax_cdma_code_decoder.c
diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c
index 4016acab6d..4016acab6d 100644
--- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
+++ b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c
diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.h b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h
index 49206f8550..49206f8550 100644
--- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.h
+++ b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h
diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c
index 0e3adfdb17..0e3adfdb17 100644
--- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
+++ b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c
diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.h b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h
index c83c5aa160..c83c5aa160 100644
--- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.h
+++ b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h
diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/epan/wimax/wimax_fch_decoder.c
index 80de85e56d..80de85e56d 100644
--- a/plugins/wimax/wimax_fch_decoder.c
+++ b/plugins/epan/wimax/wimax_fch_decoder.c
diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/epan/wimax/wimax_ffb_decoder.c
index 4e1ea997c9..4e1ea997c9 100644
--- a/plugins/wimax/wimax_ffb_decoder.c
+++ b/plugins/epan/wimax/wimax_ffb_decoder.c
diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/epan/wimax/wimax_hack_decoder.c
index db24c2b5bf..db24c2b5bf 100644
--- a/plugins/wimax/wimax_hack_decoder.c
+++ b/plugins/epan/wimax/wimax_hack_decoder.c
diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/epan/wimax/wimax_harq_map_decoder.c
index 8eaf381f25..8eaf381f25 100644
--- a/plugins/wimax/wimax_harq_map_decoder.c
+++ b/plugins/epan/wimax/wimax_harq_map_decoder.c
diff --git a/plugins/wimax/wimax_mac.h b/plugins/epan/wimax/wimax_mac.h
index b5ac72f01b..b5ac72f01b 100644
--- a/plugins/wimax/wimax_mac.h
+++ b/plugins/epan/wimax/wimax_mac.h
diff --git a/plugins/wimax/wimax_pdu_decoder.c b/plugins/epan/wimax/wimax_pdu_decoder.c
index d17b46288f..d17b46288f 100644
--- a/plugins/wimax/wimax_pdu_decoder.c
+++ b/plugins/epan/wimax/wimax_pdu_decoder.c
diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/epan/wimax/wimax_phy_attributes_decoder.c
index e1fa8d0bc4..e1fa8d0bc4 100644
--- a/plugins/wimax/wimax_phy_attributes_decoder.c
+++ b/plugins/epan/wimax/wimax_phy_attributes_decoder.c
diff --git a/plugins/wimax/wimax_tlv.c b/plugins/epan/wimax/wimax_tlv.c
index 2fc4738b05..2fc4738b05 100644
--- a/plugins/wimax/wimax_tlv.c
+++ b/plugins/epan/wimax/wimax_tlv.c
diff --git a/plugins/wimax/wimax_tlv.h b/plugins/epan/wimax/wimax_tlv.h
index 28bc249327..28bc249327 100644
--- a/plugins/wimax/wimax_tlv.h
+++ b/plugins/epan/wimax/wimax_tlv.h
diff --git a/plugins/wimax/wimax_utils.c b/plugins/epan/wimax/wimax_utils.c
index e1cd8cacb5..e1cd8cacb5 100644
--- a/plugins/wimax/wimax_utils.c
+++ b/plugins/epan/wimax/wimax_utils.c
diff --git a/plugins/wimax/wimax_utils.h b/plugins/epan/wimax/wimax_utils.h
index 32bb7b0921..32bb7b0921 100644
--- a/plugins/wimax/wimax_utils.h
+++ b/plugins/epan/wimax/wimax_utils.h
diff --git a/plugins/wimaxasncp/AUTHORS b/plugins/epan/wimaxasncp/AUTHORS
index 4a80a5841b..4a80a5841b 100644
--- a/plugins/wimaxasncp/AUTHORS
+++ b/plugins/epan/wimaxasncp/AUTHORS
diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/epan/wimaxasncp/CMakeLists.txt
index b2abc0ca31..b2abc0ca31 100644
--- a/plugins/wimaxasncp/CMakeLists.txt
+++ b/plugins/epan/wimaxasncp/CMakeLists.txt
diff --git a/plugins/wimaxasncp/ChangeLog b/plugins/epan/wimaxasncp/ChangeLog
index dccc530513..dccc530513 100644
--- a/plugins/wimaxasncp/ChangeLog
+++ b/plugins/epan/wimaxasncp/ChangeLog
diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/epan/wimaxasncp/Makefile.am
index e7216f5b4d..c2f122c3b0 100644
--- a/plugins/wimaxasncp/Makefile.am
+++ b/plugins/epan/wimaxasncp/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = wimaxasncp
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/epan/wimaxasncp/packet-wimaxasncp.c
index ebf248cdfd..ebf248cdfd 100644
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/epan/wimaxasncp/packet-wimaxasncp.c
diff --git a/plugins/wimaxasncp/wimaxasncp_dict.h b/plugins/epan/wimaxasncp/wimaxasncp_dict.h
index dc241a07ce..dc241a07ce 100644
--- a/plugins/wimaxasncp/wimaxasncp_dict.h
+++ b/plugins/epan/wimaxasncp/wimaxasncp_dict.h
diff --git a/plugins/wimaxasncp/wimaxasncp_dict.l b/plugins/epan/wimaxasncp/wimaxasncp_dict.l
index d5ca35f5a1..d5ca35f5a1 100644
--- a/plugins/wimaxasncp/wimaxasncp_dict.l
+++ b/plugins/epan/wimaxasncp/wimaxasncp_dict.l
diff --git a/plugins/wimaxmacphy/AUTHORS b/plugins/epan/wimaxmacphy/AUTHORS
index d67332d9b7..d67332d9b7 100644
--- a/plugins/wimaxmacphy/AUTHORS
+++ b/plugins/epan/wimaxmacphy/AUTHORS
diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/epan/wimaxmacphy/CMakeLists.txt
index 62040932c6..62040932c6 100644
--- a/plugins/wimaxmacphy/CMakeLists.txt
+++ b/plugins/epan/wimaxmacphy/CMakeLists.txt
diff --git a/plugins/wimaxmacphy/ChangeLog b/plugins/epan/wimaxmacphy/ChangeLog
index ce4f0bcc4a..ce4f0bcc4a 100644
--- a/plugins/wimaxmacphy/ChangeLog
+++ b/plugins/epan/wimaxmacphy/ChangeLog
diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/epan/wimaxmacphy/Makefile.am
index d6208fea98..3edb07567a 100644
--- a/plugins/wimaxmacphy/Makefile.am
+++ b/plugins/epan/wimaxmacphy/Makefile.am
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
# the name of the plugin
PLUGIN_NAME = wimaxmacphy
diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.c b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c
index d872453bee..d872453bee 100644
--- a/plugins/wimaxmacphy/packet-wimaxmacphy.c
+++ b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c
diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.h b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.h
index 97919fa0cd..97919fa0cd 100644
--- a/plugins/wimaxmacphy/packet-wimaxmacphy.h
+++ b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.h
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index 6976091d48..371b5ebfb5 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -55,7 +55,7 @@
#include "epan/dissectors/packet-t30.h"
#include "epan/dissectors/packet-h248.h"
#include "epan/dissectors/packet-sccp.h"
-#include "plugins/unistim/packet-unistim.h"
+#include "plugins/epan/unistim/packet-unistim.h"
#include "epan/dissectors/packet-skinny.h"
#include "epan/dissectors/packet-iax2.h"
#include "epan/rtp_pt.h"
diff --git a/wsutil/plugins.c b/wsutil/plugins.c
index 858edbe205..8c89f4657c 100644
--- a/wsutil/plugins.c
+++ b/wsutil/plugins.c
@@ -34,7 +34,6 @@ typedef struct _plugin {
GModule *handle; /* handle returned by g_module_open */
gchar *name; /* plugin name */
const gchar *version; /* plugin version */
- const gchar *type_dir; /* filesystem name (where it resides). */
const gchar *type_name; /* user-facing name (what it does). Should these be capitalized? */
} plugin;
@@ -51,6 +50,41 @@ static GPtrArray *plugins_array = NULL;
/* map of names to plugin */
static GHashTable *plugins_table = NULL;
+
+static inline const char *
+type_to_dir(plugin_type_e type)
+{
+ switch (type) {
+ case WS_PLUGIN_EPAN:
+ return TYPE_DIR_EPAN;
+ case WS_PLUGIN_WIRETAP:
+ return TYPE_DIR_WIRETAP;
+ case WS_PLUGIN_CODEC:
+ return TYPE_DIR_CODECS;
+ default:
+ g_error("Unknown plugin type: %u. Aborting.", (unsigned) type);
+ break;
+ }
+ g_assert_not_reached();
+}
+
+static inline const char *
+type_to_name(plugin_type_e type)
+{
+ switch (type) {
+ case WS_PLUGIN_EPAN:
+ return TYPE_NAME_DISSECTOR;
+ case WS_PLUGIN_WIRETAP:
+ return TYPE_NAME_FILE_TYPE;
+ case WS_PLUGIN_CODEC:
+ return TYPE_NAME_CODEC;
+ default:
+ g_error("Unknown plugin type: %u. Aborting.", (unsigned) type);
+ break;
+ }
+ g_assert_not_reached();
+}
+
static void
free_plugin(gpointer data)
{
@@ -67,20 +101,28 @@ compare_plugins(gconstpointer a, gconstpointer b)
}
static void
-plugins_scan_dir(GPtrArray **plugins_ptr, const char *dirpath, plugin_type_e type, gboolean build_dir)
+plugins_scan_dir(GPtrArray **plugins_ptr, const char *dirpath, plugin_type_e type, gboolean append_type)
{
GDir *dir;
const char *name; /* current file name */
- gchar *path; /* current file full path */
+ gchar *plugin_folder;
+ gchar *plugin_file; /* current file full path */
GModule *handle; /* handle returned by g_module_open */
gpointer symbol;
const char *plug_version, *plug_release;
plugin *new_plug;
gchar *dot;
- dir = g_dir_open(dirpath, 0, NULL);
- if (dir == NULL)
+ if (append_type)
+ plugin_folder = g_build_filename(dirpath, type_to_dir(type), (gchar *)NULL);
+ else
+ plugin_folder = g_strdup(dirpath);
+
+ dir = g_dir_open(plugin_folder, 0, NULL);
+ if (dir == NULL) {
+ g_free(plugin_folder);
return;
+ }
while ((name = g_dir_read_name(dir)) != NULL) {
/* Skip anything but files with G_MODULE_SUFFIX. */
@@ -103,16 +145,14 @@ plugins_scan_dir(GPtrArray **plugins_ptr, const char *dirpath, plugin_type_e typ
*/
if (g_hash_table_lookup(plugins_table, name)) {
/* Yes, it is. */
- if (!build_dir) {
- report_warning("The plugin '%s' was found "
+ report_warning("The plugin '%s' was found "
"in multiple directories", name);
- }
continue;
}
- path = g_build_filename(dirpath, name, (gchar *)NULL);
- handle = g_module_open(path, G_MODULE_BIND_LOCAL);
- g_free(path);
+ plugin_file = g_build_filename(plugin_folder, name, (gchar *)NULL);
+ handle = g_module_open(plugin_file, G_MODULE_BIND_LOCAL);
+ g_free(plugin_file);
if (handle == NULL) {
/* g_module_error() provides file path. */
report_failure("Couldn't load plugin '%s': %s", name,
@@ -157,31 +197,7 @@ DIAG_ON(pedantic)
new_plug->handle = handle;
new_plug->name = g_strdup(name);
new_plug->version = plug_version;
- new_plug->type_dir = "[build]";
- switch (type) {
- case WS_PLUGIN_EPAN:
- if (!build_dir) {
- new_plug->type_dir = TYPE_DIR_EPAN;
- }
- // XXX This isn't true for stats_tree and TRANSUM.
- new_plug->type_name = TYPE_NAME_DISSECTOR;
- break;
- case WS_PLUGIN_WIRETAP:
- if (!build_dir) {
- new_plug->type_dir = TYPE_DIR_WIRETAP;
- }
- new_plug->type_name = TYPE_NAME_FILE_TYPE;
- break;
- case WS_PLUGIN_CODEC:
- if (!build_dir) {
- new_plug->type_dir = TYPE_DIR_CODECS;
- }
- new_plug->type_name = TYPE_NAME_CODEC;
- break;
- default:
- g_error("Unknown plugin type: %u. Aborting.", (unsigned) type);
- break;
- }
+ new_plug->type_name = type_to_name(type);
/* Add it to the list of plugins. */
if (*plugins_ptr == NULL)
@@ -191,6 +207,7 @@ DIAG_ON(pedantic)
g_hash_table_insert(plugins_table, new_plug->name, new_plug);
}
ws_dir_close(dir);
+ g_free(plugin_folder);
}
/*
@@ -199,17 +216,23 @@ DIAG_ON(pedantic)
static void
scan_plugins_build_dir(GPtrArray **plugins_ptr, plugin_type_e type)
{
- const char *plugin_dir;
const char *name;
- char *plugin_dir_path;
+ char *dirpath;
+ char *plugin_folder;
WS_DIR *dir; /* scanned directory */
WS_DIRENT *file; /* current file */
- plugin_dir = get_plugins_dir();
- if ((dir = ws_dir_open(plugin_dir, 0, NULL)) == NULL)
+ /* Cmake */
+ plugins_scan_dir(plugins_ptr, get_plugins_dir_with_version(), type, TRUE);
+
+ /* Autotools */
+ dirpath = g_build_filename(get_plugins_dir(), type_to_dir(type), (char *)NULL);
+ dir = ws_dir_open(dirpath, 0, NULL);
+ if (dir == NULL) {
+ g_free(dirpath);
return;
+ }
- plugins_scan_dir(plugins_ptr, plugin_dir, type, TRUE);
while ((file = ws_dir_read_name(dir)) != NULL)
{
name = ws_dir_get_name(file);
@@ -219,8 +242,8 @@ scan_plugins_build_dir(GPtrArray **plugins_ptr, plugin_type_e type)
* Get the full path of a ".libs" subdirectory of that
* directory.
*/
- plugin_dir_path = g_build_filename(plugin_dir, name, ".libs", (gchar *)NULL);
- if (test_for_directory(plugin_dir_path) != EISDIR) {
+ plugin_folder = g_build_filename(dirpath, name, ".libs", (gchar *)NULL);
+ if (test_for_directory(plugin_folder) != EISDIR) {
/*
* Either it doesn't refer to a directory or it
* refers to something that doesn't exist.
@@ -229,13 +252,14 @@ scan_plugins_build_dir(GPtrArray **plugins_ptr, plugin_type_e type)
* the subdirectory of the plugin directory, not
* a ".libs" subdirectory of that subdirectory.
*/
- g_free(plugin_dir_path);
- plugin_dir_path = g_build_filename(plugin_dir, name, (gchar *)NULL);
+ g_free(plugin_folder);
+ plugin_folder = g_build_filename(get_plugins_dir(), name, (gchar *)NULL);
}
- plugins_scan_dir(plugins_ptr, plugin_dir_path, type, TRUE);
- g_free(plugin_dir_path);
+ plugins_scan_dir(plugins_ptr, plugin_folder, type, FALSE);
+ g_free(plugin_folder);
}
ws_dir_close(dir);
+ g_free(dirpath);
}
/*
@@ -247,24 +271,6 @@ plugins_init(plugin_type_e type)
if (!g_module_supported())
return NULL; /* nothing to do */
- const char *type_dir;
-
- switch (type) {
- case WS_PLUGIN_EPAN:
- type_dir = TYPE_DIR_EPAN;
- break;
- case WS_PLUGIN_WIRETAP:
- type_dir = TYPE_DIR_WIRETAP;
- break;
- case WS_PLUGIN_CODEC:
- type_dir = TYPE_DIR_CODECS;
- break;
- default:
- g_error("Unknown plugin type: %u. Aborting.", (unsigned) type);
- break;
- }
-
- gchar *dirpath;
GPtrArray *plugins = NULL;
if (plugins_table == NULL)
@@ -285,9 +291,7 @@ plugins_init(plugin_type_e type)
}
else
{
- dirpath = g_build_filename(get_plugins_dir_with_version(), type_dir, (gchar *)NULL);
- plugins_scan_dir(&plugins, dirpath, type, FALSE);
- g_free(dirpath);
+ plugins_scan_dir(&plugins, get_plugins_dir_with_version(), type, TRUE);
}
/*
@@ -300,9 +304,7 @@ plugins_init(plugin_type_e type)
*/
if (!started_with_special_privs())
{
- dirpath = g_build_filename(get_plugins_pers_dir_with_version(), type_dir, (gchar *)NULL);
- plugins_scan_dir(&plugins, dirpath, type, FALSE);
- g_free(dirpath);
+ plugins_scan_dir(&plugins, get_plugins_pers_dir_with_version(), type, TRUE);
}
g_ptr_array_sort(plugins_array, compare_plugins);