[rygel] build: Fix building of introspection data

[Jens Georg <jensgeorg src gnome org>]

commit a63bdc1240ec52f84904071e0d30264226c63868
Author: Jens Georg <mail jensge org>
Date:   Wed Aug 20 00:13:04 2014 +0200

    build: Fix building of introspection data
    
    Signed-off-by: Jens Georg <mail jensge org>

 src/librygel-core/Makefile.am     |    5 ++++-
 src/librygel-renderer/Makefile.am |    6 +++---
 src/librygel-server/Makefile.am   |    6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
index d565c24..8d113e2 100644
--- a/src/librygel-core/Makefile.am
+++ b/src/librygel-core/Makefile.am
@@ -63,6 +63,8 @@ dist_gir_DATA = $(GIRS)
 typelibdir = $(libdir)/girepository-1.0
 nodist_typelib_DATA = $(GIRS:.gir=.typelib)
 
+DISTCLEANFILES = RygelCore-2.4.typelib
+
 MAINTAINERCLEANFILES += $(BUILT_SOURCES)
 
 EXTRA_DIST = \
@@ -71,4 +73,5 @@ EXTRA_DIST = \
        $(DEPS_FILES) \
        uuid.vapi \
        $(BUILT_SOURCES) \
-       RygelCore-2.4.gir
+       RygelCore-2.4.gir \
+       Rygel-2.4.gir
diff --git a/src/librygel-renderer/Makefile.am b/src/librygel-renderer/Makefile.am
index 2359a37..7150667 100644
--- a/src/librygel-renderer/Makefile.am
+++ b/src/librygel-renderer/Makefile.am
@@ -36,7 +36,7 @@ rygel-renderer.h rygel-renderer-2.4.vapi Rygel-2.4.gir: librygel_renderer_2_4_la
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS=
 INTROSPECTION_SCANNER_ARGS=
-INTROSPECTION_COMPILER_ARGS= -l librygel-renderer-2.4.so.2 --includedir=$(builddir)/../librygel-core
+INTROSPECTION_COMPILER_ARGS= -l librygel-renderer-2.4.so.2 --includedir=$(builddir)/../librygel-core 
--includedir=$(srcdir)/../librygel-core
 $(builddir)/RygelRenderer-2.4.gir: $(srcdir)/Rygel-2.4.gir
        $(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelRenderer.,g' \
                -e 's,namespace name="Rygel",namespace name="RygelRenderer",g' \
@@ -53,5 +53,5 @@ typelibdir = $(libdir)/girepository-1.0
 nodist_typelib_DATA = $(GIRS:.gir=.typelib)
 
 
-
-EXTRA_DIST = rygel-renderer.h rygel-renderer-2.4.vapi rygel-renderer-2.4.deps RygelRenderer-2.4.gir
+DISTCLEANFILES = RygelRenderer-2.4.typelib
+EXTRA_DIST = rygel-renderer.h rygel-renderer-2.4.vapi rygel-renderer-2.4.deps RygelRenderer-2.4.gir 
Rygel-2.4.gir
diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am
index f7968e4..75a0778 100644
--- a/src/librygel-server/Makefile.am
+++ b/src/librygel-server/Makefile.am
@@ -40,7 +40,7 @@ rygel-server.h rygel-server-2.4.vapi Rygel-2.4.gir: librygel_server_2_4_la_vala.
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS=
 INTROSPECTION_SCANNER_ARGS=
-INTROSPECTION_COMPILER_ARGS= -l librygel-server-2.4.so.2 --includedir=$(builddir)/../librygel-core
+INTROSPECTION_COMPILER_ARGS= -l librygel-server-2.4.so.2 --includedir=$(builddir)/../librygel-core 
--includedir=$(srcdir)/../librygel-core
 $(builddir)/RygelServer-2.4.gir: $(srcdir)/Rygel-2.4.gir
        $(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelServer.,g' \
                -e 's,namespace name="Rygel",namespace name="RygelServer",g' \
@@ -56,5 +56,5 @@ dist_gir_DATA = $(GIRS)
 typelibdir = $(libdir)/girepository-1.0
 nodist_typelib_DATA = $(GIRS:.gir=.typelib)
 
-
-EXTRA_DIST = rygel-server.h rygel-server-2.4.vapi rygel-server-2.4.deps RygelServer-2.4.gir
+DISTCLEANFILES = RygelServer-2.4.typelib
+EXTRA_DIST = rygel-server.h rygel-server-2.4.vapi rygel-server-2.4.deps RygelServer-2.4.gir Rygel-2.4.gir