[Libguestfs] [v2v PATCH 2/2] build: switch embedded copy of libvirt-ocaml

[Pino Toscano]

On Monday, 16 December 2019 16:19:03 CET Richard W.M. Jones wrote:
> On Mon, Dec 16, 2019 at 03:58:29PM +0100, Pino Toscano wrote:
> > Use the newer copy shipped locally as 3rdparty, instead of the one in
> > the common submodule, as the latter copy will go away soon.
> > ---
> >  .gitignore               | 2 ++
> >  Makefile.am              | 2 +-
> >  configure.ac             | 2 +-
> >  test-harness/Makefile.am | 2 +-
> >  v2v/Makefile.am          | 4 ++--
> >  5 files changed, 7 insertions(+), 5 deletions(-)
> > 
> > diff --git a/.gitignore b/.gitignore
> > index 846998b3..3e9a7c5b 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -30,6 +30,8 @@ dll*.so
> >  Makefile
> >  Makefile.in
> >  
> > +/3rdparty/libvirt-ocaml/.depend
> > +/3rdparty/libvirt-ocaml/libvirt_generated.c
> >  /aclocal.m4
> >  /autom4te.cache/
> >  /build-aux/
> > diff --git a/Makefile.am b/Makefile.am
> > index 039921c2..72b78769 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -41,7 +41,7 @@ SUBDIRS += common/mlxml
> >  SUBDIRS += common/mltools
> >  SUBDIRS += common/mlcustomize
> >  SUBDIRS += common/mlv2v
> > -SUBDIRS += common/mllibvirt
> > +SUBDIRS += 3rdparty/libvirt-ocaml
> 
> It's bikeshedding but how about calling it "bundled"?

For me it's the same. I chose "3rdparty" because I see it used often
when embeddeding external code, so might be easier to catch/notice.

-- 
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://listman.redhat.com/archives/libguestfs/attachments/20191216/066daf08/attachment.sig>