Implement RString and RStringList return types.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 154347f..8e2b49d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,13 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon examples
+SUBDIRS = src daemon fish examples
 
-EXTRA_DIST = make-initramfs.sh
+EXTRA_DIST = \
+       make-initramfs.sh update-initramfs.sh \
+       guestfs.pod guestfs-actions.pod \
+       libguestfs.spec \
+       HACKING
 
 # Build the root filesystem.
 # Currently this is arch-dependent, so it seems like putting it in
@@ -33,30 +37,64 @@ VMLINUZ = vmlinuz.$(REPO).$(host_cpu)
 
 fs_DATA =  $(INITRAMFSIMG) $(VMLINUZ)
 
-$(VMLINUZ) $(INITRAMFSIMG): initramfs.timestamp
+$(INITRAMFSIMG) $(VMLINUZ): initramfs/fakeroot.log
 
-initramfs.timestamp: make-initramfs.sh.in daemon/guestfsd
+initramfs/fakeroot.log: make-initramfs.sh.in
+       -mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
+       -mv $(VMLINUZ) $(VMLINUZ).bak
+       if ! bash $(builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi
+
+$(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
        rm -f $@
-       $(builddir)/make-initramfs.sh
+       bash $(builddir)/update-initramfs.sh
        touch $@
 
-.PHONY: daemon/guestfsd
-
 # Make clean.
 
-CLEANFILES = $(fs_DATA) initramfs.timestamp
+CLEANFILES = $(fs_DATA) emptydisk
 
 clean-local:
        rm -rf initramfs
 
+# Manual page.
+# guestfs-actions.pod is autogenerated.  There is no include mechanism
+# for POD, so we have to do it by hand.
+
+man_MANS = guestfs.3
+
+guestfs.3: guestfs.pod guestfs-actions.pod
+       sed -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' < $< | \
+       $(POD2MAN) \
+         --section 3 \
+         -c "Virtualization Support" \
+         --name "guestfs" \
+         --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
+         > $@
+
 # Test-boot the image.
 
-test-boot-image:
+test-boot: emptydisk
+       qemu-system-$(host_cpu) \
+         -m 384 \
+         -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
+         -hda emptydisk
+
+emptydisk:
        rm -f emptydisk
        dd if=/dev/zero of=emptydisk bs=1024 count=1440
-       echo 0, | sfdisk -C 80 -H 2 -S 18 emptydisk
+       echo 0, | sfdisk -q -C 80 -H 2 -S 18 emptydisk > /dev/null
+
+# This is a more realistic test boot command line which better
+# reflects what the library does.
+
+test-boot-realistic: emptydisk
        qemu-system-$(host_cpu) \
          -m 384 \
          -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
-         -hda emptydisk -boot c
-       rm -f emptydisk
+         -hda emptydisk \
+         -append "console=ttyS0 guestfs=10.0.2.4:6666" \
+         -nographic \
+         -serial stdio \
+         -net channel,6666:unix:/tmp/sock,server,nowait \
+         -net user,vlan=0 \
+         -net nic,vlan=0