From 199c784ea7f23f6db9d8dfb5c086e399c9f9d9b5 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Thu, 31 Mar 2022 11:04:40 +0900 Subject: [PATCH] meson: aggregate module imports This commit refactors to unify common module imports. Signed-off-by: Takashi Sakamoto --- meson.build | 2 -- src/ctl/meson.build | 1 - src/hwdep/meson.build | 1 - src/meson.build | 3 +++ src/rawmidi/meson.build | 1 - src/seq/meson.build | 1 - src/timer/meson.build | 1 - 7 files changed, 3 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index f1ed032..4d4eff8 100644 --- 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 c98251f..c65c55e 100644 --- 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 ff75a50..75d0b56 100644 --- 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 10d907b..b76e5f5 100644 --- 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 d5e3c9c..08b8ba4 100644 --- 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 a5d04cf..2ead5ee 100644 --- 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 b287e53..e097bdd 100644 --- 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, -- 2.47.3