meson: aggregate and move extra gir to metadata part

This commit refactors duplicated entries for depended gir name to reduce
difference of each meson configuration.

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

diff --git a/src/ctl/meson.build b/src/ctl/meson.build
index e050c01c26ab1117fbe869987e056692fa6fde0b..0e86b22d443c1d12383240ef9aded5fd97546e61 100644 (file)
--- a/src/ctl/meson.build
+++ b/src/ctl/meson.build
@@ -38,6 +38,8 @@ dependencies = [
 
 pc_desc = 'GObject instrospection library for control interface in asound.h'
 
+gir_includes = common_gir_includes
+
 # For test.
 build_dirs += {'alsactl': meson.current_build_dir()}
 
@@ -111,10 +113,7 @@ alsactl_gir = gnome.generate_gir(library,
   identifier_prefix: namespace,
   export_packages: name,
   dependencies: dependencies,
-  includes: [
-    'GLib-2.0',
-    'GObject-2.0',
-  ],
+  includes: gir_includes,
   header: 'alsactl.h',
   install: true,
 )

diff --git a/src/hwdep/meson.build b/src/hwdep/meson.build
index 9f80be91868b721d843434331496c2f42ca65f52..45941a23d617cc0e357761c6c2521c8c07ecfa15 100644 (file)
--- a/src/hwdep/meson.build
+++ b/src/hwdep/meson.build
@@ -30,6 +30,8 @@ dependencies = [
 
 pc_desc = 'GObject instrospection library for HwDep interface in asound.h'
 
+gir_includes = common_gir_includes
+
 # For test.
 build_dirs += {'alsahwdep': meson.current_build_dir()}
 
@@ -103,10 +105,7 @@ alsahwdep_gir = gnome.generate_gir(library,
   identifier_prefix: namespace,
   export_packages: name,
   dependencies: dependencies,
-  includes: [
-    'GLib-2.0',
-    'GObject-2.0',
-  ],
+  includes: gir_includes,
   header: 'alsahwdep.h',
   install: true,
 )

diff --git a/src/meson.build b/src/meson.build
index b76e5f553a9fb16de5a7058cab9f6ad346d8c028..d6f8ab20efd6d5e8cce0706c3106547c3a44e5c7 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -8,6 +8,11 @@ libudev_dependency = dependency('libudev')
 gnome = import('gnome')
 pkg = import('pkgconfig')
 
+common_gir_includes = [
+    'GLib-2.0',
+    'GObject-2.0',
+]
+
 build_dirs = {}
 
 subdir('ctl')

diff --git a/src/rawmidi/meson.build b/src/rawmidi/meson.build
index 70b445b9e0912bf3bd66ff91528d68436ea38a8d..69d4d82fb6171dc58a43f7b3029705c372daceac 100644 (file)
--- a/src/rawmidi/meson.build
+++ b/src/rawmidi/meson.build
@@ -35,6 +35,8 @@ dependencies = [
 
 pc_desc = 'GObject instrospection library for RawMidi interface in asound.h'
 
+gir_includes = common_gir_includes
+
 # For test.
 build_dirs += {'alsarawmidi': meson.current_build_dir()}
 
@@ -108,10 +110,7 @@ alsarawmidi_gir = gnome.generate_gir(library,
   identifier_prefix: namespace,
   export_packages: name,
   dependencies: dependencies,
-  includes: [
-    'GLib-2.0',
-    'GObject-2.0',
-  ],
+  includes: gir_includes,
   header: 'alsarawmidi.h',
   install: true,
 )

diff --git a/src/seq/meson.build b/src/seq/meson.build
index e98a071cb56c850ed18df662a9b80ed787e2859d..e5402db958a80a23b3c1a52e9ceaf0146262655e 100644 (file)
--- a/src/seq/meson.build
+++ b/src/seq/meson.build
@@ -69,6 +69,8 @@ dependencies = [
 
 pc_desc = 'GObject instrospection library for sequencer interface in asequencer.h'
 
+gir_includes = [common_gir_includes, alsatimer_gir[0]]
+
 # For test.
 build_dirs += {'alsaseq': meson.current_build_dir()}
 
@@ -142,11 +144,7 @@ alsaseq_gir = gnome.generate_gir(library,
   identifier_prefix: namespace,
   export_packages: name,
   dependencies: dependencies,
-  includes: [
-    'GLib-2.0',
-    'GObject-2.0',
-    alsatimer_gir[0],
-  ],
+  includes: gir_includes,
   header: 'alsaseq.h',
   install: true,
 )

diff --git a/src/timer/meson.build b/src/timer/meson.build
index c033619f1ec6353e2c2be6f0d0f6ef3d3dbfb47a..0c60f2e2b12691912f1670414c09a39a8be2f164 100644 (file)
--- a/src/timer/meson.build
+++ b/src/timer/meson.build
@@ -50,6 +50,8 @@ dependencies = [
 
 pc_desc = 'GObject instrospection library for timer interface in asound.h'
 
+gir_includes = common_gir_includes
+
 # For test.
 build_dirs += {'alsatimer': meson.current_build_dir()}
 
@@ -123,10 +125,7 @@ alsatimer_gir = gnome.generate_gir(library,
   identifier_prefix: namespace,
   export_packages: name,
   dependencies: dependencies,
-  includes: [
-    'GLib-2.0',
-    'GObject-2.0',
-  ],
+  includes: gir_includes,
   header: 'alsatimer.h',
   install: true,
 )