[libsocialweb] Build out-of-tree successfully

[Simon McVittie <smcv src gnome org>]

commit dc44b05e054646d51702a9f3a8e0216b1869e300
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Wed Mar 6 12:13:38 2013 +0000

    Build out-of-tree successfully
    
    If you're building out-of-tree, the generated C code
    corresponding to the XML in interfaces/ ought to be in the builddir;
    so it needs to be #include'd from there.
    
    However, if you include the generated source in tarballs,
    that satisfies the "make" dependency and the files won't
    necessarily be rebuilt, resulting in the build failing.
    To avoid that, don't distribute generated source.
    
    Signed-off-by: Simon McVittie <simon mcvittie collabora co uk>
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=695280
    Reviewed-by: Ross Burton <ross burtonini com>

 interfaces/Makefile.am   |    4 ++--
 libsocialweb/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index f6ba833..0a6d742 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -26,7 +26,7 @@ GINTERFACE_SOURCES = \
        $(DBUS_SPECS:.xml=-ginterface.h) \
        $(DBUS_SPECS:.xml=-ginterface.c)
 
-libsocialweb_ginterfaces_la_SOURCES = $(GINTERFACE_SOURCES) $(MARSHALS_SOURCES)
+nodist_libsocialweb_ginterfaces_la_SOURCES = $(GINTERFACE_SOURCES) $(MARSHALS_SOURCES)
 libsocialweb_ginterfaces_la_LIBADD = $(DBUS_GLIB_LIBS) $(GCOV_LIBS)
 libsocialweb_ginterfaces_la_CFLAGS = $(DBUS_GLIB_CFLAGS) $(GCOV_CFLAGS)
 
@@ -46,7 +46,7 @@ libsocialweb_ginterfaces_la_HEADERS = \
 
 BINDINGS_SOURCES = $(DBUS_SPECS:.xml=-bindings.h)
 
-libsocialweb_bindings_la_SOURCES = $(BINDINGS_SOURCES) $(MARSHALS_SOURCES)
+nodist_libsocialweb_bindings_la_SOURCES = $(BINDINGS_SOURCES) $(MARSHALS_SOURCES)
 libsocialweb_bindings_la_LIBADD = $(DBUS_GLIB_LIBS)
 libsocialweb_bindings_la_CFLAGS = $(DBUS_GLIB_CFLAGS)
 
diff --git a/libsocialweb/Makefile.am b/libsocialweb/Makefile.am
index 57d0d34..bf25e17 100644
--- a/libsocialweb/Makefile.am
+++ b/libsocialweb/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libsocialweb.la
 
 libsocialweb_ladir = $(pkgincludedir)/libsocialweb
 
-libsocialweb_la_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/interfaces \
+libsocialweb_la_CFLAGS = -I$(top_srcdir) -I$(top_builddir)/interfaces \
                     $(DBUS_GLIB_CFLAGS) $(SOUP_CFLAGS) $(SOUP_GNOME_CFLAGS) \
                     $(NM_CFLAGS) $(GTK_CFLAGS) $(REST_CFLAGS) \
                     $(GMODULE_CFLAGS) $(GCOV_CFLAGS) \