X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=0143a6969af90b4ee1e2894bf61e1b4d97779299;hp=020d889debbc3ea277f05a825d594159049da9c9;hb=4df593496e116dfb635731c058b7627e81fc179c;hpb=e28207d5ad7ed96e10467e38788239ef9690285e

diff --git a/Makefile.am b/Makefile.am
index 020d889..0143a69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2009-2010 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,27 +19,26 @@ include $(top_srcdir)/subdir-rules.mk
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \
-	gnulib/tests capitests regressions test-tool
+# Basic source for the library.
+SUBDIRS = gnulib/lib images src examples po
 
-# 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
+if ENABLE_DAEMON
+SUBDIRS += daemon
 endif
-if HAVE_TOOLS
-SUBDIRS += tools
+if ENABLE_APPLIANCE
+SUBDIRS += appliance
 endif
 
-if HAVE_FUSE
-SUBDIRS += fuse
-endif
+# 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_OCAML
 SUBDIRS += ocaml ocaml/examples
 endif
@@ -56,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 \
@@ -69,7 +81,9 @@ EXTRA_DIST = \
 	html/recipes.css \
 	make-recipes.sh \
 	contrib/README \
-	bindtests
+	bindtests \
+	.gitignore \
+	m4/.gitignore
 
 # HTML versions of manual pages.
 
@@ -116,16 +130,16 @@ 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-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 \
@@ -144,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/' | \
@@ -192,3 +199,12 @@ CLEANFILES = $(fs_DATA) \
 
 clean-local:
 	rm -rf initramfs
+
+# If you don't want to run all of the tests ('make check') then this
+# will just run libguestfs-test-tool for a quick check.  Note this
+# is NOT a substitute for proper testing!
+
+quickcheck:
+	LIBGUESTFS_PATH=appliance \
+	test-tool/libguestfs-test-tool \
+	  --helper test-tool/libguestfs-test-tool-helper