build: Kill tools/wireshark Makefiles

Just handle it all in tools/Makefile.am. I verified the generated output
looks similar to the pre patch output, but I didn't test it.

Makefile.am

@@ -20,7 +20,7 @@ LCOV = lcov
 GENHTML = genhtml
 
 SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \
-  tests po examples tools/wireshark
+  tests po examples
 
 ACLOCAL_AMFLAGS = -I m4
 

configure.ac

@@ -2817,9 +2817,7 @@ AC_CONFIG_FILES([\
         daemon/Makefile \
         examples/Makefile \
         tests/Makefile \
-        tools/Makefile \
-        tools/wireshark/Makefile \
-        tools/wireshark/src/Makefile])
+        tools/Makefile])
 AC_OUTPUT
 
 AC_MSG_NOTICE([])

tools/Makefile.am

-## Copyright (C) 2005-2015 Red Hat, Inc.
+## Copyright (C) 2005-2016 Red Hat, Inc.
+## Copyright (C) 2013 Yuto KAWAMURA(kawamuray) <kawamuray.dadada@gmail.com>
 ##
 ## This library is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU Lesser General Public
@@ -56,7 +57,7 @@ EXTRA_DIST = \
 	virsh-volume.c
 
 
-
+CLEANFILES =
 DISTCLEANFILES =
 
 confdir = $(sysconfdir)/libvirt
@@ -374,7 +375,52 @@ libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.status
 	    mv $@-t $@
 
 
-CLEANFILES = $(bin_SCRIPTS)
+EXTRA_DIST += \
+	wireshark/util/genxdrstub.pl \
+	wireshark/util/make-dissector-reg
+
+if WITH_WIRESHARK_DISSECTOR
+
+ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
+wireshark_src_libvirt_la_CPPFLAGS = \
+	-I wireshark/src $(WIRESHARK_DISSECTOR_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
+
+wireshark/src/plugin.c: wireshark/src/packet-libvirt.c
+	cd wireshark/src && \
+		$(abs_top_srcdir)/tools/wireshark/util/make-dissector-reg \
+		. plugin packet-libvirt.c
+
+WS_DISSECTOR_PROTO_FILES  = \
+  $(abs_top_srcdir)/src/remote/remote_protocol.x \
+  $(abs_top_srcdir)/src/remote/qemu_protocol.x \
+  $(abs_top_srcdir)/src/remote/lxc_protocol.x \
+  $(abs_top_srcdir)/src/rpc/virkeepaliveprotocol.x
+
+wireshark/src/libvirt/protocol.h: wireshark/util/genxdrstub.pl \
+		$(WS_DISSECTOR_PROTO_FILES)
+	$(MKDIR_P) wireshark/src/libvirt
+	cd wireshark/src && \
+	LIBVIRT_VERSION=$(LIBVIRT_VERSION) \
+		  $(PERL) $(abs_top_srcdir)/tools/wireshark/util/genxdrstub.pl \
+		  $(WS_DISSECTOR_PROTO_FILES)
+
+CLEANFILES += wireshark/src/plugin.c
+
+endif WITH_WIRESHARK_DISSECTOR
+
+
+clean-local:
+	-rm -rf wireshark/src/libvirt
+
+CLEANFILES += $(bin_SCRIPTS)
 CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
 MAINTAINERCLEANFILES = $(dist_man1_MANS)
 

tools/wireshark/Makefile.am

-## Process this file with automake to produce Makefile.in
-
-# Copyright (C) 2013 Yuto KAWAMURA(kawamuray) <kawamuray.dadada@gmail.com>
-#
-# 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/>.
-#
-# Author: Yuto KAWAMURA(kawamuray)
-if WITH_WIRESHARK_DISSECTOR
-SUBDIRS              = src
-endif WITH_WIRESHARK_DISSECTOR
-EXTRA_DIST           = util/genxdrstub.pl util/make-dissector-reg

tools/wireshark/src/Makefile.am

-## Process this file with automake to produce Makefile.in
-
-# Copyright (C) 2013 Yuto KAWAMURA(kawamuray) <kawamuray.dadada@gmail.com>
-#
-# 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/>.
-#
-# Author: Yuto KAWAMURA(kawamuray)
-
-INCLUDES = \
-  -I$(top_srcdir) \
-  -I$(top_srcdir)/src -I$(top_builddir)/src	\
-  -I$(top_srcdir)/include -I$(top_builddir)/include	\
-  -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
-
-ws_plugin_LTLIBRARIES     = libvirt.la
-libvirt_la_SOURCES        = packet-libvirt.h packet-libvirt.c plugin.c
-libvirt_la_CPPFLAGS       = $(WIRESHARK_DISSECTOR_CFLAGS)
-libvirt_la_LDFLAGS        = -avoid-version -module
-
-packet-libvirt.c: packet-libvirt.h libvirt/protocol.h
-
-plugin.c: packet-libvirt.c
-	$(srcdir)/../util/make-dissector-reg . plugin $<
-
-WS_DISSECTOR_PROTO_FILES  = \
-  $(top_srcdir)/src/remote/remote_protocol.x \
-  $(top_srcdir)/src/remote/qemu_protocol.x \
-  $(top_srcdir)/src/remote/lxc_protocol.x \
-  $(top_srcdir)/src/rpc/virkeepaliveprotocol.x
-
-libvirt/protocol.h: $(srcdir)/../util/genxdrstub.pl $(WS_DISSECTOR_PROTO_FILES)
-	$(MKDIR_P) libvirt
-	LIBVIRT_VERSION=$(LIBVIRT_VERSION) \
-          $(PERL) $(srcdir)/../util/genxdrstub.pl $(WS_DISSECTOR_PROTO_FILES)
-
-clean-local:
-	-rm -rf libvirt plugin.c