X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2FMakefile.am;h=abb508643710e0fa7066daee243b792cc6e45aaf;hb=db8a46aa1165479ddf2b551e81a7e96bb06fc942;hp=6c8a972e2ff79edb7d254bd8caf040b803f31786;hpb=551baf3082bf4a346a8320df182cb3840418388f;p=libguestfs.git

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 6c8a972..abb5086 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 EXTRA_DIST = \
 	libguestfs-supermin-helper \
 	kmod.whitelist.in \
@@ -23,7 +25,8 @@ EXTRA_DIST = \
 	debian/modules/install_kernel \
 	debian/modules/y0_install-guestfsd \
 	debian/modules/z99_final-cleanups \
-	debian/debirf.conf.in
+	debian/debirf.conf.in \
+	make.sh.in
 
 # Build the root filesystem (appliance).
 # Currently this is arch-dependent, so it seems like putting it in
@@ -56,11 +59,20 @@ 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
-	-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
-	-mv $(VMLINUZ) $(VMLINUZ).bak
+$(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
 
+# This used to be a configure-generated file (as is update.sh still).
+# However config.status always touches the destination file, which
+# means the appliance got rebuilt too often.
+make.sh: make.sh.in
+	cd $(top_builddir) && \
+	  ./config.status --file=appliance/$@-t:appliance/$<
+	chmod +x $@-t
+	mv $@-t $@
+
 $(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd init update.sh
 	rm -f $@
 	bash update.sh
@@ -146,4 +158,3 @@ CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist supermin.incfiles
 
 clean-local:
 	rm -rf $(top_builddir)/initramfs
-