daemon: blkid cache is at a different location on Debian.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5ab3b6d..e6da029 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,9 @@ SUBDIRS += gnulib/tests capitests regressions test-tool
 # Guestfish.
 SUBDIRS += fish
 
+# virt-tools in C.
+SUBDIRS += cat inspector
+
 # Language bindings.
 if HAVE_PERL
 SUBDIRS += perl
@@ -58,11 +61,10 @@ if HAVE_PHP
 SUBDIRS += php
 endif
 
-# Virt-inspector, tools and guestmount.
-if HAVE_INSPECTOR
-SUBDIRS += inspector
-endif
+# Unconditional because nothing is built yet.
+SUBDIRS += csharp
 
+# Perl tools and guestmount.
 if HAVE_TOOLS
 SUBDIRS += tools
 endif
@@ -118,7 +120,7 @@ html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod fish/guestf
        mkdir -p html
        sed \
          -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
-         -e '/@FISH_COMMANDS@/rguestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
+         -e '/@FISH_COMMANDS@/rfish/guestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
          < $< | \
        pod2html \
          --css 'pod.css' \
@@ -140,6 +142,7 @@ HTMLFILES = \
        html/virt-cat.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 \
@@ -152,7 +155,7 @@ HTMLFILES = \
        html/recipes.html \
        html/pod.css html/recipes.css
 
-TEXTFILES = README TODO HACKING
+TEXTFILES = BUGS HACKING README RELEASE-NOTES TODO
 
 WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
@@ -172,6 +175,12 @@ dist-hook:
        $(top_srcdir)/update-bugs > 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:
@@ -241,5 +250,11 @@ bindist:
        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
+       $(MAKE) -C cat virt-cat.static virt-filesystems.static virt-ls.static
+       cp cat/virt-cat.static $(BINTMPDIR)$(bindir)/virt-cat
+       cp cat/virt-filesystems.static $(BINTMPDIR)$(bindir)/virt-filesystems
+       cp cat/virt-ls.static $(BINTMPDIR)$(bindir)/virt-ls
+       $(MAKE) -C inspector virt-inspector.static
+       cp inspector/virt-inspector.static $(BINTMPDIR)$(bindir)/virt-inspector
        (cd $(BINTMPDIR) && tar cf - .) | \
          gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz