ocaml: Catch EVENT_ENTER case in test.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5170ec8..115c699 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@
 #
 # 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
 
@@ -69,10 +69,7 @@ SUBDIRS += csharp
 
 # virt-resize (new version) and virt-sparsify are written in OCaml.
 if HAVE_OCAML
-if HAVE_OCAML_PCRE
-SUBDIRS += resize
-endif
-SUBDIRS += sparsify
+SUBDIRS += resize sparsify
 endif
 
 # Perl tools.
@@ -85,7 +82,7 @@ if HAVE_FUSE
 SUBDIRS += fuse
 endif
 
-# virt-tools in shell.  This uses guestmount.
+# virt-tools in shell.  This uses guestmount and virt-inspector.
 if HAVE_FUSE
 SUBDIRS += clone
 endif
@@ -102,7 +99,23 @@ EXTRA_DIST = \
        bugs-in-changelog.sh \
        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 \