X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=0143a6969af90b4ee1e2894bf61e1b4d97779299;hp=87da5a8b5cdb78a25551f20e122bb171d50eb81b;hb=52f9cd4882135910ea06e1e50ac6441d455c9ab1;hpb=35e916dbcf06ace10c73e67a0a20bae87bb0733b

diff --git a/Makefile.am b/Makefile.am
index 87da5a8..0143a69 100644
--- 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 \
@@ -129,8 +135,11 @@ HTMLFILES = \
 	html/virt-edit.1.html \
 	html/virt-inspector.1.html \
 	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 \
 	html/virt-win-reg.1.html \
 	html/recipes.html \
@@ -149,26 +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-ls' -o \
-	    -name 'virt-rescue' -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/' | \