From: Matthew Booth <mbooth@redhat.com>
Date: Fri, 20 Nov 2009 18:43:20 +0000 (+0000)
Subject: build: Ensure building appliance depends on guestfsd
X-Git-Tag: 1.0.80~67
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=1b60344e672e4fc233d7fe6b8ecfcda46a40f4d5;p=libguestfs.git

build: Ensure building appliance depends on guestfsd

Previously, only the update.sh rule checked the daemon had been built. update.sh
is called directly from within make.sh, so in that path the dependency was never
checked. This adds the daemon dependency explicitly to the rebuild-from-scratch
path.
---

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index bf1183d..abb5086 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -59,7 +59,7 @@ endif
 # This is for building the normal appliance:
 $(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log
 
-$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist
+$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist $(top_builddir)/daemon/guestfsd
 	mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak 2>/dev/null; :
 	mv $(VMLINUZ) $(VMLINUZ).bak 2>/dev/null; :
 	if ! bash make.sh; then rm -f $@; exit 1; fi