Miscellaneous fixes for non-srcdir builds.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 55b20ba..0e468b5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon appliance fish po examples images capitests
+SUBDIRS = src daemon appliance fish po examples images \
+       capitests regressions
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -40,6 +41,15 @@ endif
 if HAVE_INSPECTOR
 SUBDIRS += inspector
 endif
+if HAVE_V2V
+SUBDIRS += v2v
+endif
+if HAVE_DF
+SUBDIRS += df
+endif
+if HAVE_CAT
+SUBDIRS += cat
+endif
 
 EXTRA_DIST = \
        config.rpath \
@@ -59,13 +69,15 @@ EXTRA_DIST = \
        contrib/README \
        contrib/febootstrap/install.title \
        contrib/febootstrap/install.html \
-       contrib/febootstrap/install.sh
+       contrib/febootstrap/install.sh \
+       bindtests \
+       libguestfs.3
 
 # Manual pages.
 # guestfs-actions.pod and guestfs-structs are autogenerated.  There is
 # no include mechanism for POD, so we have to do it by hand.
 
-man_MANS = guestfs.3 guestfish.1
+man_MANS = guestfs.3 libguestfs.3 guestfish.1
 
 guestfs.3: guestfs.pod guestfs-actions.pod guestfs-structs.pod
        sed \
@@ -120,13 +132,16 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
        mv $@-t $@
 
 HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
+       html/virt-cat.1.html \
+       html/virt-df.1.html \
        html/virt-inspector.1.html \
+       html/virt-v2v.1.html \
        html/recipes.html \
        html/pod.css html/recipes.css
 
 TEXTFILES = README TODO HACKING
 
-WEBSITEDIR = $(HOME)/d/redhat/et-website/libguestfs
+WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
 website: $(HTMLFILES) $(TEXTFILES)
        cp $(HTMLFILES) $(WEBSITEDIR)
@@ -138,6 +153,16 @@ dist-hook:
        ./gitlog-to-changelog > ChangeLog
        cp ChangeLog $(distdir)/ChangeLog
 
+# Update the list of translatable files in po/POTFILES.in.
+all-local:
+       cd $(srcdir); \
+       find -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
+       grep -v '/blib/' | \
+       grep -v '/capitests/' | \
+       grep -v '/examples/' | \
+       sort | \
+       sed 's,^\./,,' > po/POTFILES.in
+
 # Pkgconfig.
 
 pkgconfigdir = $(libdir)/pkgconfig