autogen: Touch ocaml/.depend

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0143a69..5ab3b6d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/subdir-rules.mk
 ACLOCAL_AMFLAGS = -I m4
 
 # Basic source for the library.
-SUBDIRS = gnulib/lib images src examples po
+SUBDIRS = gnulib/lib images generator src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
@@ -33,7 +33,7 @@ endif
 SUBDIRS += gnulib/tests capitests regressions test-tool
 
 # Guestfish.
-SUBDIRS += fish 
+SUBDIRS += fish
 
 # Language bindings.
 if HAVE_PERL
@@ -54,6 +54,9 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
+if HAVE_PHP
+SUBDIRS += php
+endif
 
 # Virt-inspector, tools and guestmount.
 if HAVE_INSPECTOR
@@ -68,10 +71,13 @@ if HAVE_FUSE
 SUBDIRS += fuse
 endif
 
+# po-docs must come after tools, inspector.
+SUBDIRS += po-docs
+
 EXTRA_DIST = \
        $(generator_built) \
        html/pod.css \
-       HACKING TODO \
+       BUGS HACKING RELEASE-NOTES TODO \
        libguestfs.pc libguestfs.pc.in \
        recipes/LICENSE \
        recipes/README \
@@ -108,10 +114,11 @@ html/guestfs.3.html: src/guestfs.pod \
          --htmldir html \
          --outfile $@
 
-html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod
+html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod fish/guestfish-commands.pod
        mkdir -p html
        sed \
          -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
+         -e '/@FISH_COMMANDS@/rguestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
          < $< | \
        pod2html \
          --css 'pod.css' \
@@ -181,6 +188,7 @@ all-local:
        grep -v '/guestfs_protocol.c' | \
        grep -v '/rc_protocol.c' | \
        grep -v 'appliance/debian/root' | \
+       grep -v '^po-docs/' | \
        LC_ALL=C sort | \
        sed 's,^\./,,' > po/POTFILES.in
 
@@ -205,6 +213,33 @@ clean-local:
 # is NOT a substitute for proper testing!
 
 quickcheck:
-       LIBGUESTFS_PATH=appliance \
-       test-tool/libguestfs-test-tool \
-         --helper test-tool/libguestfs-test-tool-helper
+       test-tool/run-test-tool-locally
+
+# Mostly static binary distribution.
+#
+# Some binaries are relinked partially statically.  You can make these
+# binaries "more static" by making sure that as many foo-static
+# packages are installed as possible.
+#
+# We remove the supermin appliance and adjust some directories to make
+# them non-Fedora-specific.
+
+BINTMPDIR = /tmp/libguestfs-bin
+bindist:
+       rm -rf $(BINTMPDIR)
+       mkdir $(BINTMPDIR)
+       $(MAKE)
+       $(MAKE) DESTDIR=$(BINTMPDIR) install
+       rm -r $(BINTMPDIR)$(libdir)/guestfs/supermin.d
+       rm $(BINTMPDIR)$(libdir)/guestfs/kmod.whitelist
+       mv $(BINTMPDIR)$(prefix)/lib64/* $(BINTMPDIR)$(libdir)
+       mv $(BINTMPDIR)/usr/lib64/* $(BINTMPDIR)$(libdir)
+       -find $(BINTMPDIR) -type d -exec rmdir --ignore-fail-on-non-empty {} \;
+       $(MAKE) -C fish guestfish.static
+       cp fish/guestfish.static $(BINTMPDIR)$(bindir)/guestfish
+       $(MAKE) -C fuse guestmount.static
+       cp fuse/guestmount.static $(BINTMPDIR)$(bindir)/guestmount
+       $(MAKE) -C test-tool libguestfs-test-tool.static
+       cp test-tool/libguestfs-test-tool.static $(BINTMPDIR)$(bindir)/libguestfs-test-tool
+       (cd $(BINTMPDIR) && tar cf - .) | \
+         gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz