rawmidi: add entry header to aggregate header inclusion

It's convenient to add header to include all of headers in regard of
documentation.

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

diff --git a/src/rawmidi/alsarawmidi-enum-types.h b/src/rawmidi/alsarawmidi-enum-types.h
index 7c385b1c6161e4d163aa37e7951613c341f37bdd..6f47d2de8c4ab9b258f55a6513e5f25f66b9639c 100644 (file)
--- a/src/rawmidi/alsarawmidi-enum-types.h
+++ b/src/rawmidi/alsarawmidi-enum-types.h
@@ -2,8 +2,6 @@
 #ifndef __ALSA_GOBJECT_ALSARAWMIDI_ENUM_TYPES__H__
 #define __ALSA_GOBJECT_ALSARAWMIDI_ENUM_TYPES__H__
 
-#include <sound/asound.h>
-
 /**
  * ALSARawmidiStreamDirection:
  * @ALSARAWMIDI_STREAM_DIRECTION_OUTPUT:        Output direction of stream.

diff --git a/src/rawmidi/alsarawmidi.h b/src/rawmidi/alsarawmidi.h
new file mode 100644 (file)
index 0000000..dfe9f1b
--- /dev/null
+++ b/src/rawmidi/alsarawmidi.h
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+#ifndef __ALSA_GOBJECT_ALSARAWMIDI_H__
+#define __ALSA_GOBJECT_ALSARAWMIDI_H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <sound/asound.h>
+
+#include <alsarawmidi-enum-types.h>
+#include <alsarawmidi-enums.h>
+
+#include <substream-info.h>
+#include <substream-params.h>
+#include <substream-status.h>
+
+#include <stream-pair.h>
+
+#include <query.h>
+
+#endif

diff --git a/src/rawmidi/meson.build b/src/rawmidi/meson.build
index 30809a438d275bbd67478efdf0240f4163d2ce72..ae9b9f4f1b389704f114dc7616786c2bd6c25701 100644 (file)
--- a/src/rawmidi/meson.build
+++ b/src/rawmidi/meson.build
@@ -59,7 +59,7 @@ if has_enumerations
     identifier_prefix: namespace,
     install_header: true,
     install_dir: join_paths(get_option('includedir'), inc_dir),
-    header_prefix: '#include <@0@-enum-types.h>'.format(join_paths(path, name)),
+    header_prefix: '#include <alsarawmidi.h>',
   )
 else
   enums = []
@@ -91,7 +91,7 @@ library = library(name,
   dependencies: dependencies,
   link_args : linker_flag,
   link_depends : mapfile_name,
-  include_directories: include_directories('..'),
+  include_directories: include_directories('.'),
 )
 
 install_headers(headers,
@@ -102,7 +102,7 @@ install_headers(headers,
 pkg = import('pkgconfig')
 pkg.generate(library,
   description: 'GObject instrospection library for RawMidi interface in asound.h',
-  subdirs: meson.project_name(),
+  subdirs: inc_dir,
 )
 
 # Generate metadata for gobject introspection.
@@ -118,6 +118,7 @@ gnome.generate_gir(library,
     'GLib-2.0',
     'GObject-2.0',
   ],
+  header: 'alsarawmidi.h',
   install: true,
 )
 

diff --git a/src/rawmidi/privates.h b/src/rawmidi/privates.h
index 394f0d315791b42136f9db37a845725cc4e3d864..8a9a92b201be4007f16ad7832e1cff555f6411f0 100644 (file)
--- a/src/rawmidi/privates.h
+++ b/src/rawmidi/privates.h
@@ -2,16 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSARAWMIDI_PRIVATES__H__
 #define __ALSA_GOBJECT_ALSARAWMIDI_PRIVATES__H__
 
-#include <string.h>
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include "substream-info.h"
-#include "substream-params.h"
-#include "substream-status.h"
-
-#include <sound/asound.h>
+#include "alsarawmidi.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/rawmidi/query.c b/src/rawmidi/query.c
index 11a9f2e6321b65411a855fd16101665558f31df9..0d3d683d6f8f8b5f10414494b3424d5b82a73ce2 100644 (file)
--- a/src/rawmidi/query.c
+++ b/src/rawmidi/query.c
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "query.h"
 #include "privates.h"
 
 #include <stdio.h>

diff --git a/src/rawmidi/query.h b/src/rawmidi/query.h
index 41d948e144ce241577606cee6793fc3d670ab7cf..a6888335cd3ab88e7d8027395e84441224655e8a 100644 (file)
--- a/src/rawmidi/query.h
+++ b/src/rawmidi/query.h
@@ -2,11 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSARAWMIDI_QUERY__H__
 #define __ALSA_GOBJECT_ALSARAWMIDI_QUERY__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <rawmidi/alsarawmidi-enums.h>
-#include <rawmidi/substream-info.h>
+#include <alsarawmidi.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/rawmidi/stream-pair.c b/src/rawmidi/stream-pair.c
index 44cf68aeb43dbf511edc6696f4c5d277da0ae56c..744d3ae411473df73be0dca1bb06662b9c3d96a2 100644 (file)
--- a/src/rawmidi/stream-pair.c
+++ b/src/rawmidi/stream-pair.c
@@ -1,6 +1,4 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "stream-pair.h"
-#include "query.h"
 #include "privates.h"
 
 #include <errno.h>

diff --git a/src/rawmidi/stream-pair.h b/src/rawmidi/stream-pair.h
index eb3186e147a02f76e17260ded1df292b4de6a5b7..f16174f10f343d0dfcf12291f752bf6d2977ac29 100644 (file)
--- a/src/rawmidi/stream-pair.h
+++ b/src/rawmidi/stream-pair.h
@@ -2,13 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSARAWMIDI_STREAM_PAIR__H__
 #define __ALSA_GOBJECT_ALSARAWMIDI_STREAM_PAIR__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <rawmidi/alsarawmidi-enums.h>
-#include <rawmidi/substream-info.h>
-#include <rawmidi/substream-params.h>
-#include <rawmidi/substream-status.h>
+#include <alsarawmidi.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/rawmidi/substream-info.h b/src/rawmidi/substream-info.h
index fcab03465bd5c9f3ca4d1a1d5f5c02e429fc410a..bc17c0b4f98d7c9d91be81a83896101ff59b2d0f 100644 (file)
--- a/src/rawmidi/substream-info.h
+++ b/src/rawmidi/substream-info.h
@@ -2,10 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSARAWMIDI_SUBSTREAM_INFO__H__
 #define __ALSA_GOBJECT_ALSARAWMIDI_SUBSTREAM_INFO__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <rawmidi/alsarawmidi-enums.h>
+#include <alsarawmidi.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/rawmidi/substream-params.h b/src/rawmidi/substream-params.h
index 1c662a3ac16bc990eb6704ef0ed6b0ab44dd1634..b1390795bc39a4f5c448bead475b39051af80aab 100644 (file)
--- a/src/rawmidi/substream-params.h
+++ b/src/rawmidi/substream-params.h
@@ -2,8 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSARAWMIDI_SUBSTREAM_PARAMS__H__
 #define __ALSA_GOBJECT_ALSARAWMIDI_SUBSTREAM_PARAMS__H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <alsarawmidi.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/rawmidi/substream-status.h b/src/rawmidi/substream-status.h
index f1af9b5302da6a88e05a6d4fddb7b753ef6273b9..73ed1b6299b7acee3a69563fe5971f2bd427d41b 100644 (file)
--- a/src/rawmidi/substream-status.h
+++ b/src/rawmidi/substream-status.h
@@ -2,8 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSARAWMIDI_SUBSTREAM_STATUS__H__
 #define __ALSA_GOBJECT_ALSARAWMIDI_SUBSTREAM_STATUS__H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <alsarawmidi.h>
 
 G_BEGIN_DECLS