X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=0143a6969af90b4ee1e2894bf61e1b4d97779299;hp=0f478a991e9087a6dcb15a016ae4ced0cc11417a;hb=ac37f65aaf1f162a2cc57fa8c296a1ff4109adb9;hpb=7801621dc946fe894c960e683db3cf921ef23af6 diff --git a/Makefile.am b/Makefile.am index 0f478a9..0143a69 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 @@ -15,17 +15,33 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +include $(top_srcdir)/subdir-rules.mk + ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = gnulib/lib 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 -if HAVE_OCAML -SUBDIRS += ocaml +if ENABLE_DAEMON +SUBDIRS += daemon +endif +if ENABLE_APPLIANCE +SUBDIRS += appliance 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 if HAVE_PYTHON SUBDIRS += python endif @@ -38,25 +54,22 @@ endif if HAVE_HASKELL SUBDIRS += haskell endif + +# Virt-inspector, tools and guestmount. if HAVE_INSPECTOR SUBDIRS += inspector endif -if HAVE_DF -SUBDIRS += df -endif -if HAVE_CAT -SUBDIRS += cat -endif -if HAVE_RESCUE -SUBDIRS += rescue + +if HAVE_TOOLS +SUBDIRS += tools endif -if HAVE_EDIT -SUBDIRS += edit + +if HAVE_FUSE +SUBDIRS += fuse endif EXTRA_DIST = \ - guestfs.pod guestfs-actions.pod guestfs-structs.pod \ - guestfish.pod guestfish-actions.pod \ + $(generator_built) \ html/pod.css \ HACKING TODO \ libguestfs.pc libguestfs.pc.in \ @@ -68,48 +81,26 @@ 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 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-structs.pod - sed \ - -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \ - -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-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 's/@ACTIONS@//' \ - -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \ + -e '/@ACTIONS@/rsrc/guestfs-actions.pod' \ + -e 's/@ACTIONS@//' \ + -e '/@AVAILABILITY@/rsrc/guestfs-availability.pod' \ + -e 's/@AVAILABILITY@//' \ + -e '/@STRUCTS@/rsrc/guestfs-structs.pod' \ + -e 's/@STRUCTS@//' \ < $< | \ pod2html \ --css 'pod.css' \ @@ -117,10 +108,10 @@ html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.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' \ @@ -135,10 +126,22 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar sh make-recipes.sh recipes/*.sh > $@-t mv $@-t $@ -HTMLFILES = html/guestfs.3.html html/guestfish.1.html \ +HTMLFILES = \ + html/guestfs.3.html \ + html/guestfish.1.html \ + html/guestmount.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 \ html/pod.css html/recipes.css @@ -155,16 +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' | \ + find $(DIST_SUBDIRS) \ + -name '*.c' -o -name '*.pl' -o -name '*.pm' | \ grep -v '^perl/blib/' | \ grep -v '^capitests/' | \ grep -v '^daemon/lib/' | \ @@ -174,6 +180,7 @@ all-local: grep -v '^perl/examples/' | \ grep -v '/guestfs_protocol.c' | \ grep -v '/rc_protocol.c' | \ + grep -v 'appliance/debian/root' | \ LC_ALL=C sort | \ sed 's,^\./,,' > po/POTFILES.in @@ -192,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