From 2f759ce7a7afb58f86006aaefcf475941e5a9e05 Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Tue, 16 Jan 2018 16:59:28 +0100 Subject: [PATCH] Update paths after dissector plugin move. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the change in paths of the dissector plugins in the repository some other paths require adjustment. These are the obvious changes remaining. Change-Id: Id49ac6aaf1a29d9eb37f4c32226a4597d5e32edd Signed-off-by: Jaap Keuter Reviewed-on: https://code.wireshark.org/review/25343 Reviewed-by: João Valverde Reviewed-by: Gerald Combs --- .gitignore | 6 ++++-- CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e599d6074c..ba2d20e83f 100644 --- a/.gitignore +++ b/.gitignore @@ -43,8 +43,10 @@ epan/wslua/register_wslua.c epan/wslua/taps.txt epan/wslua/taps_wslua.c epan/ps.c -plugins/*/plugin.c -plugins/mate/mate_parser.c +plugins/epan/*/plugin.c +plugins/wiretap/*/plugin.c +plugins/codecs/*/plugin.c +plugins/epan/mate/mate_parser.c version.h tools/lemon/lemon tshark-tap-register.c diff --git a/CMakeLists.txt b/CMakeLists.txt index ad3f4b9221..6fed989850 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1390,7 +1390,7 @@ if(ENABLE_PLUGINS) if(ENABLE_PLUGIN_IFDEMO) set(PLUGIN_SRC_DIRS ${PLUGIN_SRC_DIRS} - plugins/pluginifdemo + plugins/epan/pluginifdemo ) endif()