[Pkg-libvirt-commits] [libguestfs] 33/54: appliance: Remove conditionals in appliance/Makefile.am.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch debian
in repository libguestfs.

commit 2e068ffbffd22d4fa9d76f3a6ab880c9583cdc2d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Mar 3 13:43:35 2014 +0000

    appliance: Remove conditionals in appliance/Makefile.am.
    
    If appliance is disabled, the whole appliance/ subdirectory is
    skipped.
    
    If appliance is enabled, we can assume that the daemon is enabled too
    (see previous commit) so we don't need the conditional code.  That
    conditional code didn't work since the supermin 5 rewrite.
    
    (cherry picked from commit 0a966727abc83550d2026886eac2440c99e6cb5e)
---
 Makefile.am           |  2 ++
 appliance/Makefile.am | 18 +++++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3f228ba..988077a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,9 @@ SUBDIRS += tests/data generator src examples po
 if ENABLE_DAEMON
 SUBDIRS += daemon
 endif
+if ENABLE_APPLIANCE
 SUBDIRS += appliance
+endif
 
 # Tests - order is important.
 if ENABLE_APPLIANCE
diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index a9cc9fe..4694656 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -30,25 +30,17 @@ EXTRA_DIST = \
 fsdir = $(libdir)/guestfs
 superminfsdir = $(libdir)/guestfs/supermin.d
 
-fs_DATA =
-superminfs_DATA = \
-	supermin.d/init.img \
-	supermin.d/udev-rules.img
-
 if SUPERMIN_HELPER_COMPRESSED_CPIO
 GZ = .gz
 endif
 
-if ENABLE_DAEMON
-superminfs_DATA += \
-	supermin.d/daemon.img$(GZ)
-endif
-
-if ENABLE_APPLIANCE
-superminfs_DATA += \
+fs_DATA =
+superminfs_DATA = \
+	supermin.d/init.img \
+	supermin.d/udev-rules.img
+	supermin.d/daemon.img$(GZ) \
 	supermin.d/base.img$(GZ) \
 	supermin.d/hostfiles
-endif
 
 # This used to be a configure-generated file.  However config.status
 # always touches the destination file, which means the appliance got

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git