build: 'make quickcheck' rule now uses new run-test-tool-locally script.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2fde7ff..2cf03b0 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 \
@@ -158,29 +164,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-list-partitions' -o \
-           -name 'virt-ls' -o \
-           -name 'virt-make-fs' -o \
-           -name 'virt-rescue' -o \
-           -name 'virt-resize' -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/' | \
@@ -191,6 +187,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
 
@@ -215,6 +212,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