meson: aggregate dependency declaration on glib/gobject and libudev

All of included libraries depend on glib, gobject, and libudev. It's
possible to aggregate declaration of the dependency.

This commit refactors according to it.

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

diff --git a/src/ctl/meson.build b/src/ctl/meson.build
index baa7cd75052b9d5ebb28efe8a1f60fce30e75045..c98251fdb8a0ed00b1091dd5da341c51d179448d 100644 (file)
--- a/src/ctl/meson.build
+++ b/src/ctl/meson.build
@@ -31,6 +31,11 @@ privates = files(
   'privates.h',
 )
 
+dependencies = [
+  gobject_dependency,
+  libudev_dependency,
+]
+
 # For test.
 build_dirs += {'alsactl': meson.current_build_dir()}
 
@@ -38,18 +43,6 @@ build_dirs += {'alsactl': meson.current_build_dir()}
 # Common part except for identifier of dependency.
 #
 
-# Depends on glib-2.0 and gobject-2.0
-gobject = dependency('gobject-2.0',
-  version: '>=2.34.0'
-)
-
-libudev = dependency('libudev')
-
-dependencies = [
-  gobject,
-  libudev,
-]
-
 inc_dir = join_paths(meson.project_name(), path)
 
 # Generate enumerations for GObject fashion.

diff --git a/src/hwdep/meson.build b/src/hwdep/meson.build
index fd214ba96712c66d7c11624ff5a2599dad047bb6..ff75a5050e775b476fa05c91e367f2d29c68d482 100644 (file)
--- a/src/hwdep/meson.build
+++ b/src/hwdep/meson.build
@@ -23,6 +23,11 @@ privates = files(
   'privates.h',
 )
 
+dependencies = [
+  gobject_dependency,
+  libudev_dependency,
+]
+
 # For test.
 build_dirs += {'alsahwdep': meson.current_build_dir()}
 
@@ -30,18 +35,6 @@ build_dirs += {'alsahwdep': meson.current_build_dir()}
 # Common part except for identifier of dependency.
 #
 
-# Depends on glib-2.0 and gobject-2.0
-gobject = dependency('gobject-2.0',
-  version: '>=2.34.0'
-)
-
-libudev = dependency('libudev')
-
-dependencies = [
-  gobject,
-  libudev,
-]
-
 inc_dir = join_paths(meson.project_name(), path)
 
 # Generate enumerations for GObject fashion.

diff --git a/src/meson.build b/src/meson.build
index ae1e7a012b950e28965ae07149a1b0d2ee32f887..10d907b88db636404595e51cd2c0109af000dd2d 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,3 +1,10 @@
+# Depends on glib-2.0 and gobject-2.0
+gobject_dependency = dependency('gobject-2.0',
+  version: '>=2.34.0'
+)
+
+libudev_dependency = dependency('libudev')
+
 build_dirs = {}
 
 subdir('ctl')

diff --git a/src/rawmidi/meson.build b/src/rawmidi/meson.build
index 8d0682ad01b1bd5965ec10501ec1a429e4ac51da..d5e3c9ccd7c3dceb5c4c1e47bbd9afce219abebc 100644 (file)
--- a/src/rawmidi/meson.build
+++ b/src/rawmidi/meson.build
@@ -28,6 +28,11 @@ privates = files(
   'privates.h',
 )
 
+dependencies = [
+  gobject_dependency,
+  libudev_dependency,
+]
+
 # For test.
 build_dirs += {'alsarawmidi': meson.current_build_dir()}
 
@@ -35,18 +40,6 @@ build_dirs += {'alsarawmidi': meson.current_build_dir()}
 # Common part except for identifier of dependency.
 #
 
-# Depends on glib-2.0 and gobject-2.0
-gobject = dependency('gobject-2.0',
-  version: '>=2.34.0'
-)
-
-libudev = dependency('libudev')
-
-dependencies = [
-  gobject,
-  libudev,
-]
-
 inc_dir = join_paths(meson.project_name(), path)
 
 # Generate enumerations for GObject fashion.

diff --git a/src/seq/meson.build b/src/seq/meson.build
index 2ac2860ba67b485771b68580850c77b798167d73..a5d04cf2f29d80518ef26bfc8c44480bd0e3d2ec 100644 (file)
--- a/src/seq/meson.build
+++ b/src/seq/meson.build
@@ -61,6 +61,12 @@ privates = files(
   'privates.h',
 )
 
+dependencies = [
+  gobject_dependency,
+  libudev_dependency,
+  alsatimer_dependency,
+]
+
 # For test.
 build_dirs += {'alsaseq': meson.current_build_dir()}
 
@@ -68,19 +74,6 @@ build_dirs += {'alsaseq': meson.current_build_dir()}
 # Common part except for identifier of dependency.
 #
 
-# Depends on glib-2.0 and gobject-2.0
-gobject = dependency('gobject-2.0',
-  version: '>=2.34.0'
-)
-
-libudev = dependency('libudev')
-
-dependencies = [
-  gobject,
-  libudev,
-  alsatimer_dependency,
-]
-
 inc_dir = join_paths(meson.project_name(), path)
 
 # Generate enumerations for GObject fashion.

diff --git a/src/timer/meson.build b/src/timer/meson.build
index 7260c9170b31a2d7bc8615773e72c975c73131e1..b287e53698a2e20ddbb2fe7e02de7bbd64105773 100644 (file)
--- a/src/timer/meson.build
+++ b/src/timer/meson.build
@@ -43,6 +43,11 @@ privates = files(
   'privates.h',
 )
 
+dependencies = [
+  gobject_dependency,
+  libudev_dependency,
+]
+
 # For test.
 build_dirs += {'alsatimer': meson.current_build_dir()}
 
@@ -50,18 +55,6 @@ build_dirs += {'alsatimer': meson.current_build_dir()}
 # Common part except for identifier of dependency.
 #
 
-# Depends on glib-2.0 and gobject-2.0
-gobject = dependency('gobject-2.0',
-  version: '>=2.34.0'
-)
-
-libudev = dependency('libudev')
-
-dependencies = [
-  gobject,
-  libudev,
-]
-
 inc_dir = join_paths(meson.project_name(), path)
 
 # Generate enumerations for GObject fashion.