X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=73d4f63b88b7a2585c83c8fba6f5b66992e179b9;hp=98ee48a174499a3903682ba14ce4a01c3ce93833;hb=5c4bf92bc298e078ceccdde603313282d038544c;hpb=b488436cc54288fcae8988493749f2e6c87f274c diff --git a/Makefile.am b/Makefile.am index 98ee48a..73d4f63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,12 +20,23 @@ ACLOCAL_AMFLAGS = -I m4 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_INSPECTOR +SUBDIRS += inspector +endif +if HAVE_TOOLS +SUBDIRS += tools +endif + +if HAVE_OCAML +SUBDIRS += ocaml ocaml/examples +endif if HAVE_PYTHON SUBDIRS += python endif @@ -38,21 +49,6 @@ endif if HAVE_HASKELL SUBDIRS += haskell endif -if HAVE_INSPECTOR -SUBDIRS += inspector -endif -if HAVE_DF -SUBDIRS += df -endif -if HAVE_CAT -SUBDIRS += cat -endif -if HAVE_RESCUE -SUBDIRS += rescue -endif -if HAVE_EDIT -SUBDIRS += edit -endif EXTRA_DIST = \ guestfs.pod guestfs-actions.pod guestfs-structs.pod \ @@ -138,7 +134,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 \ + html/virt-edit.1.html \ html/virt-inspector.1.html \ + html/virt-rescue.1.html \ html/recipes.html \ html/pod.css html/recipes.css