X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2FMakefile.am;h=d692c7f4d67b3aac52a0f9ee65f1c5b3bd6ff5f5;hb=8736b6fa7173ddc33687c4bd9e3fb22d65922fd1;hp=2c8a0be7478f11dc3774e8c93b94118c1d95374e;hpb=3087b47c3abac1ad8773dd07500b51423e62079f;p=libguestfs.git

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 2c8a0be..d692c7f 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -17,9 +17,11 @@
 
 EXTRA_DIST = \
 	make.sh update.sh supermin-split.sh supermin-make.sh \
-	guestfs-supermin-helper \
+	libguestfs-supermin-helper \
 	kmod.whitelist \
-	kmod.whitelist.in
+	kmod.whitelist.in \
+	packagelist.in \
+	init
 
 # Build the root filesystem (appliance).
 # Currently this is arch-dependent, so it seems like putting it in
@@ -38,7 +40,7 @@ fs_DATA = $(APPLIANCE_FILES)
 APPLIANCE_FILES = $(INITRAMFSIMG) $(VMLINUZ)
 if SUPERMIN
 APPLIANCE_FILES += $(SUPERMINIMG) $(SUPERMINFILES) kmod.whitelist
-bin_SCRIPTS = guestfs-supermin-helper
+bin_SCRIPTS = libguestfs-supermin-helper
 endif
 
 # Don't change these names - they must be the same as in '*.sh' scripts.
@@ -52,7 +54,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
+$(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist init
 	-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
 	-mv $(VMLINUZ) $(VMLINUZ).bak
 	if ! bash make.sh; then rm -f $@; exit 1; fi
@@ -65,6 +67,10 @@ $(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/g
 kmod.whitelist: kmod.whitelist.in
 	grep -v '^[[:space:]]*$$' < $< | grep -v '^#' > $@
 
+packagelist: packagelist.in
+	cpp -undef -DREDHAT=1 < $< | \
+	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@
+
 # This is for building the supermin appliance.  It has to be enabled
 # specifically with './configure --enable-supermin'.  You really need
 # to read the README file.
@@ -92,7 +98,7 @@ endif
 	cd .. && ./config.status appliance/$@
 	chmod +x $@
 
-guestfs-supermin-helper: guestfs-supermin-helper.in
+libguestfs-supermin-helper: libguestfs-supermin-helper.in
 	cd .. && ./config.status appliance/$@
 	chmod +x $@