file: Restrict to regular files (RHBZ#582484).

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3ed7815..0143a69 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,8 @@ include $(top_srcdir)/subdir-rules.mk
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gnulib/lib src
+# Basic source for the library.
+SUBDIRS = gnulib/lib images src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
@@ -28,24 +29,16 @@ if ENABLE_APPLIANCE
 SUBDIRS += appliance
 endif
 
-SUBDIRS += fish po examples images
+# Tests and the test-tool.
 SUBDIRS += gnulib/tests capitests regressions test-tool
 
+# Guestfish.
+SUBDIRS += fish 
+
+# Language bindings.
 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
@@ -62,6 +55,19 @@ if HAVE_HASKELL
 SUBDIRS += haskell
 endif
 
+# Virt-inspector, tools and guestmount.
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
+
+if HAVE_TOOLS
+SUBDIRS += tools
+endif
+
+if HAVE_FUSE
+SUBDIRS += fuse
+endif
+
 EXTRA_DIST = \
        $(generator_built) \
        html/pod.css \
@@ -131,6 +137,7 @@ HTMLFILES = \
        html/virt-list-filesystems.1.html \
        html/virt-list-partitions.1.html \
        html/virt-ls.1.html \
+       html/virt-make-fs.1.html \
        html/virt-rescue.1.html \
        html/virt-resize.1.html \
        html/virt-tar.1.html \
@@ -151,28 +158,19 @@ website: $(HTMLFILES) $(TEXTFILES)
            -e "s/SUBST_DATE/$$date/" \
        < index.html.in > index.html
 
-# Generate the ChangeLog automatically from the gitlog.
-
+# When doing 'make dist' update a few files automatically.
 dist-hook:
        $(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog
        cp ChangeLog $(distdir)/ChangeLog
+       $(top_srcdir)/update-bugs > BUGS-t
+       mv BUGS-t BUGS
+       cp BUGS $(distdir)/BUGS
 
 # Update the list of translatable files in po/POTFILES.in.
 all-local:
        cd $(srcdir); \
        find $(DIST_SUBDIRS) \
-           -name '*.c' -o -name '*.pl' -o -name '*.pm' -o \
-           -name 'virt-cat' -o \
-           -name 'virt-df' -o \
-           -name 'virt-edit' -o \
-           -name 'virt-inspector' -o \
-           -name 'virt-list-filesystems' -o \
-           -name 'virt-list-partitions' -o \
-           -name 'virt-ls' -o \
-           -name 'virt-rescue' -o \
-           -name 'virt-resize' -o \
-           -name 'virt-tar' -o \
-           -name 'virt-win-reg' | \
+           -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
        grep -v '^perl/blib/' | \
        grep -v '^capitests/' | \
        grep -v '^daemon/lib/' | \