]> xenbits.xensource.com Git - libvirt.git/commitdiff
build: fix distdir with wireshark disabled
authorCole Robinson <crobinso@redhat.com>
Tue, 12 Jan 2016 20:56:42 +0000 (15:56 -0500)
committerCole Robinson <crobinso@redhat.com>
Wed, 13 Jan 2016 14:41:35 +0000 (09:41 -0500)
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

index d38d3cbff96f0597fdf5ad80c80fdfbdf32315b1..5bf6a3ea69141afb605e60078f0c5c812b956c65 100644 (file)
@@ -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