X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=c1fc85d6fde6734ef5bb5f60eac93be499d53e5c;hp=c33710ad09ec12895f51d4297d5bf0a6b5af6e6b;hb=1f56debfcfdc35d6b0e7fec469dba0598d7f1901;hpb=835c0186c8771bb1c850f6c82356f9c731323413

diff --git a/Makefile.am b/Makefile.am
index c33710a..c1fc85d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ include $(top_srcdir)/subdir-rules.mk
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \
+SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
 	gnulib/tests capitests regressions test-tool
 
 # NB: Must build inspector directory after perl and before ocaml.
@@ -56,16 +56,8 @@ if HAVE_HASKELL
 SUBDIRS += haskell
 endif
 
-generator_built = \
-	guestfs-actions.pod \
-	guestfs-availability.pod \
-	guestfs-structs.pod \
-	guestfish-actions.pod
-
 EXTRA_DIST = \
 	$(generator_built) \
-	guestfs.pod \
-	guestfish.pod \
 	html/pod.css \
 	HACKING TODO \
 	libguestfs.pc libguestfs.pc.in \
@@ -78,58 +70,24 @@ EXTRA_DIST = \
 	make-recipes.sh \
 	contrib/README \
 	bindtests \
-	libguestfs.3
-
-# Manual pages.
-# guestfs-actions.pod, guestfs-availability.pod and guestfs-structs
-# are autogenerated.  There is no include mechanism for POD, so we
-# have to do it by hand.
-
-man_MANS = guestfs.3 libguestfs.3 guestfish.1
+	.gitignore \
+	m4/.gitignore
 
-guestfs.3: guestfs.pod \
-		guestfs-actions.pod \
-		guestfs-availability.pod \
-		guestfs-structs.pod
-	sed \
-	  -e '/@ACTIONS@/rguestfs-actions.pod' \
-	  -e 's/@ACTIONS@//' \
-	  -e '/@AVAILABILITY@/rguestfs-availability.pod' \
-	  -e 's/@AVAILABILITY@//' \
-	  -e '/@STRUCTS@/rguestfs-structs.pod' \
-	  -e 's/@STRUCTS@//' \
-	  < $< | \
-	$(POD2MAN) \
-	  --section 3 \
-	  -c "Virtualization Support" \
-	  --name "guestfs" \
-	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-	  > $@
-
-guestfish.1: guestfish.pod guestfish-actions.pod
-	sed \
-	  -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
-	  < $< | \
-	$(POD2MAN) \
-	  --section 1 \
-	  -c "Virtualization Support" \
-	  --name "guestfish" \
-	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-	  > $@
+# HTML versions of manual pages.
 
 noinst_DATA = html/guestfs.3.html html/guestfish.1.html
 
-html/guestfs.3.html: guestfs.pod \
-		guestfs-actions.pod \
-		guestfs-availability.pod \
-		guestfs-structs.pod
+html/guestfs.3.html: src/guestfs.pod \
+		src/guestfs-actions.pod \
+		src/guestfs-availability.pod \
+		src/guestfs-structs.pod
 	mkdir -p html
 	sed \
-	  -e '/@ACTIONS@/rguestfs-actions.pod' \
+	  -e '/@ACTIONS@/rsrc/guestfs-actions.pod' \
 	  -e 's/@ACTIONS@//' \
-	  -e '/@AVAILABILITY@/rguestfs-availability.pod' \
+	  -e '/@AVAILABILITY@/rsrc/guestfs-availability.pod' \
 	  -e 's/@AVAILABILITY@//' \
-	  -e '/@STRUCTS@/rguestfs-structs.pod' \
+	  -e '/@STRUCTS@/rsrc/guestfs-structs.pod' \
 	  -e 's/@STRUCTS@//' \
 	  < $< | \
 	pod2html \
@@ -138,10 +96,10 @@ html/guestfs.3.html: guestfs.pod \
 	  --htmldir html \
 	  --outfile $@
 
-html/guestfish.1.html: guestfish.pod guestfish-actions.pod
+html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod
 	mkdir -p html
 	sed \
-	  -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
+	  -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
 	  < $< | \
 	pod2html \
 	  --css 'pod.css' \
@@ -160,9 +118,6 @@ HTMLFILES = \
 	html/guestfs.3.html \
 	html/guestfish.1.html \
 	html/guestmount.1.html \
-	html/hivex.3.html \
-	html/hivexget.1.html \
-	html/hivexml.1.html \
 	html/virt-cat.1.html \
 	html/virt-df.1.html \
 	html/virt-edit.1.html \
@@ -236,3 +191,12 @@ CLEANFILES = $(fs_DATA) \
 
 clean-local:
 	rm -rf initramfs
+
+# If you don't want to run all of the tests ('make check') then this
+# will just run libguestfs-test-tool for a quick check.  Note this
+# is NOT a substitute for proper testing!
+
+quickcheck:
+	LIBGUESTFS_PATH=appliance \
+	test-tool/libguestfs-test-tool \
+	  --helper test-tool/libguestfs-test-tool-helper