meson: obsolete usage of deprecated meson.build_dir()

Meson build v0.56 deprecates meson.build_root(). This commit adds
alternative variable for the path to built stuffs.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/meson.build b/meson.build
index 27fc45aa85a509327b9162dc04d48081181429f3..db6316ffc54fc804d797e88b943ab34f7278e397 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('alsa-gobject', 'c',
   version: '0.2.2',
   license: 'LGPL-3',
-  meson_version: '>= 0.47.0',
+  meson_version: '>= 0.48.0',
 )
 
 gnome = import('gnome')

diff --git a/src/ctl/meson.build b/src/ctl/meson.build
index 4a7606fa691993255930bf23948d5a93a42bc9ce..5bafe574e4f7a996c27564d5fb7c2c14cfb3c634 100644 (file)
--- a/src/ctl/meson.build
+++ b/src/ctl/meson.build
@@ -30,6 +30,9 @@ privates = files(
   'privates.h',
 )
 
+# For test.
+build_dirs += {'alsactl': meson.current_build_dir()}
+
 #
 # Common part except for identifier of dependency.
 #

diff --git a/src/hwdep/meson.build b/src/hwdep/meson.build
index 582b1a20e02b4bc440bd1007ac54d43ba1972e0e..38aa2d025d279534d792baa35164e89adfc62431 100644 (file)
--- a/src/hwdep/meson.build
+++ b/src/hwdep/meson.build
@@ -22,6 +22,9 @@ privates = files(
     'privates.h',
 )
 
+# For test.
+build_dirs += {'alsahwdep': meson.current_build_dir()}
+
 #
 # Common part except for identifier of dependency.
 #

diff --git a/src/meson.build b/src/meson.build
index 923de85115245048b5d7fb89fe44680ab0269e66..ae1e7a012b950e28965ae07149a1b0d2ee32f887 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,3 +1,5 @@
+build_dirs = {}
+
 subdir('ctl')
 subdir('timer')
 subdir('seq')

diff --git a/src/rawmidi/meson.build b/src/rawmidi/meson.build
index 878b6b2bfe9d5731b96b8b543b5dc3e7ab9ab1f1..3d45f7fc2b6264bfd1219493298db98395ed3b74 100644 (file)
--- a/src/rawmidi/meson.build
+++ b/src/rawmidi/meson.build
@@ -28,6 +28,9 @@ privates = files(
   'privates.h',
 )
 
+# For test.
+build_dirs += {'alsarawmidi': meson.current_build_dir()}
+
 #
 # Common part except for identifier of dependency.
 #

diff --git a/src/seq/meson.build b/src/seq/meson.build
index e0777a7091902ee5fa631ea5a74d6c8e52318769..0407f6c6d9a1779039a826b76b36c8ff6b2a7a17 100644 (file)
--- a/src/seq/meson.build
+++ b/src/seq/meson.build
@@ -60,6 +60,9 @@ privates = files(
   'privates.h',
 )
 
+# For test.
+build_dirs += {'alsaseq': meson.current_build_dir()}
+
 #
 # Common part except for identifier of dependency.
 #

diff --git a/src/timer/meson.build b/src/timer/meson.build
index 984bf194b14bec94ef67f9b9903ddee53db38f00..7de7b2441d03e5137f3572f5401bafd7994f85fa 100644 (file)
--- a/src/timer/meson.build
+++ b/src/timer/meson.build
@@ -42,6 +42,9 @@ privates = files(
   'privates.h',
 )
 
+# For test.
+build_dirs += {'alsatimer': meson.current_build_dir()}
+
 #
 # Common part except for identifier of dependency.
 #

diff --git a/tests/meson.build b/tests/meson.build
index 89b1baf111b8a0a9566dba0a345916493db66401..d667395ade8186668553835f15d3946a706c03c9 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -47,8 +47,8 @@ tests = {
 }
 
 dir_paths = []
-foreach path, scripts: tests
-  dir_paths += join_paths(meson.build_root(), 'src', path)
+foreach name, build_dir: build_dirs
+  dir_paths += join_paths(build_dir)
 endforeach
 
 env = environment()