Libguestfs - Oct 2011 - [PATCH 1/3] out-of-tree build: daemon

---
 daemon/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index e23ce86..af075d7 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -42,10 +42,10 @@ noinst_LIBRARIES = libprotocol.a
 libprotocol_a_SOURCES = guestfs_protocol.c guestfs_protocol.h
 libprotocol_a_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing
 
-guestfs_protocol.c: $(libsrcdir)/guestfs_protocol.c
+guestfs_protocol.c: $(srcdir)/guestfs_protocol.c
 	rm -f $@
 	ln $< $@
-guestfs_protocol.h: $(libsrcdir)/guestfs_protocol.h
+guestfs_protocol.h: $(srcdir)/guestfs_protocol.h
 	rm -f $@
 	ln $< $@
 $(libsrcdir)/guestfs_protocol.c: force
-- 
1.7.7

---
 generator/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/generator/Makefile.am b/generator/Makefile.am
index 51a9462..44c0594 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -86,7 +86,7 @@ else
 # No OCaml compiler.  Just replace the generator with a script that
 # touches stamp-generator and prints a warning.
 
-generator: $(SOURCES)
+$(srcdir)/generator: $(SOURCES)
 	rm -f $@ $@-t
 	echo 'echo Warning: Install OCaml compiler in order to rebuild the
generated files.' >> $@-t
 	echo 'touch generator/stamp-generator' >> $@-t
-- 
1.7.7

---
 haskell/run-bindtests |    3 ++-
 inspector/Makefile.am |    2 +-
 java/run-bindtests    |    2 +-
 ocaml/run-bindtests   |    2 +-
 perl/run-bindtests    |    2 +-
 python/run-bindtests  |    5 +++--
 ruby/run-bindtests    |    2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/haskell/run-bindtests b/haskell/run-bindtests
index f9ea434..85b8048 100755
--- a/haskell/run-bindtests
+++ b/haskell/run-bindtests
@@ -19,4 +19,5 @@
 set -e
 
 ./Bindtests > bindtests.tmp
-diff -u ../bindtests bindtests.tmp
+diff -u ${srcdir}/../bindtests bindtests.tmp
+
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 03e13d8..2389dbd 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -90,7 +90,7 @@ stamp-virt-inspector.pod: virt-inspector.pod
 if HAVE_XMLLINT
 
 TESTS = $(EXAMPLE_XML)
-TESTS_ENVIRONMENT = $(XMLLINT) --noout --relaxng virt-inspector.rng
+TESTS_ENVIRONMENT = $(XMLLINT) --noout --relaxng $(srcdir)/virt-inspector.rng
 
 endif
 
diff --git a/java/run-bindtests b/java/run-bindtests
index b80c4dc..7e6eb7f 100755
--- a/java/run-bindtests
+++ b/java/run-bindtests
@@ -19,4 +19,4 @@
 set -e
 
 $JAVA -Djava.library.path=.libs Bindtests > bindtests.tmp
-diff -u ../bindtests bindtests.tmp
+diff -u ${srcdir}/../bindtests bindtests.tmp
diff --git a/ocaml/run-bindtests b/ocaml/run-bindtests
index 5200fec..d9a3047 100755
--- a/ocaml/run-bindtests
+++ b/ocaml/run-bindtests
@@ -19,4 +19,4 @@
 set -e
 
 ./bindtests > bindtests.tmp
-diff -u ../bindtests bindtests.tmp
+diff -u ${srcdir}/../bindtests bindtests.tmp
diff --git a/perl/run-bindtests b/perl/run-bindtests
index d9d1ca3..f9cf231 100755
--- a/perl/run-bindtests
+++ b/perl/run-bindtests
@@ -20,4 +20,4 @@ set -e
 
 export PERL5LIB=$(pwd)/blib/lib:$(pwd)/blib/arch
 perl bindtests.pl > bindtests.tmp
-diff -u ../bindtests bindtests.tmp
+diff -u ${srcdir}/../bindtests bindtests.tmp
diff --git a/python/run-bindtests b/python/run-bindtests
index 17448c3..070c90c 100755
--- a/python/run-bindtests
+++ b/python/run-bindtests
@@ -18,5 +18,6 @@
 
 set -e
 
-python bindtests.py > bindtests.tmp
-diff -u ../bindtests bindtests.tmp
+python ${srcdir}/bindtests.py > bindtests.tmp
+diff -u ${srcdir}/../bindtests bindtests.tmp
+
diff --git a/ruby/run-bindtests b/ruby/run-bindtests
index 803d4c6..3bfa226 100755
--- a/ruby/run-bindtests
+++ b/ruby/run-bindtests
@@ -19,4 +19,4 @@
 set -e
 
 ruby -Ilib -Iext/guestfs bindtests.rb > bindtests.tmp
-diff -u ../bindtests bindtests.tmp
+diff -u ${srcdir}/../bindtests bindtests.tmp
-- 
1.7.7

Thanks -- I've pushed all three.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw

On Thu, Oct 20, 2011 at 02:20:54PM +0200, Hilko Bengen
wrote:
> ---
>  daemon/Makefile.am |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/daemon/Makefile.am b/daemon/Makefile.am
> index e23ce86..af075d7 100644
> --- a/daemon/Makefile.am
> +++ b/daemon/Makefile.am
> @@ -42,10 +42,10 @@ noinst_LIBRARIES = libprotocol.a
>  libprotocol_a_SOURCES = guestfs_protocol.c guestfs_protocol.h
>  libprotocol_a_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing
>  
> -guestfs_protocol.c: $(libsrcdir)/guestfs_protocol.c
> +guestfs_protocol.c: $(srcdir)/guestfs_protocol.c
>  	rm -f $@
>  	ln $< $@
> -guestfs_protocol.h: $(libsrcdir)/guestfs_protocol.h
> +guestfs_protocol.h: $(srcdir)/guestfs_protocol.h
>  	rm -f $@
>  	ln $< $@
>  $(libsrcdir)/guestfs_protocol.c: force
Sorry, we had to revert this one because it caused build failures when
the source and build dir were the same.  See:

http://git.annexia.org/?p=libguestfs.git;a=commitdiff;h=35900223df1d05d0b8f4da79c854bee9899f81be

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming blog: http://rwmj.wordpress.com
Fedora now supports 80 OCaml packages (the OPEN alternative to F#)
http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora