[libvirt] [PATCH] build: fix distdir with wireshark disabled
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 -- 2.5.0
On 12.01.2016 23:20, 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(-)
ACK and safe for freeze. Michal
On 01/13/2016 08:37 AM, Michal Privoznik wrote:
On 12.01.2016 23:20, 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(-)
ACK and safe for freeze.
Michal
Thanks, pushed now - Cole
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...
participants (3)
-
Cole Robinson -
Laine Stump -
Michal Privoznik