static: Use correct libraries for static binaries.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8a58ea7..6f17146 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,9 @@ SUBDIRS += gnulib/tests capitests regressions test-tool
 # Guestfish.
 SUBDIRS += fish
 
+# virt-cat (in C).
+SUBDIRS += cat
+
 # Language bindings.
 if HAVE_PERL
 SUBDIRS += perl
@@ -58,6 +61,9 @@ if HAVE_PHP
 SUBDIRS += php
 endif
 
+# Unconditional because nothing is built yet.
+SUBDIRS += csharp
+
 # Virt-inspector, tools and guestmount.
 if HAVE_INSPECTOR
 SUBDIRS += inspector
@@ -118,7 +124,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' \
@@ -172,6 +178,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 +253,7 @@ 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
+       cp cat/virt-cat.static $(BINTMPDIR)$(bindir)/virt-cat
        (cd $(BINTMPDIR) && tar cf - .) | \
          gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz