X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=images%2FMakefile.am;h=ff8d46fbd9d5f5eaf0bfae4c5e57fd7ccd8e34c2;hp=3c30df5aecbcd51fc06e6a3f67d9909e8d1d5213;hb=50195d6ec4e893f894ef1bbf7af6eeda56f96600;hpb=7c4f90ddb8378dcf90cb0cc219105dccaa8a9d6e

diff --git a/images/Makefile.am b/images/Makefile.am
index 3c30df5..ff8d46f 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -15,12 +15,15 @@
 # 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
+
 # Old RHEL 5 autoconf doesn't have builddir.
 builddir ?= $(top_builddir)/images
 
 EXTRA_DIST = \
 	helloworld.tar \
 	helloworld.tar.gz \
+	helloworld.tar.xz \
 	mbr-ext2-empty.img.gz \
 	empty known-1 known-2 known-3 known-4 known-5 \
 	bin-i586-dynamic \
@@ -35,16 +38,17 @@ EXTRA_DIST = \
 	lib-x86_64.so \
 	test-grep.txt
 
-noinst_DATA = test.sqsh
+noinst_DATA = test.iso
 
 CLEANFILES = \
-	test.sqsh \
+	test.iso test.sqsh \
 	100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
 	initrd
 
-squash_files_src = \
+images_files_src = \
 	$(srcdir)/helloworld.tar \
 	$(srcdir)/helloworld.tar.gz \
+	$(srcdir)/helloworld.tar.xz \
 	$(srcdir)/empty \
 	$(srcdir)/known-1 \
 	$(srcdir)/known-2 \
@@ -63,7 +67,7 @@ squash_files_src = \
 	$(srcdir)/lib-x86_64.so \
 	$(srcdir)/test-grep.txt
 
-squash_files_build = \
+images_files_build = \
 	$(builddir)/100kallzeroes \
 	$(builddir)/100kallnewlines \
 	$(builddir)/100kallspaces \
@@ -74,12 +78,14 @@ squash_files_build = \
 	$(builddir)/initrd-x86_64.img.gz \
 	$(builddir)/test-grep.txt.gz
 
-squash_files = $(squash_files_src) $(squash_files_build)
+images_files = $(images_files_src) $(images_files_build)
 
-test.sqsh: $(squash_files)
+test.iso: $(images_files)
 	rm -f $@ $@-t
 	mkdir -p directory
-	$(MKSQUASHFS) $(squash_files) directory $@-t
+	$(MKISOFS) -J -r -graft-points \
+	  -o $@-t \
+	  $(images_files) /directory=directory
 	rmdir directory
 	mv $@-t $@