[Libguestfs] [PATCH 4/4] Fix out-of-tree build: Do not accidentally build mllib components in srcdir

[Richard W.M. Jones]

On Tue, Mar 04, 2014 at 12:07:32AM +0100, Hilko Bengen wrote:
> ---
>  builder/Makefile.am  | 2 +-
>  resize/Makefile.am   | 2 +-
>  sparsify/Makefile.am | 2 +-
>  sysprep/Makefile.am  | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/builder/Makefile.am b/builder/Makefile.am
> index b3de967..387913c 100644
> --- a/builder/Makefile.am
> +++ b/builder/Makefile.am
> @@ -226,7 +226,7 @@ depend: .depend
>  
>  .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
>  	rm -f $@ $@-t
> -	$(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(top_srcdir)/mllib $^ | \
> +	$(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
>  	  $(SED) 's/ *$$//' | \
>  	  $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
>  	  $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
> diff --git a/resize/Makefile.am b/resize/Makefile.am
> index ef35bf9..67cb8c9 100644
> --- a/resize/Makefile.am
> +++ b/resize/Makefile.am
> @@ -147,7 +147,7 @@ depend: .depend
>  
>  .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
>  	rm -f $@ $@-t
> -	$(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(top_srcdir)/mllib $^ | \
> +	$(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
>  	  $(SED) 's/ *$$//' | \
>  	  $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
>  	  $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
> diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
> index bf6caf0..516069a 100644
> --- a/sparsify/Makefile.am
> +++ b/sparsify/Makefile.am
> @@ -138,7 +138,7 @@ depend: .depend
>  
>  .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
>  	rm -f $@ $@-t
> -	$(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(top_srcdir)/mllib $^ | \
> +	$(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
>  	  $(SED) 's/ *$$//' | \
>  	  $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
>  	  $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \
> diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
> index 22da6fd..d20ad08 100644
> --- a/sysprep/Makefile.am
> +++ b/sysprep/Makefile.am
> @@ -225,7 +225,7 @@ depend: .depend
>  
>  .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml)
>  	rm -f $@ $@-t
> -	$(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(top_srcdir)/mllib $^ | \
> +	$(OCAMLFIND) ocamldep -I ../ocaml -I $(abs_srcdir) -I $(abs_top_builddir)/mllib $^ | \
>  	  $(SED) 's/ *$$//' | \
>  	  $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
>  	  $(SED) -e 's,$(abs_srcdir)/,$(builddir)/,g' | \

ACK.

Thanks, Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW