-squash_files_src = \
- $(srcdir)/helloworld.tar \
- $(srcdir)/helloworld.tar.gz \
- $(srcdir)/empty \
- $(srcdir)/known-1 \
- $(srcdir)/known-2 \
- $(srcdir)/known-3
-
-squash_files_build = \
- $(builddir)/100kallzeroes \
- $(builddir)/100kallnewlines \
- $(builddir)/100kallspaces \
- $(builddir)/100krandom \
- $(builddir)/10klines \
- $(builddir)/initrd
-
-squash_files = $(squash_files_src) $(squash_files_build)
-
-test.sqsh: $(squash_files)
- rm -f $@
- $(MKSQUASHFS) $(squash_files) $@
-
-100kallzeroes:
+images_files_src = \
+ $(srcdir)/helloworld.tar \
+ $(srcdir)/helloworld.tar.gz \
+ $(srcdir)/helloworld.tar.xz \
+ $(srcdir)/empty \
+ $(srcdir)/known-1 \
+ $(srcdir)/known-2 \
+ $(srcdir)/known-3 \
+ $(srcdir)/known-4 \
+ $(srcdir)/known-5 \
+ $(srcdir)/bin-i586-dynamic \
+ $(srcdir)/bin-sparc-dynamic \
+ $(srcdir)/bin-win32.exe \
+ $(srcdir)/bin-win64.exe \
+ $(srcdir)/bin-x86_64-dynamic \
+ $(srcdir)/lib-i586.so \
+ $(srcdir)/lib-sparc.so \
+ $(srcdir)/lib-win32.dll \
+ $(srcdir)/lib-win64.dll \
+ $(srcdir)/lib-x86_64.so \
+ $(srcdir)/test-grep.txt
+
+images_files_build = \
+ $(builddir)/100kallzeroes \
+ $(builddir)/100kallnewlines \
+ $(builddir)/100kallspaces \
+ $(builddir)/100krandom \
+ $(builddir)/10klines \
+ $(builddir)/hello.b64 \
+ $(builddir)/initrd \
+ $(builddir)/initrd-x86_64.img \
+ $(builddir)/initrd-x86_64.img.gz \
+ $(builddir)/test-grep.txt.gz
+
+images_files = $(images_files_src) $(images_files_build)
+
+test.iso: $(images_files)
+ rm -f $@ $@-t
+ mkdir -p directory
+ $(MKISOFS) -J -r -graft-points \
+ -o $@-t \
+ $(images_files) /directory=directory
+ rmdir directory
+ mv $@-t $@
+
+$(builddir)/100kallzeroes: