git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If qemu dies during launch, set an error message (RHBZ#588851).
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
3ed7815
..
2fde7ff
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-19,7
+19,8
@@
include $(top_srcdir)/subdir-rules.mk
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = gnulib/lib src
+# Basic source for the library.
+SUBDIRS = gnulib/lib images src examples po
if ENABLE_DAEMON
SUBDIRS += daemon
if ENABLE_DAEMON
SUBDIRS += daemon
@@
-28,24
+29,16
@@
if ENABLE_APPLIANCE
SUBDIRS += appliance
endif
SUBDIRS += appliance
endif
-SUBDIRS += fish po examples images
+# Tests and the test-tool.
SUBDIRS += gnulib/tests capitests regressions test-tool
SUBDIRS += gnulib/tests capitests regressions test-tool
+# Guestfish.
+SUBDIRS += fish
+
+# Language bindings.
if HAVE_PERL
SUBDIRS += perl
endif
if HAVE_PERL
SUBDIRS += perl
endif
-
-if HAVE_INSPECTOR
-SUBDIRS += inspector
-endif
-if HAVE_TOOLS
-SUBDIRS += tools
-endif
-
-if HAVE_FUSE
-SUBDIRS += fuse
-endif
-
if HAVE_OCAML
SUBDIRS += ocaml ocaml/examples
endif
if HAVE_OCAML
SUBDIRS += ocaml ocaml/examples
endif
@@
-62,6
+55,19
@@
if HAVE_HASKELL
SUBDIRS += haskell
endif
SUBDIRS += haskell
endif
+# Virt-inspector, tools and guestmount.
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
+
+if HAVE_TOOLS
+SUBDIRS += tools
+endif
+
+if HAVE_FUSE
+SUBDIRS += fuse
+endif
+
EXTRA_DIST = \
$(generator_built) \
html/pod.css \
EXTRA_DIST = \
$(generator_built) \
html/pod.css \
@@
-131,6
+137,7
@@
HTMLFILES = \
html/virt-list-filesystems.1.html \
html/virt-list-partitions.1.html \
html/virt-ls.1.html \
html/virt-list-filesystems.1.html \
html/virt-list-partitions.1.html \
html/virt-ls.1.html \
+ html/virt-make-fs.1.html \
html/virt-rescue.1.html \
html/virt-resize.1.html \
html/virt-tar.1.html \
html/virt-rescue.1.html \
html/virt-resize.1.html \
html/virt-tar.1.html \
@@
-169,6
+176,7
@@
all-local:
-name 'virt-list-filesystems' -o \
-name 'virt-list-partitions' -o \
-name 'virt-ls' -o \
-name 'virt-list-filesystems' -o \
-name 'virt-list-partitions' -o \
-name 'virt-ls' -o \
+ -name 'virt-make-fs' -o \
-name 'virt-rescue' -o \
-name 'virt-resize' -o \
-name 'virt-tar' -o \
-name 'virt-rescue' -o \
-name 'virt-resize' -o \
-name 'virt-tar' -o \