X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=58736f83fc81caa2b6be21ca2468df21bc89e689;hp=d0ad5cadd9427f9700c0da14ede191bd174f03fd;hb=5b77be72bc4e46c7a53a24f1eb4cbd107a708f17;hpb=299d5b9dd260d47ac5121126ecd0e3f7bc4830b5 diff --git a/Makefile.am b/Makefile.am index d0ad5ca..58736f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # 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 @@ -19,27 +19,26 @@ include $(top_srcdir)/subdir-rules.mk ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \ - gnulib/tests capitests regressions test-tool +# Basic source for the library. +SUBDIRS = gnulib/lib images src examples po -# 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 +if ENABLE_DAEMON +SUBDIRS += daemon endif -if HAVE_TOOLS -SUBDIRS += tools +if ENABLE_APPLIANCE +SUBDIRS += appliance endif -if HAVE_FUSE -SUBDIRS += fuse -endif +# Tests and the test-tool. +SUBDIRS += gnulib/tests capitests regressions test-tool + +# Guestfish. +SUBDIRS += fish +# Language bindings. +if HAVE_PERL +SUBDIRS += perl +endif if HAVE_OCAML SUBDIRS += ocaml ocaml/examples endif @@ -56,18 +55,23 @@ if HAVE_HASKELL SUBDIRS += haskell endif -generator_built = \ - guestfs-actions.pod \ - guestfs-availability.pod \ - guestfs-structs.pod \ - guestfish-actions.pod +# Virt-inspector, tools and guestmount. +if HAVE_INSPECTOR +SUBDIRS += inspector +endif + +if HAVE_TOOLS +SUBDIRS += tools +endif + +if HAVE_FUSE +SUBDIRS += fuse +endif EXTRA_DIST = \ $(generator_built) \ - guestfs.pod \ - guestfish.pod \ html/pod.css \ - HACKING TODO \ + BUGS HACKING RELEASE-NOTES TODO \ libguestfs.pc libguestfs.pc.in \ recipes/LICENSE \ recipes/README \ @@ -77,62 +81,25 @@ EXTRA_DIST = \ html/recipes.css \ make-recipes.sh \ contrib/README \ - contrib/febootstrap/install.title \ - contrib/febootstrap/install.html \ - contrib/febootstrap/install.sh \ bindtests \ - libguestfs.3 - -# Manual pages. -# guestfs-actions.pod, guestfs-availability.pod and guestfs-structs -# are autogenerated. There is no include mechanism for POD, so we -# have to do it by hand. + .gitignore \ + m4/.gitignore -man_MANS = guestfs.3 libguestfs.3 guestfish.1 - -guestfs.3: guestfs.pod \ - guestfs-actions.pod \ - guestfs-availability.pod \ - guestfs-structs.pod - sed \ - -e '/@ACTIONS@/rguestfs-actions.pod' \ - -e 's/@ACTIONS@//' \ - -e '/@AVAILABILITY@/rguestfs-availability.pod' \ - -e 's/@AVAILABILITY@//' \ - -e '/@STRUCTS@/rguestfs-structs.pod' \ - -e 's/@STRUCTS@//' \ - < $< | \ - $(POD2MAN) \ - --section 3 \ - -c "Virtualization Support" \ - --name "guestfs" \ - --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ - > $@ - -guestfish.1: guestfish.pod guestfish-actions.pod - sed \ - -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \ - < $< | \ - $(POD2MAN) \ - --section 1 \ - -c "Virtualization Support" \ - --name "guestfish" \ - --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ - > $@ +# HTML versions of manual pages. noinst_DATA = html/guestfs.3.html html/guestfish.1.html -html/guestfs.3.html: guestfs.pod \ - guestfs-actions.pod \ - guestfs-availability.pod \ - guestfs-structs.pod +html/guestfs.3.html: src/guestfs.pod \ + src/guestfs-actions.pod \ + src/guestfs-availability.pod \ + src/guestfs-structs.pod mkdir -p html sed \ - -e '/@ACTIONS@/rguestfs-actions.pod' \ + -e '/@ACTIONS@/rsrc/guestfs-actions.pod' \ -e 's/@ACTIONS@//' \ - -e '/@AVAILABILITY@/rguestfs-availability.pod' \ + -e '/@AVAILABILITY@/rsrc/guestfs-availability.pod' \ -e 's/@AVAILABILITY@//' \ - -e '/@STRUCTS@/rguestfs-structs.pod' \ + -e '/@STRUCTS@/rsrc/guestfs-structs.pod' \ -e 's/@STRUCTS@//' \ < $< | \ pod2html \ @@ -141,10 +108,10 @@ html/guestfs.3.html: guestfs.pod \ --htmldir html \ --outfile $@ -html/guestfish.1.html: guestfish.pod guestfish-actions.pod +html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod mkdir -p html sed \ - -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \ + -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \ < $< | \ pod2html \ --css 'pod.css' \ @@ -163,16 +130,16 @@ HTMLFILES = \ 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/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-make-fs.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 \ @@ -191,26 +158,19 @@ website: $(HTMLFILES) $(TEXTFILES) -e "s/SUBST_DATE/$$date/" \ < index.html.in > index.html -# Generate the ChangeLog automatically from the gitlog. - +# When doing 'make dist' update a few files automatically. dist-hook: $(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog cp ChangeLog $(distdir)/ChangeLog + $(top_srcdir)/update-bugs > BUGS-t + mv BUGS-t BUGS + cp BUGS $(distdir)/BUGS # 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' -o \ - -name 'virt-cat' -o \ - -name 'virt-df' -o \ - -name 'virt-edit' -o \ - -name 'virt-inspector' -o \ - -name 'virt-list-filesystems' -o \ - -name 'virt-ls' -o \ - -name 'virt-rescue' -o \ - -name 'virt-tar' -o \ - -name 'virt-win-reg' | \ + -name '*.c' -o -name '*.pl' -o -name '*.pm' | \ grep -v '^perl/blib/' | \ grep -v '^capitests/' | \ grep -v '^daemon/lib/' | \ @@ -239,3 +199,12 @@ CLEANFILES = $(fs_DATA) \ clean-local: rm -rf initramfs + +# If you don't want to run all of the tests ('make check') then this +# will just run libguestfs-test-tool for a quick check. Note this +# is NOT a substitute for proper testing! + +quickcheck: + LIBGUESTFS_PATH=appliance \ + test-tool/libguestfs-test-tool \ + --helper test-tool/libguestfs-test-tool-helper