[libvirt] [PATCH] build: Fix 'make rpm' in VPATH with wireshark

Martin Kletzander mkletzan at redhat.com
Tue Feb 4 10:32:14 UTC 2014


On Tue, Feb 04, 2014 at 11:14:34AM +0100, Christophe Fergeau wrote:
> On Tue, Feb 04, 2014 at 10:57:45AM +0100, Martin Kletzander wrote:
> > Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
> > ---
> >  tools/wireshark/Makefile.am     | 1 +
> >  tools/wireshark/src/Makefile.am | 2 +-
> >  2 files changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/wireshark/Makefile.am b/tools/wireshark/Makefile.am
> > index b6fa57c..28e6ed8 100644
> > --- a/tools/wireshark/Makefile.am
> > +++ b/tools/wireshark/Makefile.am
> > @@ -20,3 +20,4 @@
> >  if WITH_WIRESHARK_DISSECTOR
> >  SUBDIRS              = src
> >  endif WITH_WIRESHARK_DISSECTOR
> > +EXTRA_DIST           = util/genxdrstub.pl util/make-dissector-reg
>
> I'd add samples/libvirt-sample.pdml as well even though it's just a sample file and
> not required for building.
>
> ACK with/without this change.
>

Oh no, I always forget that my git send-email is not set up the same
way as format-patch is; that is formatting notes into commit messages.
Thus this mail misses the "Pushed as a build-breaker" note :(

So this is already pushed, but feel free to add the sample as well, at
least it will be part of the tar.gz.  I don't know where to put it in
the specfile, though.

Martin

> Christophe
>
> > diff --git a/tools/wireshark/src/Makefile.am b/tools/wireshark/src/Makefile.am
> > index afe9975..44f22be 100644
> > --- a/tools/wireshark/src/Makefile.am
> > +++ b/tools/wireshark/src/Makefile.am
> > @@ -21,7 +21,7 @@
> >  INCLUDES = -I$(top_srcdir)
> >
> >  ws_plugin_LTLIBRARIES     = libvirt.la
> > -libvirt_la_SOURCES        = packet-libvirt.c plugin.c
> > +libvirt_la_SOURCES        = packet-libvirt.h packet-libvirt.c plugin.c
> >  libvirt_la_CPPFLAGS       = $(WS_DISSECTOR_CPPFLAGS)
> >  libvirt_la_LDFLAGS        = -avoid-version -module
> >
> > --
> > 1.8.5.3
> >
> > --
> > libvir-list mailing list
> > libvir-list at redhat.com
> > https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140204/5e8c3fb9/attachment-0001.sig>


More information about the libvir-list mailing list