X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=86d4e0a5fe19cc96e6a08510ca4b6eea12c4de25;hp=5aa1a54ae2751775e02372dbccb3f6c0878865b8;hb=a6054bf90f39a84c1a8f8f7d3b9e81e84cb13696;hpb=d29e9a552f5823d1d8cb8d4962cb1301bbf60b0e

diff --git a/Makefile.am b/Makefile.am
index 5aa1a54..86d4e0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,8 +35,8 @@ SUBDIRS += gnulib/tests capitests regressions test-tool
 # Guestfish.
 SUBDIRS += fish
 
-# virt-cat (in C).
-SUBDIRS += cat
+# virt-tools in C.
+SUBDIRS += cat df inspector rescue
 
 # Language bindings.
 if HAVE_PERL
@@ -46,10 +46,10 @@ if HAVE_OCAML
 SUBDIRS += ocaml ocaml/examples
 endif
 if HAVE_PYTHON
-SUBDIRS += python
+SUBDIRS += python python/examples
 endif
 if HAVE_RUBY
-SUBDIRS += ruby
+SUBDIRS += ruby ruby/examples
 endif
 if HAVE_JAVA
 SUBDIRS += java
@@ -64,11 +64,7 @@ endif
 # Unconditional because nothing is built yet.
 SUBDIRS += csharp
 
-# Virt-inspector, tools and guestmount.
-if HAVE_INSPECTOR
-SUBDIRS += inspector
-endif
-
+# Perl tools and guestmount.
 if HAVE_TOOLS
 SUBDIRS += tools
 endif
@@ -97,41 +93,6 @@ EXTRA_DIST = \
 	.gitignore \
 	m4/.gitignore
 
-# HTML versions of manual pages.
-
-noinst_DATA = html/guestfs.3.html html/guestfish.1.html
-
-html/guestfs.3.html: src/guestfs.pod \
-		src/guestfs-actions.pod \
-		src/guestfs-availability.pod \
-		src/guestfs-structs.pod
-	mkdir -p html
-	sed \
-	  -e '/@ACTIONS@/rsrc/guestfs-actions.pod' \
-	  -e 's/@ACTIONS@//' \
-	  -e '/@AVAILABILITY@/rsrc/guestfs-availability.pod' \
-	  -e 's/@AVAILABILITY@//' \
-	  -e '/@STRUCTS@/rsrc/guestfs-structs.pod' \
-	  -e 's/@STRUCTS@//' \
-	  < $< | \
-	pod2html \
-	  --css 'pod.css' \
-	  --title "libguestfs API documentation" \
-	  --htmldir html \
-	  --outfile $@
-
-html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod fish/guestfish-commands.pod
-	mkdir -p html
-	sed \
-	  -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
-	  -e '/@FISH_COMMANDS@/rfish/guestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
-	  < $< | \
-	pod2html \
-	  --css 'pod.css' \
-	  --title "guestfish, libguestfs filesystem interactive shell" \
-	  --htmldir html \
-	  --outfile $@
-
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
 	mkdir -p html
@@ -141,11 +102,16 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
 
 HTMLFILES = \
 	html/guestfs.3.html \
+	html/guestfs-examples.3.html \
+	html/guestfs-ocaml.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-df.1.html \
 	html/virt-edit.1.html \
+	html/virt-filesystems.1.html \
 	html/virt-inspector.1.html \
 	html/virt-list-filesystems.1.html \
 	html/virt-list-partitions.1.html \
@@ -175,7 +141,7 @@ website: $(HTMLFILES) $(TEXTFILES)
 dist-hook:
 	$(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog
 	cp ChangeLog $(distdir)/ChangeLog
-	$(top_srcdir)/update-bugs > BUGS-t
+	$(top_srcdir)/update-bugs.sh > BUGS-t
 	mv BUGS-t BUGS
 	cp BUGS $(distdir)/BUGS
 	git log --pretty="format:%an" | sort -u | \
@@ -211,11 +177,9 @@ pkgconfig_DATA = libguestfs.pc
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) \
-	emptydisk \
+CLEANFILES = \
 	pod2htm?.tmp \
-	html/*.html \
-	guestfs.3 guestfish.1
+	html/*.html
 
 clean-local:
 	rm -rf initramfs
@@ -253,5 +217,15 @@ bindist:
 	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