[libsocialweb] Makefile.am: Fix distcheck problems

[Ross Burton <rburton src gnome org>]

commit 1a808540ac9ff58fdcf855a9dee9bb7d96787e7d
Author: Alban Crequy <alban crequy collabora co uk>
Date:   Wed Mar 2 16:13:04 2011 +0000

    Makefile.am: Fix distcheck problems

 Makefile.am                     |    2 +-
 libsocialweb-client/Makefile.am |   16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e98407b..2c703d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = interfaces libsocialweb libsocialweb-keyfob libsocialweb-keystore libsocialweb-client src services examples tests tools po docs
+SUBDIRS = interfaces libsocialweb libsocialweb-keyfob libsocialweb-keystore libsocialweb-client src services examples tests tools po docs m4
 
 if HAVE_INTROSPECTION
 if HAVE_VALA
diff --git a/libsocialweb-client/Makefile.am b/libsocialweb-client/Makefile.am
index 4634976..b7952f3 100644
--- a/libsocialweb-client/Makefile.am
+++ b/libsocialweb-client/Makefile.am
@@ -2,6 +2,7 @@ CLEANFILES =
 
 lib_LTLIBRARIES = libsocialweb-client.la
 
+srcthisdir = $(top_srcdir)/libsocialweb-client/
 libsocialweb_client_ladir = $(includedir)/libsocialweb/libsocialweb-client
 libsocialweb_client_la_CFLAGS = -I$(top_srcdir) $(DBUS_GLIB_CFLAGS) $(GIO_CFLAGS) -DDATADIR="\"$(datadir)\""
 libsocialweb_client_la_LIBADD = $(DBUS_GLIB_LIBS) $(GIO_LIBS) $(top_builddir)/interfaces/libsocialweb-bindings.la
@@ -10,6 +11,7 @@ HANDWRITTED_H_SOURCES = sw-client.h \
 			      sw-item.h sw-client-service.h \
 			      sw-client-lastfm.h sw-client-item-view.h
 libsocialweb_client_la_HEADERS = $(HANDWRITTED_H_SOURCES)
+nodist_libsocialweb_client_la_HEADERS =
 HANDWRITTED_C_SOURCES = sw-client.c \
 			      sw-item.c sw-client-service.c \
 			      sw-client-lastfm.c \
@@ -24,19 +26,20 @@ if HAVE_INTROSPECTION
 
 if HAVE_VALA
 
-libsocialweb_client_la_HEADERS += libsocialweb-client-hack-for-vala.h
+nodist_libsocialweb_client_la_HEADERS += libsocialweb-client-hack-for-vala.h
 
 libsocialweb-client-hack-for-vala.h: $(HANDWRITTED_H_SOURCES) \
     libsocialweb-client-hack-for-vala.h.header.in \
     libsocialweb-client-hack-for-vala.h.footer.in
 	$(AM_V_GEN)( \
-	    cat libsocialweb-client-hack-for-vala.h.header.in; \
+	    cat $(srcthisdir)libsocialweb-client-hack-for-vala.h.header.in; \
 	    for include in $(HANDWRITTED_H_SOURCES); do \
 		echo "#include <libsocialweb-client/$$include>"; \
 	    done; \
-	    cat libsocialweb-client-hack-for-vala.h.footer.in \
+	    cat $(srcthisdir)libsocialweb-client-hack-for-vala.h.footer.in \
 	) > $@
 
+CLEANFILES += libsocialweb-client-hack-for-vala.h
 endif # if HAVE_VALA
 
 INTROSPECTION_FILES = $(HANDWRITTED_C_SOURCES) \
@@ -58,8 +61,8 @@ SocialWebClient-0.25.gir: $(INTROSPECTION_SCANNER) \
 		--library=libsocialweb-client.la \
 		--warn-all \
 		--output $  tmp \
-		$(INTROSPECTION_FILES)
-	@xsltproc kludge.xsl $  tmp > $@
+		$(addprefix $(srcthisdir),$(INTROSPECTION_FILES))
+	@xsltproc $(srcthisdir)kludge.xsl $  tmp > $@
 	@rm -f $  tmp
 
 girdir = $(datadir)/gir-1.0
@@ -83,4 +86,5 @@ endif # if HAVE_INTROSPECTION
 
 EXTRA_DIST = \
 	     libsocialweb-client-hack-for-vala.h.header.in \
-	     libsocialweb-client-hack-for-vala.h.footer.in
+	     libsocialweb-client-hack-for-vala.h.footer.in \
+	     kludge.xsl