regressions: Enable both tests for bug 576879 (not fixed).

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index adc81a3..d6b4077 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,18 +35,21 @@ SUBDIRS += gnulib/tests capitests regressions test-tool
 # Guestfish.
 SUBDIRS += fish
 
+# virt-tools in C.
+SUBDIRS += cat df inspector rescue
+
 # Language bindings.
 if HAVE_PERL
-SUBDIRS += 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 +64,7 @@ endif
 # Unconditional because nothing is built yet.
 SUBDIRS += csharp
 
-# Virt-inspector, tools and guestmount.
-if HAVE_INSPECTOR
-SUBDIRS += inspector
-endif
-
+# Perl tools and guestmount.
 if HAVE_TOOLS
 SUBDIRS += tools
 endif
@@ -80,7 +79,7 @@ SUBDIRS += po-docs
 EXTRA_DIST = \
        $(generator_built) \
        html/pod.css \
-       BUGS HACKING RELEASE-NOTES TODO \
+       BUGS HACKING RELEASE-NOTES ROADMAP TODO \
        libguestfs.pc libguestfs.pc.in \
        recipes/LICENSE \
        recipes/README \
@@ -92,42 +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 fish/guestfish-commands.pod
-       mkdir -p html
-       sed \
-         -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
-         -e '/@FISH_COMMANDS@/rfish/guestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
-         < $< | \
-       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
@@ -138,11 +107,19 @@ 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 \
@@ -151,11 +128,13 @@ HTMLFILES = \
        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 = BUGS HACKING README RELEASE-NOTES TODO
+TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO
 
 WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
@@ -172,9 +151,15 @@ website: $(HTMLFILES) $(TEXTFILES)
 dist-hook:
        $(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog
        cp ChangeLog $(distdir)/ChangeLog
-       $(top_srcdir)/update-bugs > BUGS-t
+       $(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:
@@ -202,14 +187,9 @@ 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
@@ -218,14 +198,7 @@ clean-local:
 quickcheck:
        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.
+# Make binary distribution.
 
 BINTMPDIR = /tmp/libguestfs-bin
 bindist:
@@ -233,16 +206,6 @@ bindist:
        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
+         gzip -c -9 > libguestfs-$(VERSION)-$(DISTRO)-$(host_cpu).tar.gz