Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
Makefile.am | 2 +-
configure.ac | 3 +--
tools/Makefile.am | 37 ---------------------------------
tools/wireshark/src/meson.build | 16 ++++++++++++++
4 files changed, 18 insertions(+), 40 deletions(-)
delete mode 100644 tools/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 0b62d15eef5..363c5cf66fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
# so force it explicitly
DISTCHECK_CONFIGURE_FLAGS = --enable-werror
-SUBDIRS = . tools docs \
+SUBDIRS = . docs \
tests po examples
XZ_OPT ?= -v -T0
diff --git a/configure.ac b/configure.ac
index 24724e3755a..20926ee9f19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,5 @@ AC_CONFIG_FILES([\
libvirt.spec mingw-libvirt.spec \
po/Makefile \
examples/Makefile \
- tests/Makefile \
- tools/Makefile])
+ tests/Makefile])
AC_OUTPUT
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index b42bcf29c53..00000000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-## Copyright (C) 2005-2016 Red Hat, Inc.
-## Copyright (C) 2013 Yuto KAWAMURA(kawamuray) <kawamuray.dadada@xxxxxxxxx>
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library. If not, see
-## <http://www.gnu.org/licenses/>.
-
-# We do not want to accidentally include stuff from src/
-# dir or public API dir. Specific files can
-# still be included via their path relative to the root if
-# needed
-if WITH_WIRESHARK_DISSECTOR
-
-ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
-wireshark_src_libvirt_la_CFLAGS = \
- -I wireshark/src $(WIRESHARK_DISSECTOR_CFLAGS) $(XDR_CFLAGS) $(AM_CFLAGS)
-wireshark_src_libvirt_la_LDFLAGS = -avoid-version -module
-wireshark_src_libvirt_la_SOURCES = \
- wireshark/src/packet-libvirt.h \
- wireshark/src/packet-libvirt.c \
- wireshark/src/plugin.c
-
-wireshark/src/packet-libvirt.c: wireshark/src/packet-libvirt.h \
- wireshark/src/libvirt/protocol.h
-
-
-endif WITH_WIRESHARK_DISSECTOR
diff --git a/tools/wireshark/src/meson.build b/tools/wireshark/src/meson.build
index f41189ba8df..49ccc9bb86e 100644
--- a/tools/wireshark/src/meson.build
+++ b/tools/wireshark/src/meson.build
@@ -1 +1,17 @@
subdir('libvirt')
+
+shared_library(
+ 'virt',
+ [
+ 'packet-libvirt.c',
+ 'plugin.c',
+ wireshark_protocol,
+ ],
+ dependencies: [
+ wireshark_dep,
+ xdr_dep,
+ tools_dep,
+ ],
+ install: true,
+ install_dir: wireshark_plugindir,
+)
--
2.26.2
