build: Fix deprecations in meson files

6 files changed, 36 insertions, 35 deletions

diff --git a/doc/man/meson.build b/doc/man/meson.build
index 043efe2f..d1425eb6 100644
--- a/doc/man/meson.build
+++ b/doc/man/meson.build
@@ -36,7 +36,8 @@ if xsltproc.found()
             '--noout',
             stylesheet,
             'rygel.xml'
-        ]
+        ],
+        check: true
     )
 
     if (r.returncode() == 0)
diff --git a/doc/reference/librygel-core/meson.build b/doc/reference/librygel-core/meson.build
index 7a403e8a..6401ee80 100644
--- a/doc/reference/librygel-core/meson.build
+++ b/doc/reference/librygel-core/meson.build
@@ -2,7 +2,7 @@ if valadoc.found()
 core_doc_common_args = [
         '--package-name', 'librygel-core',
         '--package-version', '2.8',
-        '-b', join_paths(meson.source_root(), 'src', 'librygel-core'),
+        '-b', join_paths(meson.project_source_root(), 'src', 'librygel-core'),
         '--pkg', 'rygel-build-config',
         '--force',
         '--directory', '@OUTPUT@',
@@ -39,10 +39,10 @@ gtkdoc_core_target = custom_target('gtkdoc-core',
         valadoc,
         '--doclet', 'gtkdoc',
         core_doc_common_args,
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/rygel-core.h'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-core/rygel-core.h'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.8.so'),
-        '-b', join_paths(meson.source_root(), 'src', 'librygel-core'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-core/librygel-core-2.8.so'),
+        '-b', join_paths(meson.project_source_root(), 'src', 'librygel-core'),
         core_sources
     ]
 )
diff --git a/doc/reference/librygel-db/meson.build b/doc/reference/librygel-db/meson.build
index 7c19246f..716b591a 100644
--- a/doc/reference/librygel-db/meson.build
+++ b/doc/reference/librygel-db/meson.build
@@ -2,10 +2,10 @@ if valadoc.found()
 db_doc_common_args = [
         '--package-name', 'librygel-db',
         '--package-version', '2.8',
-        '-b', join_paths(meson.source_root(), 'src', 'librygel-db'),
-        '--vapidir', join_paths(meson.source_root(), 'vapi'),
-        '--vapidir', join_paths(meson.source_root(), 'src/librygel-core'),
-        '--vapidir', join_paths(meson.build_root(), 'src/librygel-core'),
+        '-b', join_paths(meson.project_source_root(), 'src', 'librygel-db'),
+        '--vapidir', join_paths(meson.project_source_root(), 'vapi'),
+        '--vapidir', join_paths(meson.project_source_root(), 'src/librygel-core'),
+        '--vapidir', join_paths(meson.project_build_root(), 'src/librygel-core'),
         '--pkg', 'rygel-build-config',
         '--force',
         '--directory', '@OUTPUT@',
@@ -44,11 +44,11 @@ gtkdoc_db_target = custom_target('gtkdoc-db',
         valadoc,
         db_doc_common_args,
         '--doclet', 'gtkdoc',
-        '-X', join_paths(meson.build_root(), 'src/librygel-db/rygel-db.h'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-db/rygel-db.h'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-db/librygel-db-2.8.so'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-db/librygel-db-2.8.so'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.8.so'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-core/librygel-core-2.8.so'),
         db_sources
     ]
 )
diff --git a/doc/reference/librygel-renderer-gst/meson.build b/doc/reference/librygel-renderer-gst/meson.build
index e722c21f..52a51f32 100644
--- a/doc/reference/librygel-renderer-gst/meson.build
+++ b/doc/reference/librygel-renderer-gst/meson.build
@@ -2,11 +2,11 @@ if valadoc.found()
 renderer_gst_doc_common_args = [
         '--package-name', 'librygel-renderer-gst',
         '--package-version', '2.8',
-        '-b', join_paths(meson.source_root(), 'src', 'librygel-renderer-gst'),
-        '--vapidir', join_paths(meson.source_root(), 'vapi'),
-        '--vapidir', join_paths(meson.source_root(), 'src/librygel-core'),
-        '--vapidir', join_paths(meson.build_root(), 'src/librygel-core'),
-        '--vapidir', join_paths(meson.build_root(), 'src', 'librygel-renderer'),
+        '-b', join_paths(meson.project_source_root(), 'src', 'librygel-renderer-gst'),
+        '--vapidir', join_paths(meson.project_source_root(), 'vapi'),
+        '--vapidir', join_paths(meson.project_source_root(), 'src/librygel-core'),
+        '--vapidir', join_paths(meson.project_build_root(), 'src/librygel-core'),
+        '--vapidir', join_paths(meson.project_build_root(), 'src', 'librygel-renderer'),
         '--pkg', 'rygel-build-config',
         '--force',
         '--directory', '@OUTPUT@',
@@ -47,13 +47,13 @@ gtkdoc_renderer_gst_target = custom_target('gtkdoc-renderer-gst',
         valadoc,
         renderer_gst_doc_common_args,
         '--doclet', 'gtkdoc',
-        '-X', join_paths(meson.build_root(), 'src/librygel-renderer/rygel-renderer.h'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-renderer/rygel-renderer.h'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-renderer/librygel-renderer-2.8.so'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-renderer/librygel-renderer-2.8.so'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.8.so'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-core/librygel-core-2.8.so'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-renderer-gst/librygel-renderer-gst-2.8.so'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-renderer-gst/librygel-renderer-gst-2.8.so'),
         renderer_gst_sources
     ]
 )
diff --git a/doc/reference/librygel-renderer/meson.build b/doc/reference/librygel-renderer/meson.build
index 6e46eb99..5d3560d3 100644
--- a/doc/reference/librygel-renderer/meson.build
+++ b/doc/reference/librygel-renderer/meson.build
@@ -2,10 +2,10 @@ if valadoc.found()
 renderer_doc_common_args = [
         '--package-name', 'librygel-renderer',
         '--package-version', '2.8',
-        '-b', join_paths(meson.source_root(), 'src', 'librygel-renderer'),
-        '--vapidir', join_paths(meson.source_root(), 'vapi'),
-        '--vapidir', join_paths(meson.source_root(), 'src/librygel-core'),
-        '--vapidir', join_paths(meson.build_root(), 'src/librygel-core'),
+        '-b', join_paths(meson.project_source_root(), 'src', 'librygel-renderer'),
+        '--vapidir', join_paths(meson.project_source_root(), 'vapi'),
+        '--vapidir', join_paths(meson.project_source_root(), 'src/librygel-core'),
+        '--vapidir', join_paths(meson.project_build_root(), 'src/librygel-core'),
         '--pkg', 'rygel-build-config',
         '--force',
         '--directory', '@OUTPUT@',
@@ -43,11 +43,11 @@ gtkdoc_renderer_target = custom_target('gtkdoc-renderer',
         valadoc,
         renderer_doc_common_args,
         '--doclet', 'gtkdoc',
-        '-X', join_paths(meson.build_root(), 'src/librygel-renderer/rygel-renderer.h'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-renderer/rygel-renderer.h'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-renderer/librygel-renderer-2.8.so'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-renderer/librygel-renderer-2.8.so'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.8.so'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-core/librygel-core-2.8.so'),
         renderer_sources
     ]
 )
diff --git a/doc/reference/librygel-server/meson.build b/doc/reference/librygel-server/meson.build
index 8b07c599..c8028c89 100644
--- a/doc/reference/librygel-server/meson.build
+++ b/doc/reference/librygel-server/meson.build
@@ -2,10 +2,10 @@ if valadoc.found()
 server_doc_common_args = [
         '--package-name', 'librygel-server',
         '--package-version', '2.8',
-        '-b', join_paths(meson.source_root(), 'src', 'librygel-server'),
-        '--vapidir', join_paths(meson.source_root(), 'vapi'),
-        '--vapidir', join_paths(meson.source_root(), 'src/librygel-core'),
-        '--vapidir', join_paths(meson.build_root(), 'src/librygel-core'),
+        '-b', join_paths(meson.project_source_root(), 'src', 'librygel-server'),
+        '--vapidir', join_paths(meson.project_source_root(), 'vapi'),
+        '--vapidir', join_paths(meson.project_source_root(), 'src/librygel-core'),
+        '--vapidir', join_paths(meson.project_build_root(), 'src/librygel-core'),
         '--pkg', 'rygel-build-config',
         '--force',
         '--directory', '@OUTPUT@',
@@ -44,11 +44,11 @@ gtkdoc_server_target = custom_target('gtkdoc-server',
         valadoc,
         server_doc_common_args,
         '--doclet', 'gtkdoc',
-        '-X', join_paths(meson.build_root(), 'src/librygel-server/rygel-server.h'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-server/rygel-server.h'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-server/librygel-server-2.8.so'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-server/librygel-server-2.8.so'),
         '-X', '-l',
-        '-X', join_paths(meson.build_root(), 'src/librygel-core/librygel-core-2.8.so'),
+        '-X', join_paths(meson.project_build_root(), 'src/librygel-core/librygel-core-2.8.so'),
         server_sources
     ]
 )