X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=b475659ff5a08ec869268b993ca75c95b6708d9b;hp=bfca6a1ed8c3020e5179edfc5f147fa8cc3b3c8b;hb=2b5fbc882a0a79646b668c7b95442f0b3673d63a;hpb=4cf4f2b66f850bb39c5bf29d3cd12ada9114d67e

diff --git a/Makefile.am b/Makefile.am
index bfca6a1..b475659 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009-2010 Red Hat Inc.
+# Copyright (C) 2009-2011 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
@@ -36,11 +36,11 @@ SUBDIRS += gnulib/tests capitests regressions test-tool
 SUBDIRS += fish
 
 # virt-tools in C.
-SUBDIRS += cat df inspector rescue
+SUBDIRS += cat df edit inspector rescue
 
 # Language bindings.
 if HAVE_PERL
-SUBDIRS += perl
+SUBDIRS += perl perl/examples
 endif
 if HAVE_OCAML
 SUBDIRS += ocaml ocaml/examples
@@ -64,6 +64,13 @@ endif
 # Unconditional because nothing is built yet.
 SUBDIRS += csharp
 
+# virt-resize 2.0 is written in OCaml.
+if HAVE_OCAML
+if HAVE_OCAML_PCRE
+SUBDIRS += resize
+endif
+endif
+
 # Perl tools and guestmount.
 if HAVE_TOOLS
 SUBDIRS += tools
@@ -74,12 +81,14 @@ SUBDIRS += fuse
 endif
 
 # po-docs must come after tools, inspector.
+if HAVE_PO4A
 SUBDIRS += po-docs
+endif
 
 EXTRA_DIST = \
 	$(generator_built) \
 	html/pod.css \
-	BUGS HACKING RELEASE-NOTES TODO \
+	BUGS HACKING RELEASE-NOTES ROADMAP TODO \
 	libguestfs.pc libguestfs.pc.in \
 	recipes/LICENSE \
 	recipes/README \
@@ -92,7 +101,12 @@ EXTRA_DIST = \
 	bindtests \
 	.gitignore \
 	m4/.gitignore \
-	libtool-kill-dependency_libs.sh
+	libtool-kill-dependency_libs.sh \
+	autogen.sh \
+	bugs-in-changelog.sh \
+	update-bugs.sh \
+	logo/fish.svg logo/fish.png \
+	run
 
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
@@ -105,11 +119,14 @@ HTMLFILES = \
 	html/guestfs.3.html \
 	html/guestfs-examples.3.html \
 	html/guestfs-ocaml.3.html \
+	html/guestfs-perl.3.html \
 	html/guestfs-python.3.html \
 	html/guestfs-ruby.3.html \
 	html/guestfish.1.html \
 	html/guestmount.1.html \
 	html/virt-cat.1.html \
+	html/virt-copy-in.1.html \
+	html/virt-copy-out.1.html \
 	html/virt-df.1.html \
 	html/virt-edit.1.html \
 	html/virt-filesystems.1.html \
@@ -121,11 +138,13 @@ HTMLFILES = \
 	html/virt-rescue.1.html \
 	html/virt-resize.1.html \
 	html/virt-tar.1.html \
+	html/virt-tar-in.1.html \
+	html/virt-tar-out.1.html \
 	html/virt-win-reg.1.html \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
-TEXTFILES = BUGS HACKING README RELEASE-NOTES TODO
+TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO
 
 WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
@@ -182,24 +201,14 @@ CLEANFILES = \
 	pod2htm?.tmp \
 	html/*.html
 
-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:
-	test-tool/run-test-tool-locally
+	./run test-tool/libguestfs-test-tool
 
-# Mostly static binary distribution.
-#
-# Some binaries are relinked partially statically.  You can make these
-# binaries "more static" by making sure that as many foo-static
-# packages are installed as possible.
-#
-# We remove the supermin appliance and adjust some directories to make
-# them non-Fedora-specific.
+# Make binary distribution.
 
 BINTMPDIR = /tmp/libguestfs-bin
 bindist:
@@ -207,26 +216,6 @@ bindist:
 	mkdir $(BINTMPDIR)
 	$(MAKE)
 	$(MAKE) DESTDIR=$(BINTMPDIR) install
-	rm -r $(BINTMPDIR)$(libdir)/guestfs/supermin.d
-	rm $(BINTMPDIR)$(libdir)/guestfs/kmod.whitelist
-	mv $(BINTMPDIR)$(prefix)/lib64/* $(BINTMPDIR)$(libdir)
-	mv $(BINTMPDIR)/usr/lib64/* $(BINTMPDIR)$(libdir)
 	-find $(BINTMPDIR) -type d -exec rmdir --ignore-fail-on-non-empty {} \;
-	$(MAKE) -C fish guestfish.static
-	cp fish/guestfish.static $(BINTMPDIR)$(bindir)/guestfish
-	$(MAKE) -C fuse guestmount.static
-	cp fuse/guestmount.static $(BINTMPDIR)$(bindir)/guestmount
-	$(MAKE) -C test-tool libguestfs-test-tool.static
-	cp test-tool/libguestfs-test-tool.static $(BINTMPDIR)$(bindir)/libguestfs-test-tool
-	$(MAKE) -C cat virt-cat.static virt-filesystems.static virt-ls.static
-	cp cat/virt-cat.static $(BINTMPDIR)$(bindir)/virt-cat
-	cp cat/virt-filesystems.static $(BINTMPDIR)$(bindir)/virt-filesystems
-	cp cat/virt-ls.static $(BINTMPDIR)$(bindir)/virt-ls
-	$(MAKE) -C df virt-df.static
-	cp df/virt-df.static $(BINTMPDIR)$(bindir)/virt-df
-	$(MAKE) -C inspector virt-inspector.static
-	cp inspector/virt-inspector.static $(BINTMPDIR)$(bindir)/virt-inspector
-	$(MAKE) -C rescue virt-rescue.static
-	cp rescue/virt-rescue.static $(BINTMPDIR)$(bindir)/virt-rescue
 	(cd $(BINTMPDIR) && tar cf - .) | \
-	  gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz
+	  gzip -c -9 > libguestfs-$(VERSION)-$(DISTRO)-$(host_cpu).tar.gz