From: Takashi Sakamoto Date: Thu, 31 Mar 2022 02:04:40 +0000 (+0900) Subject: meson: aggregate dependency declaration on glib/gobject and libudev X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=743e5c7f414ca31eef491f8af19b0ed079649afd;p=alsa-gobject.git 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 --- diff --git a/src/ctl/meson.build b/src/ctl/meson.build index baa7cd7..c98251f 100644 --- 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 fd214ba..ff75a50 100644 --- 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 ae1e7a0..10d907b 100644 --- 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 8d0682a..d5e3c9c 100644 --- 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 2ac2860..a5d04cf 100644 --- 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 7260c91..b287e53 100644 --- 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.