X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=2286dd5d8db8ec25026afee364e50fd1db79b231;hp=68934b9f9d16ad0a48c51c2e77935b4d2c45de59;hb=cead6fe22d32e8fcdb26c60fdad5db49bf3f0ec0;hpb=5aa57fbd34eb34922719d08712303b9d73ec215f diff --git a/Makefile.am b/Makefile.am index 68934b9..2286dd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,7 +54,8 @@ EXTRA_DIST = \ recipes/*.sh \ recipes/*.example \ html/recipes.css \ - make-recipes.sh + make-recipes.sh \ + test-cleanup.sh # Build the root filesystem. # Currently this is arch-dependent, so it seems like putting it in @@ -80,6 +81,9 @@ $(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd bash $(top_builddir)/update-initramfs.sh touch $@ +make-initramfs.sh: make-initramfs.sh.in + ./config.status $@ + # Tests. These are auto-generated from the test descriptions. check_PROGRAMS = tests @@ -151,7 +155,9 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar sh make-recipes.sh recipes/*.sh > $@-t mv $@-t $@ -website: html/guestfs.3.html html/guestfish.1.html html/recipes.html +website: html/guestfs.3.html html/guestfish.1.html \ + html/virt-inspector.1.html \ + html/recipes.html cp $^ html/pod.css html/recipes.css \ $(HOME)/d/redhat/et-website/libguestfs/ @@ -192,11 +198,11 @@ test-boot-realistic: emptydisk -serial stdio \ -net channel,6666:unix:/tmp/sock,server,nowait \ -net user,vlan=0 \ - -net nic,vlan=0 + -net nic,model=virtio,vlan=0 # Make clean. -CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~ recipes/*~ +CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp clean-local: rm -rf initramfs