X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=1ea6ff0ca3f1653c2be69ff2c66491570f3ecc8a;hp=b425ddd5bd89d17de5043f6fd5dd925292c6d2a2;hb=13458c821bfbe2e1ac0f355f436097951f465694;hpb=bdf7a27a790ff26664f91d95239ec33c5467bfeb;ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index b425ddd..1ea6ff0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon appliance fish po examples images \
-	capitests regressions
+SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
+	gnulib/tests capitests regressions test-tool
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -41,9 +41,6 @@ endif
 if HAVE_INSPECTOR
 SUBDIRS += inspector
 endif
-if HAVE_V2V
-SUBDIRS += v2v
-endif
 if HAVE_DF
 SUBDIRS += df
 endif
@@ -52,13 +49,11 @@ SUBDIRS += cat
 endif
 
 EXTRA_DIST = \
-	config.rpath \
 	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
 	guestfish.pod guestfish-actions.pod \
 	html/pod.css \
 	HACKING TODO \
 	libguestfs.pc libguestfs.pc.in \
-	gitlog-to-changelog \
 	recipes/LICENSE \
 	recipes/README \
 	recipes/*.html \
@@ -105,6 +100,7 @@ guestfish.1: guestfish.pod guestfish-actions.pod
 noinst_DATA = html/guestfs.3.html html/guestfish.1.html
 
 html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
+	mkdir -p html
 	sed \
 	  -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
 	  -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
@@ -116,6 +112,7 @@ html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
 	  --outfile $@
 
 html/guestfish.1.html: guestfish.pod guestfish-actions.pod
+	mkdir -p html
 	sed \
 	  -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
 	  < $< | \
@@ -127,6 +124,7 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod
 
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
+	mkdir -p html
 	rm -f $@ $@-t
 	sh make-recipes.sh recipes/*.sh > $@-t
 	mv $@-t $@
@@ -135,7 +133,6 @@ HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
 	html/virt-cat.1.html \
 	html/virt-df.1.html \
 	html/virt-inspector.1.html \
-	html/virt-v2v.1.html \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
@@ -150,17 +147,24 @@ website: $(HTMLFILES) $(TEXTFILES)
 # Generate the ChangeLog automatically from the gitlog.
 
 dist-hook:
-	./gitlog-to-changelog > ChangeLog
+	$(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog
 	cp ChangeLog $(distdir)/ChangeLog
 
 # Update the list of translatable files in po/POTFILES.in.
 all-local:
-	find -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
-	grep -v '/blib/' | \
-	grep -v '/capitests/' | \
-	grep -v '/examples/' | \
-	sort | \
-	sed 's,^\./,,' > $(srcdir)/po/POTFILES.in
+	cd $(srcdir); \
+	find $(DIST_SUBDIRS) -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
+	grep -v '^perl/blib/' | \
+	grep -v '^capitests/' | \
+	grep -v '^daemon/lib/' | \
+	grep -v '^daemon/tests/' | \
+	grep -v '^examples/' | \
+	grep -v '^gnulib/' | \
+	grep -v '^perl/examples/' | \
+	grep -v '/guestfs_protocol.c' | \
+	grep -v '/rc_protocol.c' | \
+	LC_ALL=C sort | \
+	sed 's,^\./,,' > po/POTFILES.in
 
 # Pkgconfig.
 
@@ -169,7 +173,11 @@ pkgconfig_DATA = libguestfs.pc
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
+CLEANFILES = $(fs_DATA) \
+	emptydisk \
+	pod2htm?.tmp \
+	html/*.html \
+	guestfs.3 guestfish.1
 
 clean-local:
 	rm -rf initramfs