git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.13.12.
[libguestfs.git]
/
tools
/
Makefile.am
diff --git
a/tools/Makefile.am
b/tools/Makefile.am
index
651daf9
..
5586bf8
100644
(file)
--- a/
tools/Makefile.am
+++ b/
tools/Makefile.am
@@
-1,5
+1,5
@@
# libguestfs virt-* tools
# libguestfs virt-* tools
-# Copyright (C) 2009-201
0
Red Hat Inc.
+# Copyright (C) 2009-201
1
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
#
# 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,19
+18,13
@@
include $(top_srcdir)/subdir-rules.mk
tools = \
include $(top_srcdir)/subdir-rules.mk
tools = \
- df \
- edit \
list-filesystems \
list-partitions \
list-filesystems \
list-partitions \
- ls \
make-fs \
make-fs \
- rescue \
- resize \
tar \
win-reg
EXTRA_DIST = \
tar \
win-reg
EXTRA_DIST = \
- run-locally \
$(tools:%=virt-%) \
test-virt-*.sh
$(tools:%=virt-%) \
test-virt-*.sh
@@
-42,27
+36,22
@@
bin_SCRIPTS = $(tools:%=virt-%)
# Manual pages and HTML files for the website.
# 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-
tar
.1 explicitly, then it
# builds and installs the man pages. However if this is removed,
# then the man pages are neither built nor installed.
# 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-
tar.1 $(patsubst %,virt-%.1,$(filter-out tar
,$(tools)))
noinst_DATA = $(tools:%=$(top_builddir)/html/virt-%.1.html)
virt-%.1: virt-%
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_builddir)/podwrapper.sh \
+ --man $@ \
+ $<
$(top_builddir)/html/virt-%.1.html: virt-%
$(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_builddir)/podwrapper.sh \
+ --html $@ \
+ $<
# Tests.
# Tests.
@@
-72,13
+61,11
@@
TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
MALLOC_PERTURB_=$(random_val) \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ TMPDIR=$(top_builddir) \
PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
-TESTS = test-virt-df.sh \
- test-virt-list-filesystems.sh \
- test-virt-ls.sh \
+TESTS = test-virt-list-filesystems.sh \
test-virt-make-fs.sh \
test-virt-make-fs.sh \
- test-virt-resize.sh \
test-virt-tar.sh
endif
test-virt-tar.sh
endif