daemon/Win32: Win32 can't fork message moved to separate function (Jim Meyering)

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 98ee48a..d0ad5ca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,17 +15,34 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
+SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \
        gnulib/tests capitests regressions test-tool
 
-if HAVE_OCAML
-SUBDIRS += ocaml
-endif
+# NB: Must build inspector directory after perl and before ocaml.
+# We could relax this if we combined the inspector_generator with
+# the ordinary generator, but that brings other problems.
 if HAVE_PERL
 SUBDIRS += perl
 endif
+
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
+if HAVE_TOOLS
+SUBDIRS += tools
+endif
+
+if HAVE_FUSE
+SUBDIRS += fuse
+endif
+
+if HAVE_OCAML
+SUBDIRS += ocaml ocaml/examples
+endif
 if HAVE_PYTHON
 SUBDIRS += python
 endif
@@ -38,25 +55,17 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
-if HAVE_INSPECTOR
-SUBDIRS += inspector
-endif
-if HAVE_DF
-SUBDIRS += df
-endif
-if HAVE_CAT
-SUBDIRS += cat
-endif
-if HAVE_RESCUE
-SUBDIRS += rescue
-endif
-if HAVE_EDIT
-SUBDIRS += edit
-endif
+
+generator_built = \
+       guestfs-actions.pod \
+       guestfs-availability.pod \
+       guestfs-structs.pod \
+       guestfish-actions.pod
 
 EXTRA_DIST = \
-       guestfs.pod guestfs-actions.pod guestfs-structs.pod \
-       guestfish.pod guestfish-actions.pod \
+       $(generator_built) \
+       guestfs.pod \
+       guestfish.pod \
        html/pod.css \
        HACKING TODO \
        libguestfs.pc libguestfs.pc.in \
@@ -75,15 +84,23 @@ EXTRA_DIST = \
        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.
+# guestfs-actions.pod, guestfs-availability.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 libguestfs.3 guestfish.1
 
-guestfs.3: guestfs.pod guestfs-actions.pod guestfs-structs.pod
+guestfs.3: guestfs.pod \
+               guestfs-actions.pod \
+               guestfs-availability.pod \
+               guestfs-structs.pod
        sed \
-         -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
-         -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
+         -e '/@ACTIONS@/rguestfs-actions.pod' \
+         -e 's/@ACTIONS@//' \
+         -e '/@AVAILABILITY@/rguestfs-availability.pod' \
+         -e 's/@AVAILABILITY@//' \
+         -e '/@STRUCTS@/rguestfs-structs.pod' \
+         -e 's/@STRUCTS@//' \
          < $< | \
        $(POD2MAN) \
          --section 3 \
@@ -105,11 +122,18 @@ guestfish.1: guestfish.pod guestfish-actions.pod
 
 noinst_DATA = html/guestfs.3.html html/guestfish.1.html
 
-html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
+html/guestfs.3.html: guestfs.pod \
+               guestfs-actions.pod \
+               guestfs-availability.pod \
+               guestfs-structs.pod
        mkdir -p html
        sed \
-         -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
-         -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
+         -e '/@ACTIONS@/rguestfs-actions.pod' \
+         -e 's/@ACTIONS@//' \
+         -e '/@AVAILABILITY@/rguestfs-availability.pod' \
+         -e 's/@AVAILABILITY@//' \
+         -e '/@STRUCTS@/rguestfs-structs.pod' \
+         -e 's/@STRUCTS@//' \
          < $< | \
        pod2html \
          --css 'pod.css' \
@@ -135,10 +159,22 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
        sh make-recipes.sh recipes/*.sh > $@-t
        mv $@-t $@
 
-HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
+HTMLFILES = \
+       html/guestfs.3.html \
+       html/guestfish.1.html \
+       html/guestmount.1.html \
+       html/hivex.3.html \
+       html/hivexget.1.html \
+       html/hivexml.1.html \
        html/virt-cat.1.html \
        html/virt-df.1.html \
+       html/virt-edit.1.html \
        html/virt-inspector.1.html \
+       html/virt-list-filesystems.1.html \
+       html/virt-ls.1.html \
+       html/virt-rescue.1.html \
+       html/virt-tar.1.html \
+       html/virt-win-reg.1.html \
        html/recipes.html \
        html/pod.css html/recipes.css
 
@@ -170,7 +206,11 @@ all-local:
            -name 'virt-df' -o \
            -name 'virt-edit' -o \
            -name 'virt-inspector' -o \
-           -name 'virt-rescue' | \
+           -name 'virt-list-filesystems' -o \
+           -name 'virt-ls' -o \
+           -name 'virt-rescue' -o \
+           -name 'virt-tar' -o \
+           -name 'virt-win-reg' | \
        grep -v '^perl/blib/' | \
        grep -v '^capitests/' | \
        grep -v '^daemon/lib/' | \
@@ -180,6 +220,7 @@ all-local:
        grep -v '^perl/examples/' | \
        grep -v '/guestfs_protocol.c' | \
        grep -v '/rc_protocol.c' | \
+       grep -v 'appliance/debian/root' | \
        LC_ALL=C sort | \
        sed 's,^\./,,' > po/POTFILES.in