X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=bf9badacab6b5bf9321ad235ab813044147ae611;hp=f089cb8caa1371b2fea72f720973418fee8502d6;hb=f3ada2c7653866f2529c9f18aaa99f76cd984844;hpb=70a92b3cfb278403c844d22c9a47c82ddfccdb9c

diff --git a/Makefile.am b/Makefile.am
index f089cb8..bf9bada 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
@@ -30,17 +30,17 @@ SUBDIRS += appliance
 endif
 
 # Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests regressions test-tool
+SUBDIRS += gnulib/tests capitests caution regressions test-tool
 
 # Guestfish.
 SUBDIRS += fish
 
 # virt-tools in C.
-SUBDIRS += cat df inspector rescue
+SUBDIRS += cat df edit inspector rescue
 
 # Language bindings.
 if HAVE_PERL
-SUBDIRS += perl
+SUBDIRS += perl perl/examples
 endif
 if HAVE_OCAML
 SUBDIRS += ocaml ocaml/examples
@@ -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
@@ -74,45 +81,64 @@ SUBDIRS += fuse
 endif
 
 # po-docs must come after tools, inspector.
+if HAVE_PO4A
 SUBDIRS += po-docs
+endif
 
 EXTRA_DIST = \
 	$(generator_built) \
+	BUGS HACKING RELEASE-NOTES ROADMAP TODO \
+	.gitignore \
+	bugs-in-changelog.sh \
+	autogen.sh \
+	bindtests \
+	contrib/README \
+	debian/.gitignore \
+	debian/changelog \
+	debian/compat \
+	debian/control \
+	debian/copyright \
+	debian/docs \
+	debian/guestfish.dirs \
+	debian/guestfish.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 \
-	BUGS HACKING RELEASE-NOTES 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 \
+	logo/fish.svg logo/fish.png \
+	m4/.gitignore \
+	run \
 	update-bugs.sh
 
-# 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 $@
-
 HTMLFILES = \
 	html/guestfs.3.html \
 	html/guestfs-examples.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/guestfish.1.html \
 	html/guestmount.1.html \
 	html/virt-cat.1.html \
+	html/virt-copy-in.1.html \
+	html/virt-copy-out.1.html \
 	html/virt-df.1.html \
 	html/virt-edit.1.html \
 	html/virt-filesystems.1.html \
@@ -124,11 +150,11 @@ HTMLFILES = \
 	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
+	html/virt-tar-in.1.html \
+	html/virt-tar-out.1.html \
+	html/virt-win-reg.1.html
 
-TEXTFILES = BUGS HACKING README RELEASE-NOTES TODO
+TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO
 
 WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
@@ -190,7 +216,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.