meson: aggregate module imports

This commit refactors to unify common module imports.

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

diff --git a/meson.build b/meson.build
index f1ed032e5567100fa8c83eff3b9202f50868e37c..4d4eff8aedd803c7f1d99415db7d5c1769d2f677 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -4,8 +4,6 @@ project('alsa-gobject', 'c',
   meson_version: '>= 0.48.0',
 )
 
-gnome = import('gnome')
-
 subdir('src')
 subdir('tests')
 

diff --git a/src/ctl/meson.build b/src/ctl/meson.build
index c98251fdb8a0ed00b1091dd5da341c51d179448d..c65c55e63986cb197366a0184d2c824f03a5c4cf 100644 (file)
--- a/src/ctl/meson.build
+++ b/src/ctl/meson.build
@@ -95,7 +95,6 @@ install_headers(headers,
 )
 
 # Generate pkg-config file for development.
-pkg = import('pkgconfig')
 pkg.generate(library,
   description: 'GObject instrospection library for control interface in asound.h',
   subdirs: inc_dir,

diff --git a/src/hwdep/meson.build b/src/hwdep/meson.build
index ff75a5050e775b476fa05c91e367f2d29c68d482..75d0b56f8f82b55e3776bbd10f1930393d6a26fe 100644 (file)
--- a/src/hwdep/meson.build
+++ b/src/hwdep/meson.build
@@ -87,7 +87,6 @@ install_headers(headers,
 )
 
 # Generate pkg-config file for development.
-pkg = import('pkgconfig')
 pkg.generate(library,
   description: 'GObject instrospection library for HwDep interface in asound.h',
   subdirs: inc_dir,

diff --git a/src/meson.build b/src/meson.build
index 10d907b88db636404595e51cd2c0109af000dd2d..b76e5f553a9fb16de5a7058cab9f6ad346d8c028 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -5,6 +5,9 @@ gobject_dependency = dependency('gobject-2.0',
 
 libudev_dependency = dependency('libudev')
 
+gnome = import('gnome')
+pkg = import('pkgconfig')
+
 build_dirs = {}
 
 subdir('ctl')

diff --git a/src/rawmidi/meson.build b/src/rawmidi/meson.build
index d5e3c9ccd7c3dceb5c4c1e47bbd9afce219abebc..08b8ba40d716333dc2d3e0f540f6c70e22ec4d91 100644 (file)
--- a/src/rawmidi/meson.build
+++ b/src/rawmidi/meson.build
@@ -92,7 +92,6 @@ install_headers(headers,
 )
 
 # Generate pkg-config file for development.
-pkg = import('pkgconfig')
 pkg.generate(library,
   description: 'GObject instrospection library for RawMidi interface in asound.h',
   subdirs: inc_dir,

diff --git a/src/seq/meson.build b/src/seq/meson.build
index a5d04cf2f29d80518ef26bfc8c44480bd0e3d2ec..2ead5ee414d354bac2e550c55899bdd2bfdc938a 100644 (file)
--- a/src/seq/meson.build
+++ b/src/seq/meson.build
@@ -126,7 +126,6 @@ install_headers(headers,
 )
 
 # Generate pkg-config file for development.
-pkg = import('pkgconfig')
 pkg.generate(library,
   description: 'GObject instrospection library for sequencer interface in asequencer.h',
   subdirs: inc_dir,

diff --git a/src/timer/meson.build b/src/timer/meson.build
index b287e53698a2e20ddbb2fe7e02de7bbd64105773..e097bdd71594e26b8225d4ea10f2c55df29066d0 100644 (file)
--- a/src/timer/meson.build
+++ b/src/timer/meson.build
@@ -107,7 +107,6 @@ install_headers(headers,
 )
 
 # Generate pkg-config file for development.
-pkg = import('pkgconfig')
 pkg.generate(library,
   description: 'GObject instrospection library for timer interface in asound.h',
   subdirs: inc_dir,