GNOME.org
 

[rygel/wip/meson: 31/34] WIP

commit 669a76b0eee294235e7cf5b617dab3a62692c9e0
Author: Jens Georg <mail jensge org>
Date:   Mon Jun 5 18:40:38 2017 +0200

    WIP

 src/librygel-core/meson.build         | 21 +++++++++++----------
 src/librygel-renderer-gst/meson.build | 30 ++++++++++++++++--------------
 src/librygel-renderer/meson.build     | 28 +++++++++++++++-------------
 src/librygel-server/meson.build       | 29 +++++++++++++++--------------
 4 files changed, 57 insertions(+), 51 deletions(-)
---
diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build
index 4b61c2e7..485780c8 100644
--- a/src/librygel-core/meson.build
+++ b/src/librygel-core/meson.build
@@ -46,24 +46,25 @@ core_lib = library('rygel-core-2.6', core_sources,
         install_dir : [true, rygel_includedir, true, false])
 install_data('rygel-core-2.6.deps', install_dir : rygel_vapidir)
 
-custom_target('RygelCore-2.6.typelib',
-               command: [g_ir_compiler, '--output', '@OUTPUT@', '@INPUT@'],
-               output: 'RygelCore-2.6.typelib',
-               input: 'RygelCore-2.6.gir',
-               depends: core_lib,
-               install: true,
-               install_dir: typelib_dir)
-
-custom_target('RygelCore-2.6.gir',
+core_girfile = custom_target('RygelCore-2.6.gir',
               command: [sed, '-e', 's,Rygel[.],RygelCore.,g',
                         '-e', 's,namespace name="Rygel",namespace name="RygelCore",g',
                         '@INPUT@'],
-              input: 'Rygel-2.6.gir',
+              input: meson.current_build_dir() + '/Rygel-2.6.gir',
               output: 'RygelCore-2.6.gir',
+              depends : core_lib,
               capture: true,
               install: true,
               install_dir: gir_dir)
 
+custom_target('RygelCore-2.6.typelib',
+               command: [g_ir_compiler, '--output', '@OUTPUT@', '@INPUT@'],
+               output: 'RygelCore-2.6.typelib',
+               input: core_girfile,
+               depends: core_lib,
+               install: true,
+               install_dir: typelib_dir)
+
 # need to add to get the current build dir as include dir
 rygel_core = declare_dependency(include_directories: include_directories('.'),
                                 dependencies: core_deps,
diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build
index 88e5b708..4c661124 100644
--- a/src/librygel-renderer-gst/meson.build
+++ b/src/librygel-renderer-gst/meson.build
@@ -13,19 +13,7 @@ renderer_gst_lib = library('rygel-renderer-gst-2.6', renderer_gst_sources,
         install_dir : [true, rygel_includedir, true, false])
 install_data('rygel-renderer-gst-2.6.deps', install_dir : rygel_vapidir)
 
-custom_target('RygelRendererGst-2.6.typelib',
-               command: [g_ir_compiler,
-                        '--output', '@OUTPUT@',
-                        '--includedir', core_girdir,
-                        '--includedir', renderer_girdir,
-                        '@INPUT@'],
-               output: 'RygelRendererGst-2.6.typelib',
-               input: 'RygelRendererGst-2.6.gir',
-               depends: [renderer_gst_lib, renderer_lib],
-               install: true,
-               install_dir: typelib_dir)
-
-custom_target('RygelRendererGst-2.6.gir',
+renderer_gst_girfile = custom_target('RygelRendererGst-2.6.gir',
               command: [sed, '-e', 's,Rygel[.],RygelRendererGst.,g',
                              '-e', 's,RygelRendererGst[.]MediaRenderer,RygelRenderer.MediaRenderer,g',
                              '-e', 's,RygelRendererGst[.]MediaPlayer,RygelRenderer.MediaPlayer,g',
@@ -33,12 +21,26 @@ custom_target('RygelRendererGst-2.6.gir',
                              '-e', 's,RygelRendererGst[.]Plugin,RygelCore.Plugin,g',
                              '-e', 's,<package name="rygel-renderer-gst-2.6"/>,<include name="RygelCore" 
version="2.6"/><include name="RygelRenderer" version="2.6"/><package name="rygel-renderer-gst-2.6"/>,',
                         '@INPUT@'],
-              input: 'Rygel-2.6.gir',
+              input: join_paths(meson.current_build_dir(), 'Rygel-2.6.gir'),
               output: 'RygelRendererGst-2.6.gir',
+              depends : renderer_gst_lib,
               capture: true,
               install: true,
               install_dir: join_paths(get_option('datadir'),'gir-1.0'))
 
+custom_target('RygelRendererGst-2.6.typelib',
+               command: [g_ir_compiler,
+                        '--output', '@OUTPUT@',
+                        '--includedir', core_girdir,
+                        '--includedir', renderer_girdir,
+                        '@INPUT@'],
+               output: 'RygelRendererGst-2.6.typelib',
+               input: renderer_gst_girfile,
+               depends: [renderer_gst_lib, renderer_lib],
+               install: true,
+               install_dir: typelib_dir)
+
+
 rygel_renderer_gst = declare_dependency(include_directories : include_directories('.'),
                                         dependencies : renderer_gst_deps,
                                         link_with: renderer_gst_lib)
diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build
index 1d8997c6..1d49ca51 100644
--- a/src/librygel-renderer/meson.build
+++ b/src/librygel-renderer/meson.build
@@ -21,29 +21,31 @@ renderer_lib = library('rygel-renderer-2.6', renderer_sources,
         install_dir : [true, rygel_includedir, true, false])
 install_data('rygel-renderer-2.6.deps', install_dir : rygel_vapidir)
 
+renderer_girfile = custom_target('RygelRenderer-2.6.gir',
+              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|<package name="rygel-renderer-2.6"/>|<include name="RygelCore" 
version="2.6"/><package name="rygel-renderer-2.6"/>|',
+                        '@INPUT@'],
+              input: join_paths(meson.current_build_dir(), 'Rygel-2.6.gir'),
+              output: 'RygelRenderer-2.6.gir',
+              capture: true,
+              install: true,
+              install_dir: join_paths(get_option('datadir'),'gir-1.0'))
+
 custom_target('RygelRenderer-2.6.typelib',
                command: [g_ir_compiler,
                         '--output', '@OUTPUT@',
                         '--includedir', core_girdir,
                         '@INPUT@'],
                output: 'RygelRenderer-2.6.typelib',
-               input: 'RygelRenderer-2.6.gir',
+               input: renderer_girfile,
                depends: renderer_lib,
                install: true,
                install_dir: typelib_dir)
 
-custom_target('RygelRenderer-2.6.gir',
-              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|<package name="rygel-renderer-2.6"/>|<include 
name="RygelCore" version="2.6"/><package name="rygel-renderer-2.6"/>|',
-                        '@INPUT@'],
-              input: 'Rygel-2.6.gir',
-              output: '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)
diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build
index aa0b948a..2f601d6c 100644
--- a/src/librygel-server/meson.build
+++ b/src/librygel-server/meson.build
@@ -99,30 +99,31 @@ server_lib = library('rygel-server-2.6', server_sources,
         install_dir : [true, rygel_includedir, true, false])
 install_data('rygel-server-2.6.deps', install_dir : rygel_vapidir)
 
+server_girfile = 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|<package name="rygel-server-2.6"/>|<include name="RygelCore" 
version="2.6"/><package name="rygel-server-2.6"/>|',
+                        '@INPUT@'],
+              input: join_paths(meson.current_build_dir(), 'Rygel-2.6.gir'),
+              output: 'RygelServer-2.6.gir',
+              depends: server_lib,
+              capture: true,
+              install: true,
+              install_dir: join_paths(get_option('datadir'),'gir-1.0'))
+
 custom_target('RygelServer-2.6.typelib',
                command: [g_ir_compiler,
                         '--output', '@OUTPUT@',
                         '--includedir', core_girdir,
                         '@INPUT@'],
                output: 'RygelServer-2.6.typelib',
-               input: 'RygelServer-2.6.gir',
+               input: server_girfile,
                depends: server_lib,
                install: true,
                install_dir: typelib_dir)
 
-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|<package name="rygel-server-2.6"/>|<include 
name="RygelCore" version="2.6"/><package name="rygel-server-2.6"/>|',
-                        '@INPUT@'],
-              input: 'Rygel-2.6.gir',
-              output: 'RygelServer-2.6.gir',
-              capture: true,
-              install: true,
-              install_dir: join_paths(get_option('datadir'),'gir-1.0'))
-
 # need to add to get the current build dir as include dir
 rygel_server = declare_dependency(include_directories: include_directories('.'),
                                   dependencies : server_deps,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]