X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=tools%2FMakefile.am;h=4ab836962ea623d8ae6adaa53b0ab3dd7cf8dff6;hp=b92243c07b294b14997d2874c1c50e2ee982336d;hb=e1aca6323e33e0dd50e23dc0d638f5789c9188e4;hpb=c6c030b64bab98602363485cb62a9e1d847d570e

diff --git a/tools/Makefile.am b/tools/Makefile.am
index b92243c..4ab8369 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -18,12 +18,10 @@
 include $(top_srcdir)/subdir-rules.mk
 
 tools = \
-	cat \
 	df \
 	edit \
 	list-filesystems \
 	list-partitions \
-	ls \
 	make-fs \
 	rescue \
 	resize \
@@ -33,7 +31,6 @@ tools = \
 EXTRA_DIST = \
 	run-locally \
 	$(tools:%=virt-%) \
-	make-test-img.sh \
 	test-virt-*.sh
 
 CLEANFILES = test.img
@@ -44,27 +41,22 @@ bin_SCRIPTS = $(tools:%=virt-%)
 
 # Manual pages and HTML files for the website.
 
-# XXX Bug in automake?  If you list virt-cat.1 explicitly, then it
+# XXX Bug in automake?  If you list virt-df.1 explicitly, then it
 # builds and installs the man pages.  However if this is removed,
 # then the man pages are neither built nor installed.
-man_MANS = virt-cat.1 $(patsubst %,virt-%.1,$(filter-out cat,$(tools)))
+man_MANS = virt-df.1 $(patsubst %,virt-%.1,$(filter-out df,$(tools)))
 
 noinst_DATA = $(tools:%=$(top_builddir)/html/virt-%.1.html)
 
 virt-%.1: virt-%
-	$(POD2MAN) \
-	  --section 1 \
-	  -c "Virtualization Support" \
-	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-	  $< > $@-t && mv $@-t $@
+	$(top_srcdir)/podwrapper.sh \
+	  --man $@ \
+	  $<
 
 $(top_builddir)/html/virt-%.1.html: virt-%
-	mkdir -p $(top_builddir)/html
-	cd $(top_builddir) && pod2html \
-	  --css 'pod.css' \
-	  --htmldir html \
-	  --outfile html/$<.1.html \
-	  tools/$<
+	$(top_srcdir)/podwrapper.sh \
+	  --html $@ \
+	  $<
 
 # Tests.
 
@@ -76,15 +68,8 @@ TESTS_ENVIRONMENT = \
 	LIBGUESTFS_PATH=$(top_builddir)/appliance \
 	PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
 
-# Build a standard test image to be used by all these tests.
-check_DATA = test.img
-test.img: make-test-img.sh
-	$(TESTS_ENVIRONMENT) $(srcdir)/make-test-img.sh
-
-TESTS = test-virt-cat.sh \
-	test-virt-df.sh \
+TESTS = test-virt-df.sh \
 	test-virt-list-filesystems.sh \
-	test-virt-ls.sh \
 	test-virt-make-fs.sh \
 	test-virt-resize.sh \
 	test-virt-tar.sh