From: Richard W.M. Jones <rjones@redhat.com>
Date: Mon, 24 Oct 2011 14:35:47 +0000 (+0100)
Subject: Revert "out-of-tree build: daemon"
X-Git-Tag: 1.13.24~2
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=35900223df1d05d0b8f4da79c854bee9899f81be;p=libguestfs.git

Revert "out-of-tree build: daemon"

This reverts commit 025dba7f803419f510fd8f085ce693838af82878.

If build and source directories are the same, you get this error:

make[3]: Leaving directory `/home/rjones/d/libguestfs/generator'
make[2]: Circular guestfs_protocol.c <- guestfs_protocol.c dependency dropped.
make[2]: Circular guestfs_protocol.h <- guestfs_protocol.h dependency dropped.
rm -f guestfs_protocol.h
ln  guestfs_protocol.h
ln: accessing `guestfs_protocol.h': No such file or directory
---

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index af075d7..e23ce86 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: $(srcdir)/guestfs_protocol.c
+guestfs_protocol.c: $(libsrcdir)/guestfs_protocol.c
 	rm -f $@
 	ln $< $@
-guestfs_protocol.h: $(srcdir)/guestfs_protocol.h
+guestfs_protocol.h: $(libsrcdir)/guestfs_protocol.h
 	rm -f $@
 	ln $< $@
 $(libsrcdir)/guestfs_protocol.c: force