X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=438c5228747a18d8503a42cd92277fa3b671d407;hp=d2c90fc6052a79c9da11638fd731001d85d62edd;hb=cd077b8229731e292798f34dd56892cbfa6f1e0e;hpb=fc241abdbac7a016cd2fac169ad64876107df3c8 diff --git a/Makefile.am b/Makefile.am index d2c90fc..438c522 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # libguestfs -# Copyright (C) 2009-2010 Red Hat Inc. +# Copyright (C) 2009-2011 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 @@ -13,14 +13,14 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/subdir-rules.mk ACLOCAL_AMFLAGS = -I m4 # Basic source for the library. -SUBDIRS = gnulib/lib images generator src examples po +SUBDIRS = gnulib/lib tests/data tests/guests generator src examples po if ENABLE_DAEMON SUBDIRS += daemon @@ -30,17 +30,20 @@ SUBDIRS += appliance endif # Tests and the test-tool. -SUBDIRS += gnulib/tests capitests regressions test-tool +SUBDIRS += gnulib/tests tests/c-api tests/qemu +SUBDIRS += tests/protocol tests/lvm tests/luks tests/md +SUBDIRS += tests/regressions +SUBDIRS += tests/extra test-tool # Guestfish. SUBDIRS += fish # virt-tools in C. -SUBDIRS += cat df inspector rescue +SUBDIRS += align cat df edit inspector rescue # Language bindings. if HAVE_PERL -SUBDIRS += perl +SUBDIRS += perl perl/examples endif if HAVE_OCAML SUBDIRS += ocaml ocaml/examples @@ -52,7 +55,7 @@ if HAVE_RUBY SUBDIRS += ruby ruby/examples endif if HAVE_JAVA -SUBDIRS += java +SUBDIRS += java java/examples endif if HAVE_HASKELL SUBDIRS += haskell @@ -60,59 +63,111 @@ endif if HAVE_PHP SUBDIRS += php endif +if HAVE_ERLANG +SUBDIRS += erlang erlang/examples +endif # Unconditional because nothing is built yet. SUBDIRS += csharp -# Perl tools and guestmount. +# virt-resize (new version) and virt-sparsify are written in OCaml. +if HAVE_OCAML +SUBDIRS += resize sparsify +endif + +# Perl tools. if HAVE_TOOLS SUBDIRS += tools endif +# guestmount if HAVE_FUSE SUBDIRS += fuse endif +# virt-tools in shell. This uses guestmount and virt-inspector. +if HAVE_FUSE +SUBDIRS += clone +endif + # po-docs must come after tools, inspector. +if HAVE_PO4A SUBDIRS += po-docs +endif EXTRA_DIST = \ $(generator_built) \ - html/pod.css \ BUGS HACKING RELEASE-NOTES ROADMAP TODO \ - libguestfs.pc libguestfs.pc.in \ - recipes/LICENSE \ - recipes/README \ - recipes/*.html \ - recipes/*.sh \ - recipes/*.example \ - html/recipes.css \ - make-recipes.sh \ - contrib/README \ - bindtests \ .gitignore \ - m4/.gitignore \ - libtool-kill-dependency_libs.sh \ - autogen.sh \ bugs-in-changelog.sh \ - update-bugs.sh \ - logo/fish.svg logo/fish.png - -# Recipes web page. -html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh - mkdir -p html - rm -f $@ $@-t - sh make-recipes.sh recipes/*.sh > $@-t - mv $@-t $@ + autogen.sh \ + bindtests \ + contrib/autobuild/autobuild.sh \ + contrib/guestfsd-in-wine.sh \ + contrib/intro/libguestfs-intro.html \ + contrib/intro/overview.svg \ + contrib/intro/talk.txt \ + contrib/intro/tools.svg \ + contrib/README \ + contrib/visualize-alignment/.gitignore \ + contrib/visualize-alignment/guestfish-add-mount.qtr \ + contrib/visualize-alignment/guestfish-lv-ext4-4k.qtr \ + contrib/visualize-alignment/guestfish-lv-ext4-4k-write-hello.qtr \ + contrib/visualize-alignment/guestfish-N-fs-10M-aligned-part-disk.qtr \ + contrib/visualize-alignment/guestfish-N-fs-10M.qtr \ + contrib/visualize-alignment/guestfish-write-hello.qtr \ + contrib/visualize-alignment/qemu-0.13-trace-block-device-access.patch \ + contrib/visualize-alignment/README \ + contrib/visualize-alignment/tracetops.ml \ + debian/.gitignore \ + debian/changelog \ + debian/compat \ + debian/control \ + debian/copyright \ + debian/docs \ + debian/guestfish.dirs \ + debian/guestfish.install \ + debian/guestfsd.dirs \ + debian/guestfsd.install \ + debian/guestmount.dirs \ + debian/guestmount.install \ + debian/libguestfs-dev.dirs \ + debian/libguestfs-dev.install \ + debian/libguestfs-doc.docs \ + debian/libguestfs-perl.examples \ + debian/libguestfs-perl.install \ + debian/libguestfs-tools.dirs \ + debian/libguestfs-tools.install \ + debian/libguestfs0.dirs \ + debian/libguestfs0.install \ + debian/patches/series \ + debian/python-guestfs.install \ + debian/pyversions \ + debian/rules \ + debian/shlibs.local \ + debian/watch \ + html/pod.css \ + libguestfs.pc libguestfs.pc.in \ + libtool-kill-dependency_libs.sh \ + logo/fish.svg logo/fish.png \ + m4/.gitignore \ + run \ + update-bugs.sh HTMLFILES = \ html/guestfs.3.html \ html/guestfs-examples.3.html \ + html/guestfs-erlang.3.html \ + html/guestfs-java.3.html \ html/guestfs-ocaml.3.html \ + html/guestfs-perl.3.html \ html/guestfs-python.3.html \ + html/guestfs-recipes.1.html \ html/guestfs-ruby.3.html \ + html/guestfs-testing.1.html \ html/guestfish.1.html \ html/guestmount.1.html \ + html/virt-alignment-scan.1.html \ html/virt-cat.1.html \ html/virt-copy-in.1.html \ html/virt-copy-out.1.html \ @@ -126,12 +181,12 @@ HTMLFILES = \ html/virt-make-fs.1.html \ html/virt-rescue.1.html \ html/virt-resize.1.html \ + html/virt-sparsify.1.html \ + html/virt-sysprep.1.html \ html/virt-tar.1.html \ html/virt-tar-in.1.html \ html/virt-tar-out.1.html \ - html/virt-win-reg.1.html \ - html/recipes.html \ - html/pod.css html/recipes.css + html/virt-win-reg.1.html TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO @@ -166,7 +221,7 @@ all-local: find $(DIST_SUBDIRS) \ -name '*.c' -o -name '*.pl' -o -name '*.pm' | \ grep -v '^perl/blib/' | \ - grep -v '^capitests/' | \ + grep -v '^tests/' | \ grep -v '^daemon/lib/' | \ grep -v '^daemon/tests/' | \ grep -v '^examples/' | \ @@ -176,6 +231,7 @@ all-local: grep -v '/rc_protocol.c' | \ grep -v 'appliance/debian/root' | \ grep -v '^po-docs/' | \ + grep -v '^images/' | \ LC_ALL=C sort | \ sed 's,^\./,,' > po/POTFILES.in @@ -195,7 +251,12 @@ CLEANFILES = \ # is NOT a substitute for proper testing! quickcheck: - test-tool/run-test-tool-locally + ./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS) + +# Run extra-tests in tests/extra/ subdirectory. + +extra-tests: + make -C tests/extra $@ # Make binary distribution.