X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=images%2FMakefile.am;h=40bf90fd7d8302711dd85ec85f9b42d1902fcde0;hp=8fd3ba4362182db1dcf082e7385b51ce63a65059;hb=dc8e4b057ecd3984d7c27c8e;hpb=858d75d3911c9715bf62c3e8088cce3e991fb0fc

diff --git a/images/Makefile.am b/images/Makefile.am
index 8fd3ba4..40bf90f 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -41,13 +41,20 @@ EXTRA_DIST = \
 	guest-aux/debian-packages \
 	guest-aux/make-fedora-img.sh \
 	guest-aux/fedora-name.db.txt \
-	guest-aux/fedora-name.db
+	guest-aux/fedora-name.db \
+	guest-aux/make-ubuntu-img.sh \
+	guest-aux/make-windows-img.sh \
+	guest-aux/windows-software \
+	guest-aux/windows-software.reg \
+	guest-aux/windows-system \
+	guest-aux/windows-system.reg \
+	guest-aux/minimal-hive
 
 noinst_DATA = test.iso
 
 # This is 'check_DATA' because we don't need it until 'make check'
 # time and we need the tools we have built in order to make it.
-check_DATA = debian.img fedora.img
+check_DATA = debian.img fedora.img ubuntu.img windows.img
 
 CLEANFILES = \
 	test.iso test.sqsh \
@@ -167,10 +174,37 @@ fedora.img: guest-aux/make-fedora-img.sh guest-aux/fedora-name.db
 	bash $<
 
 guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
-	db_load $@ < $<
+	$(DB_LOAD) $@ < $<
 
 # Make a (dummy) Debian image.
 debian.img: guest-aux/make-debian-img.sh
 	LIBGUESTFS_PATH=../appliance \
 	LD_LIBRARY_PATH=../src/.libs \
 	bash $<
+
+# Make a (dummy) Ubuntu image.
+ubuntu.img: guest-aux/make-ubuntu-img.sh
+	LIBGUESTFS_PATH=../appliance \
+	LD_LIBRARY_PATH=../src/.libs \
+	bash $<
+
+# Make a (dummy) Windows image.
+windows.img: guest-aux/make-windows-img.sh \
+	     guest-aux/windows-software guest-aux/windows-system
+	LIBGUESTFS_PATH=../appliance \
+	LD_LIBRARY_PATH=../src/.libs \
+	bash $<
+
+# Since users might not have the tools needed to create this, we
+# also distribute these files.
+guest-aux/windows-software: guest-aux/windows-software.reg
+	rm -f $@ $@-t
+	cp guest-aux/minimal-hive $@-t
+	hivexregedit --merge $@-t --prefix 'HKEY_LOCAL_MACHINE\SOFTWARE' $<
+	mv $@-t $@
+
+guest-aux/windows-system: guest-aux/windows-system.reg
+	rm -f $@ $@-t
+	cp guest-aux/minimal-hive $@-t
+	hivexregedit --merge $@-t --prefix 'HKEY_LOCAL_MACHINE\SYSTEM' $<
+	mv $@-t $@