Re: [PATCH] build: fix distdir with wireshark disabled

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 01/12/2016 05:20 PM, Cole Robinson wrote:
Even though the Makefile has WITH_WIRESHARK guards, the _SOURCES
variables are still processed when adding bits to the dist archive.

plugin.c is a generated file that is only built when wireshark is
enabled and it shouldn't be distributed, so use 'nodist'
---
  tools/Makefile.am | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index d38d3cb..5bf6a3e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -386,10 +386,10 @@ 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
+nodist_wireshark_src_libvirt_la_SOURCES = wireshark/src/plugin.c
  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.c: wireshark/src/packet-libvirt.h \
  		wireshark/src/libvirt/protocol.h

ACK. That fixed the build on RHEL7 at least...

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]