[Pkg-libvirt-commits] [libguestfs] 10/34: 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 experimental
in repository libguestfs.

commit 0a966727abc83550d2026886eac2440c99e6cb5e
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.
---
 Makefile.am           |  2 ++
 appliance/Makefile.am | 10 +---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e34e10c..7a8316f 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 b98ddf5..11dbadf 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -35,19 +35,11 @@ fs_DATA =
 superminfs_DATA = \
 	supermin.d/init.tar.gz \
 	supermin.d/udev-rules.tar.gz
-
-if ENABLE_DAEMON
-superminfs_DATA += \
-	supermin.d/daemon.tar.gz
-endif
-
-if ENABLE_APPLIANCE
-superminfs_DATA += \
+	supermin.d/daemon.tar.gz \
 	supermin.d/base.tar.gz \
 	supermin.d/packages \
 	supermin.d/excludefiles \
 	supermin.d/hostfiles
-endif
 
 supermin.d/base.tar.gz \
 supermin.d/daemon.tar.gz \

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