X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=tools%2FMakefile.am;h=6441333d4f983544dbb5328fcf18972578ad2275;hb=ea293658f41fb57a72f03e18d34597ef19c8d89d;hp=c5131bd84f572ca5ea6a4b9dd54f0761308d1a6c;hpb=f6d3d5677194ae7aaea70d43845341d91907b5ee;p=libguestfs.git

diff --git a/tools/Makefile.am b/tools/Makefile.am
index c5131bd..6441333 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs virt-* tools
-# Copyright (C) 2009-2010 Red Hat Inc.
+# Copyright (C) 2009-2011 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,18 +18,14 @@
 include $(top_srcdir)/subdir-rules.mk
 
 tools = \
-	df \
 	edit \
 	list-filesystems \
 	list-partitions \
 	make-fs \
-	rescue \
-	resize \
 	tar \
 	win-reg
 
 EXTRA_DIST = \
-	run-locally \
 	$(tools:%=virt-%) \
 	test-virt-*.sh
 
@@ -41,27 +37,22 @@ bin_SCRIPTS = $(tools:%=virt-%)
 
 # Manual pages and HTML files for the website.
 
-# XXX Bug in automake?  If you list virt-df.1 explicitly, then it
+# XXX Bug in automake?  If you list virt-edit.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-df.1 $(patsubst %,virt-%.1,$(filter-out df,$(tools)))
+man_MANS = virt-edit.1 $(patsubst %,virt-%.1,$(filter-out edit,$(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.
 
@@ -73,10 +64,8 @@ TESTS_ENVIRONMENT = \
 	LIBGUESTFS_PATH=$(top_builddir)/appliance \
 	PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
 
-TESTS = test-virt-df.sh \
-	test-virt-list-filesystems.sh \
+TESTS = test-virt-list-filesystems.sh \
 	test-virt-make-fs.sh \
-	test-virt-resize.sh \
 	test-virt-tar.sh
 
 endif