X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=41e8db981e6a2a44fec88632ecf1b5e71bdfcc52;hp=f118291f3446939de8e90e9a62e27715eb59182c;hb=c36fa40b981401cdbf61f596b804e79283d658b2;hpb=f9de01b9b97e3d13959754446464f9b768deea81

diff --git a/Makefile.am b/Makefile.am
index f118291..41e8db9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
-SUBDIRS = src daemon appliance fish po examples images \
-	capitests regressions test-tool
+SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
+	gnulib/tests capitests regressions test-tool
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -52,13 +52,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 \
@@ -153,7 +151,7 @@ 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.
@@ -162,10 +160,12 @@ all-local:
 	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 '/guestfs_protocol.c' | \
 	grep -v '/rc_protocol.c' | \
-	sort | \
+	LC_ALL=C sort | \
 	sed 's,^\./,,' > po/POTFILES.in
 
 # Pkgconfig.