regressions: Enable both tests for bug 576879 (not fixed).
[libguestfs.git] / Makefile.am
index 3ed7815..d6b4077 100644 (file)
@@ -19,7 +19,8 @@ include $(top_srcdir)/subdir-rules.mk
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gnulib/lib src
+# Basic source for the library.
+SUBDIRS = gnulib/lib images generator src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
@@ -28,32 +29,27 @@ if ENABLE_APPLIANCE
 SUBDIRS += appliance
 endif
 
-SUBDIRS += fish po examples images
+# Tests and the test-tool.
 SUBDIRS += gnulib/tests capitests regressions test-tool
 
-if HAVE_PERL
-SUBDIRS += perl
-endif
+# Guestfish.
+SUBDIRS += fish
 
-if HAVE_INSPECTOR
-SUBDIRS += inspector
-endif
-if HAVE_TOOLS
-SUBDIRS += tools
-endif
+# virt-tools in C.
+SUBDIRS += cat df inspector rescue
 
-if HAVE_FUSE
-SUBDIRS += fuse
+# Language bindings.
+if HAVE_PERL
+SUBDIRS += perl perl/examples
 endif
-
 if HAVE_OCAML
 SUBDIRS += ocaml ocaml/examples
 endif
 if HAVE_PYTHON
-SUBDIRS += python
+SUBDIRS += python python/examples
 endif
 if HAVE_RUBY
-SUBDIRS += ruby
+SUBDIRS += ruby ruby/examples
 endif
 if HAVE_JAVA
 SUBDIRS += java
@@ -61,11 +57,29 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
+if HAVE_PHP
+SUBDIRS += php
+endif
+
+# Unconditional because nothing is built yet.
+SUBDIRS += csharp
+
+# Perl tools and guestmount.
+if HAVE_TOOLS
+SUBDIRS += tools
+endif
+
+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 ROADMAP TODO \
        libguestfs.pc libguestfs.pc.in \
        recipes/LICENSE \
        recipes/README \
@@ -77,41 +91,12 @@ EXTRA_DIST = \
        contrib/README \
        bindtests \
        .gitignore \
-       m4/.gitignore
-
-# HTML versions of manual pages.
-
-noinst_DATA = html/guestfs.3.html html/guestfish.1.html
-
-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@/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' \
-         --title "libguestfs API documentation" \
-         --htmldir html \
-         --outfile $@
-
-html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod
-       mkdir -p html
-       sed \
-         -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
-         < $< | \
-       pod2html \
-         --css 'pod.css' \
-         --title "guestfish, libguestfs filesystem interactive shell" \
-         --htmldir html \
-         --outfile $@
+       m4/.gitignore \
+       libtool-kill-dependency_libs.sh \
+       autogen.sh \
+       bugs-in-changelog.sh \
+       update-bugs.sh \
+       logo/fish.svg logo/fish.png
 
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
@@ -122,23 +107,34 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
 
 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-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 \
        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-tar-in.1.html \
+       html/virt-tar-out.1.html \
        html/virt-win-reg.1.html \
        html/recipes.html \
        html/pod.css html/recipes.css
 
-TEXTFILES = README TODO HACKING
+TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO
 
 WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
@@ -151,28 +147,25 @@ 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.sh > BUGS-t
+       mv BUGS-t BUGS
+       cp BUGS $(distdir)/BUGS
+       git log --pretty="format:%an" | sort -u | \
+               grep -v rjones | \
+               grep -v "Richard Jones" \
+               > AUTHORS-t
+       mv AUTHORS-t AUTHORS
+       cp AUTHORS $(distdir)/AUTHORS
 
 # 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-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/' | \
@@ -183,6 +176,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
 
@@ -193,20 +187,25 @@ pkgconfig_DATA = libguestfs.pc
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) \
-       emptydisk \
+CLEANFILES = \
        pod2htm?.tmp \
-       html/*.html \
-       guestfs.3 guestfish.1
-
-clean-local:
-       rm -rf initramfs
+       html/*.html
 
 # 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
+       test-tool/run-test-tool-locally
+
+# Make binary distribution.
+
+BINTMPDIR = /tmp/libguestfs-bin
+bindist:
+       rm -rf $(BINTMPDIR)
+       mkdir $(BINTMPDIR)
+       $(MAKE)
+       $(MAKE) DESTDIR=$(BINTMPDIR) install
+       -find $(BINTMPDIR) -type d -exec rmdir --ignore-fail-on-non-empty {} \;
+       (cd $(BINTMPDIR) && tar cf - .) | \
+         gzip -c -9 > libguestfs-$(VERSION)-$(DISTRO)-$(host_cpu).tar.gz