[rygel/wip/meson: 16/28] fixup! WIP

[Jens Georg <jensgeorg src gnome org>]

commit b7fb5b98c47f11843828a7dec143e031437778c4
Author: Jens Georg <mail jensge org>
Date:   Sun May 21 09:20:51 2017 +0200

    fixup! WIP

 src/librygel-renderer/meson.build |   10 +++++++---
 src/librygel-server/meson.build   |    4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build
index 4387c8c..656e20e 100644
--- a/src/librygel-renderer/meson.build
+++ b/src/librygel-renderer/meson.build
@@ -31,10 +31,10 @@ custom_target('RygelRenderer-2.6.typelib',
                install_dir: typelib_dir)
 
 custom_target('RygelRenderer-2.6.gir',
-              command: [sed, '-e', 's,Rygel\.,RygelRenderer.,g',
+              command: [sed, '-e', 's,Rygel[.],RygelRenderer.,g',
                                           '-e', 's,namespace name="Rygel",namespace name="RygelRenderer",g',
-                                          '-e', 's,RygelRenderer\.Plugin,RygelCore.Plugin,g',
-                                          '-e', 's,RygelRenderer\.MediaDevice,RygelCore.MediaDevice,g',
+                                          '-e', 's,RygelRenderer[.]Plugin,RygelCore.Plugin,g',
+                                          '-e', 's,RygelRenderer[.]MediaDevice,RygelCore.MediaDevice,g',
                                           '-e', 's|<package name="rygel-renderer-2.6"/>|<include 
name="RygelCore" version="2.6"/><package name="rygel-renderer-2.6"/>|',
                         '@INPUT@'],
               input: 'Rygel-2.6.gir',
@@ -42,4 +42,8 @@ custom_target('RygelRenderer-2.6.gir',
               capture: true,
               install: true,
               install_dir: join_paths(get_option('datadir'),'gir-1.0'))
+rygel_renderer = declare_dependency(include_directories : include_directories('.'),
+                                    dependencies : renderer_deps,
+                                    link_with: renderer_lib)
 
+renderer_girdir = meson.current_build_dir()
diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build
index ef3fffe..579be06 100644
--- a/src/librygel-server/meson.build
+++ b/src/librygel-server/meson.build
@@ -111,8 +111,8 @@ custom_target('RygelServer-2.6.typelib',
 custom_target('RygelServer-2.6.gir',
               command: [sed, '-e', 's,Rygel\.,RygelServer.,g',
                                           '-e', 's,namespace name="Rygel",namespace name="RygelServer",g',
-                                          '-e', 's,RygelServer\.Plugin,RygelCore.Plugin,g',
-                                          '-e', 's,RygelServer\.MediaDevice,RygelCore.MediaDevice,g',
+                                          '-e', 's,RygelServer[.]Plugin,RygelCore.Plugin,g',
+                                          '-e', 's,RygelServer[.]MediaDevice,RygelCore.MediaDevice,g',
                                           '-e', 's|<package name="rygel-server-2.6"/>|<include 
name="RygelCore" version="2.6"/><package name="rygel-server-2.6"/>|',
                         '@INPUT@'],
               input: 'Rygel-2.6.gir',