From 09a0427448b1f4328b9246d4d8a26610bb5228c8 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@redhat.com>
Date: Sat, 17 Apr 2010 15:46:08 +0100
Subject: [PATCH] Build top-level directories in a more logical order.

---
 Makefile.am | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 44fc893..2fde7ff 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 \
-- 
1.8.3.1