git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment: Describe the build order requirements for toplevel directories.
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
043e84a
..
c4a84f7
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-20,12
+20,18
@@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
gnulib/tests capitests regressions test-tool
SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
gnulib/tests capitests regressions test-tool
-if HAVE_OCAML
-SUBDIRS += ocaml
-endif
+# 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
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
+if HAVE_OCAML
+SUBDIRS += ocaml ocaml/examples
+endif
if HAVE_PYTHON
SUBDIRS += python
endif
if HAVE_PYTHON
SUBDIRS += python
endif
@@
-38,9
+44,6
@@
endif
if HAVE_HASKELL
SUBDIRS += haskell
endif
if HAVE_HASKELL
SUBDIRS += haskell
endif
-if HAVE_INSPECTOR
-SUBDIRS += inspector
-endif
if HAVE_DF
SUBDIRS += df
endif
if HAVE_DF
SUBDIRS += df
endif
@@
-50,6
+53,9
@@
endif
if HAVE_RESCUE
SUBDIRS += rescue
endif
if HAVE_RESCUE
SUBDIRS += rescue
endif
+if HAVE_EDIT
+SUBDIRS += edit
+endif
EXTRA_DIST = \
guestfs.pod guestfs-actions.pod guestfs-structs.pod \
EXTRA_DIST = \
guestfs.pod guestfs-actions.pod guestfs-structs.pod \
@@
-135,7
+141,9
@@
html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
html/virt-cat.1.html \
html/virt-df.1.html \
HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
html/virt-cat.1.html \
html/virt-df.1.html \
+ html/virt-edit.1.html \
html/virt-inspector.1.html \
html/virt-inspector.1.html \
+ html/virt-rescue.1.html \
html/recipes.html \
html/pod.css html/recipes.css
html/recipes.html \
html/pod.css html/recipes.css
@@
-161,7
+169,13
@@
dist-hook:
# Update the list of translatable files in po/POTFILES.in.
all-local:
cd $(srcdir); \
# Update the list of translatable files in po/POTFILES.in.
all-local:
cd $(srcdir); \
- find $(DIST_SUBDIRS) -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
+ find $(DIST_SUBDIRS) \
+ -name '*.c' -o -name '*.pl' -o -name '*.pm' -o \
+ -name 'virt-cat' -o \
+ -name 'virt-df' -o \
+ -name 'virt-edit' -o \
+ -name 'virt-inspector' -o \
+ -name 'virt-rescue' | \
grep -v '^perl/blib/' | \
grep -v '^capitests/' | \
grep -v '^daemon/lib/' | \
grep -v '^perl/blib/' | \
grep -v '^capitests/' | \
grep -v '^daemon/lib/' | \