git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved checking, documentation of modes (RHBZ#582901, RHBZ#582929).
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
0abe3dd
..
44fc893
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,5
+1,5
@@
# libguestfs
# libguestfs
-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2009
-2010
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
@@
-19,12
+19,18
@@
include $(top_srcdir)/subdir-rules.mk
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \
- gnulib/tests capitests regressions test-tool
+SUBDIRS = gnulib/lib src
+
+if ENABLE_DAEMON
+SUBDIRS += daemon
+endif
+if ENABLE_APPLIANCE
+SUBDIRS += appliance
+endif
+
+SUBDIRS += fish po examples images
+SUBDIRS += gnulib/tests capitests regressions test-tool
-# NB: Must build inspector directory after perl and before ocaml.
-# We could relax this if we combined the inspector_generator with
-# the ordinary generator, but that brings other problems.
if HAVE_PERL
SUBDIRS += perl
endif
if HAVE_PERL
SUBDIRS += perl
endif
@@
-118,17
+124,16
@@
HTMLFILES = \
html/guestfs.3.html \
html/guestfish.1.html \
html/guestmount.1.html \
html/guestfs.3.html \
html/guestfish.1.html \
html/guestmount.1.html \
- html/hivex.3.html \
- html/hivexget.1.html \
- html/hivexml.1.html \
- html/hivexsh.1.html \
html/virt-cat.1.html \
html/virt-df.1.html \
html/virt-edit.1.html \
html/virt-inspector.1.html \
html/virt-list-filesystems.1.html \
html/virt-cat.1.html \
html/virt-df.1.html \
html/virt-edit.1.html \
html/virt-inspector.1.html \
html/virt-list-filesystems.1.html \
+ html/virt-list-partitions.1.html \
html/virt-ls.1.html \
html/virt-ls.1.html \
+ html/virt-make-fs.1.html \
html/virt-rescue.1.html \
html/virt-rescue.1.html \
+ html/virt-resize.1.html \
html/virt-tar.1.html \
html/virt-win-reg.1.html \
html/recipes.html \
html/virt-tar.1.html \
html/virt-win-reg.1.html \
html/recipes.html \
@@
-163,8
+168,11
@@
all-local:
-name 'virt-edit' -o \
-name 'virt-inspector' -o \
-name 'virt-list-filesystems' -o \
-name 'virt-edit' -o \
-name 'virt-inspector' -o \
-name 'virt-list-filesystems' -o \
+ -name 'virt-list-partitions' -o \
-name 'virt-ls' -o \
-name 'virt-ls' -o \
+ -name 'virt-make-fs' -o \
-name 'virt-rescue' -o \
-name 'virt-rescue' -o \
+ -name 'virt-resize' -o \
-name 'virt-tar' -o \
-name 'virt-win-reg' | \
grep -v '^perl/blib/' | \
-name 'virt-tar' -o \
-name 'virt-win-reg' | \
grep -v '^perl/blib/' | \