X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=fcd190a1aedc04c26c5ee9133df0d83e365ca662;hb=2a6c3777b91b58f7e5f9fe25e325e89401c129d3;hp=96c4d3540a59e23922c3f1ff5780e6d2a31c4c4d;hpb=58f7a5a4ac8cce77dfaded1c29f3ad382b4cc9a8;p=libguestfs.git diff --git a/Makefile.am b/Makefile.am index 96c4d35..fcd190a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,6 +64,13 @@ endif # Unconditional because nothing is built yet. SUBDIRS += csharp +# virt-resize 2.0 is written in OCaml. +if HAVE_OCAML +if HAVE_OCAML_PCRE +SUBDIRS += resize +endif +endif + # Perl tools and guestmount. if HAVE_TOOLS SUBDIRS += tools @@ -98,7 +105,8 @@ EXTRA_DIST = \ autogen.sh \ bugs-in-changelog.sh \ update-bugs.sh \ - logo/fish.svg logo/fish.png + logo/fish.svg logo/fish.png \ + run # Recipes web page. html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh @@ -198,7 +206,7 @@ CLEANFILES = \ # is NOT a substitute for proper testing! quickcheck: - test-tool/run-test-tool-locally + ./run test-tool/libguestfs-test-tool # Make binary distribution.