git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: Don't use files with fixed names in /tmp (thanks Steve Kemp).
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
3756409
..
bcafa22
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-30,13
+30,13
@@
SUBDIRS += appliance
endif
# Tests and the test-tool.
endif
# Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests regressions test-tool
+SUBDIRS += gnulib/tests capitests
caution
regressions test-tool
# Guestfish.
SUBDIRS += fish
# virt-tools in C.
# Guestfish.
SUBDIRS += fish
# virt-tools in C.
-SUBDIRS += cat df edit inspector rescue
+SUBDIRS +=
align
cat df edit inspector rescue
# Language bindings.
if HAVE_PERL
# Language bindings.
if HAVE_PERL
@@
-52,7
+52,7
@@
if HAVE_RUBY
SUBDIRS += ruby ruby/examples
endif
if HAVE_JAVA
SUBDIRS += ruby ruby/examples
endif
if HAVE_JAVA
-SUBDIRS += java
+SUBDIRS += java
java/examples
endif
if HAVE_HASKELL
SUBDIRS += haskell
endif
if HAVE_HASKELL
SUBDIRS += haskell
@@
-60,26
+60,33
@@
endif
if HAVE_PHP
SUBDIRS += php
endif
if HAVE_PHP
SUBDIRS += php
endif
+if HAVE_ERLANG
+SUBDIRS += erlang erlang/examples
+endif
# Unconditional because nothing is built yet.
SUBDIRS += csharp
# Unconditional because nothing is built yet.
SUBDIRS += csharp
-# virt-resize
2.0 is
written in OCaml.
+# virt-resize
(new version) and virt-sparsify are
written in OCaml.
if HAVE_OCAML
if HAVE_OCAML
-if HAVE_OCAML_PCRE
-SUBDIRS += resize
-endif
+SUBDIRS += resize sparsify
endif
endif
-# Perl tools
and guestmount
.
+# Perl tools.
if HAVE_TOOLS
SUBDIRS += tools
endif
if HAVE_TOOLS
SUBDIRS += tools
endif
+# guestmount
if HAVE_FUSE
SUBDIRS += fuse
endif
if HAVE_FUSE
SUBDIRS += fuse
endif
+# virt-tools in shell. This uses guestmount and virt-inspector.
+if HAVE_FUSE
+SUBDIRS += clone
+endif
+
# po-docs must come after tools, inspector.
if HAVE_PO4A
SUBDIRS += po-docs
# po-docs must come after tools, inspector.
if HAVE_PO4A
SUBDIRS += po-docs
@@
-101,6
+108,8
@@
EXTRA_DIST = \
debian/docs \
debian/guestfish.dirs \
debian/guestfish.install \
debian/docs \
debian/guestfish.dirs \
debian/guestfish.install \
+ debian/guestfsd.dirs \
+ debian/guestfsd.install \
debian/guestmount.dirs \
debian/guestmount.install \
debian/libguestfs-dev.dirs \
debian/guestmount.dirs \
debian/guestmount.install \
debian/libguestfs-dev.dirs \
@@
-119,36
+128,26
@@
EXTRA_DIST = \
debian/shlibs.local \
debian/watch \
html/pod.css \
debian/shlibs.local \
debian/watch \
html/pod.css \
- html/recipes.css \
libguestfs.pc libguestfs.pc.in \
libtool-kill-dependency_libs.sh \
logo/fish.svg logo/fish.png \
libguestfs.pc libguestfs.pc.in \
libtool-kill-dependency_libs.sh \
logo/fish.svg logo/fish.png \
- make-recipes.sh \
m4/.gitignore \
m4/.gitignore \
- recipes/LICENSE \
- recipes/README \
- recipes/*.html \
- recipes/*.sh \
- recipes/*.example \
run \
update-bugs.sh
run \
update-bugs.sh
-# Recipes web page.
-html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
- mkdir -p html
- rm -f $@ $@-t
- sh make-recipes.sh recipes/*.sh > $@-t
- mv $@-t $@
-
HTMLFILES = \
html/guestfs.3.html \
html/guestfs-examples.3.html \
HTMLFILES = \
html/guestfs.3.html \
html/guestfs-examples.3.html \
+ html/guestfs-erlang.3.html \
+ html/guestfs-java.3.html \
html/guestfs-ocaml.3.html \
html/guestfs-perl.3.html \
html/guestfs-python.3.html \
html/guestfs-ocaml.3.html \
html/guestfs-perl.3.html \
html/guestfs-python.3.html \
+ html/guestfs-recipes.1.html \
html/guestfs-ruby.3.html \
html/guestfish.1.html \
html/guestmount.1.html \
html/guestfs-ruby.3.html \
html/guestfish.1.html \
html/guestmount.1.html \
+ html/virt-alignment-scan.1.html \
html/virt-cat.1.html \
html/virt-copy-in.1.html \
html/virt-copy-out.1.html \
html/virt-cat.1.html \
html/virt-copy-in.1.html \
html/virt-copy-out.1.html \
@@
-162,12
+161,12
@@
HTMLFILES = \
html/virt-make-fs.1.html \
html/virt-rescue.1.html \
html/virt-resize.1.html \
html/virt-make-fs.1.html \
html/virt-rescue.1.html \
html/virt-resize.1.html \
+ html/virt-sparsify.1.html \
+ html/virt-sysprep.1.html \
html/virt-tar.1.html \
html/virt-tar-in.1.html \
html/virt-tar-out.1.html \
html/virt-tar.1.html \
html/virt-tar-in.1.html \
html/virt-tar-out.1.html \
- html/virt-win-reg.1.html \
- html/recipes.html \
- html/pod.css html/recipes.css
+ html/virt-win-reg.1.html
TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO
TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO
@@
-231,7
+230,7
@@
CLEANFILES = \
# is NOT a substitute for proper testing!
quickcheck:
# is NOT a substitute for proper testing!
quickcheck:
- ./run test-tool/libguestfs-test-tool
+ ./run test-tool/libguestfs-test-tool
$(QUICKCHECK_TEST_TOOL_ARGS)
# Make binary distribution.
# Make binary distribution.