X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=images%2FMakefile.am;h=daf3ea76814e72e589057a407f64c9b313619ea5;hb=e494a59921456d854a070612dad3e7c1e83f30a1;hp=d97dd458a97ab33be937ef2b5f31c071c13352ca;hpb=9becb385b78eddb9b3817c6accaa6cdb3db0b5af;p=libguestfs.git

diff --git a/images/Makefile.am b/images/Makefile.am
index d97dd45..daf3ea7 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -42,13 +42,19 @@ EXTRA_DIST = \
 	guest-aux/make-fedora-img.sh \
 	guest-aux/fedora-name.db.txt \
 	guest-aux/fedora-name.db \
-	guest-aux/make-ubuntu-img.sh
+	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 ubuntu.img
+check_DATA = debian.img fedora.img ubuntu.img windows.img
 
 CLEANFILES = \
 	test.iso test.sqsh \
@@ -165,19 +171,44 @@ $(builddir)/test-grep.txt.gz: test-grep.txt
 fedora.img: guest-aux/make-fedora-img.sh guest-aux/fedora-name.db
 	LIBGUESTFS_PATH=../appliance \
 	LD_LIBRARY_PATH=../src/.libs \
+	TMPDIR=$(top_builddir) \
 	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 \
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	TMPDIR=$(top_builddir) \
 	bash $<
 
 # Make a (dummy) Ubuntu image.
 ubuntu.img: guest-aux/make-ubuntu-img.sh
-	LIBGUESTFS_PATH=../appliance \
-	LD_LIBRARY_PATH=../src/.libs \
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	TMPDIR=$(top_builddir) \
+	bash $<
+
+# Make a (dummy) Windows image.
+windows.img: guest-aux/make-windows-img.sh \
+	     guest-aux/windows-software guest-aux/windows-system
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+	TMPDIR=$(top_builddir) \
 	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 $@