X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=94a30173744fb2e7dbfddf0676bda67bd84c02c6;hp=ce2f940cf85473a3778c31ae9e39a44400de7882;hb=e1aca6323e33e0dd50e23dc0d638f5789c9188e4;hpb=8ad79a7c4de406579cf38d938edf44a8b659d03a;ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index ce2f940..94a3017 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/subdir-rules.mk
 ACLOCAL_AMFLAGS = -I m4
 
 # Basic source for the library.
-SUBDIRS = gnulib/lib images src examples po
+SUBDIRS = gnulib/lib images generator src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
@@ -33,7 +33,10 @@ endif
 SUBDIRS += gnulib/tests capitests regressions test-tool
 
 # Guestfish.
-SUBDIRS += fish 
+SUBDIRS += fish
+
+# virt-tools in C.
+SUBDIRS += cat inspector
 
 # Language bindings.
 if HAVE_PERL
@@ -54,12 +57,14 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
-
-# Virt-inspector, tools and guestmount.
-if HAVE_INSPECTOR
-SUBDIRS += inspector
+if HAVE_PHP
+SUBDIRS += php
 endif
 
+# Unconditional because nothing is built yet.
+SUBDIRS += csharp
+
+# Perl tools and guestmount.
 if HAVE_TOOLS
 SUBDIRS += tools
 endif
@@ -88,40 +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
-	mkdir -p html
-	sed \
-	  -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
-	  < $< | \
-	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
@@ -136,6 +107,7 @@ HTMLFILES = \
 	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 \
@@ -148,7 +120,7 @@ HTMLFILES = \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
-TEXTFILES = README TODO HACKING
+TEXTFILES = BUGS HACKING README RELEASE-NOTES TODO
 
 WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
@@ -165,9 +137,15 @@ 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 | \
+		grep -v rjones | \
+		grep -v "Richard Jones" \
+		> AUTHORS-t
+	mv AUTHORS-t AUTHORS
+	cp AUTHORS $(distdir)/AUTHORS
 
 # Update the list of translatable files in po/POTFILES.in.
 all-local:
@@ -209,9 +187,7 @@ clean-local:
 # is NOT a substitute for proper testing!
 
 quickcheck:
-	LIBGUESTFS_PATH=appliance \
-	test-tool/libguestfs-test-tool \
-	  --helper test-tool/libguestfs-test-tool-helper
+	test-tool/run-test-tool-locally
 
 # Mostly static binary distribution.
 #
@@ -239,5 +215,11 @@ 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 inspector virt-inspector.static
+	cp inspector/virt-inspector.static $(BINTMPDIR)$(bindir)/virt-inspector
 	(cd $(BINTMPDIR) && tar cf - .) | \
 	  gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz