From 25372d78670c16ebf2c9ab06087cf2bdab278faf Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Wed, 16 Mar 2022 09:03:48 +0900 Subject: [PATCH] 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 --- src/rawmidi/alsarawmidi-enum-types.h | 2 -- src/rawmidi/alsarawmidi.h | 21 +++++++++++++++++++++ src/rawmidi/meson.build | 7 ++++--- src/rawmidi/privates.h | 11 +---------- src/rawmidi/query.c | 1 - src/rawmidi/query.h | 6 +----- src/rawmidi/stream-pair.c | 2 -- src/rawmidi/stream-pair.h | 8 +------- src/rawmidi/substream-info.h | 5 +---- src/rawmidi/substream-params.h | 3 +-- src/rawmidi/substream-status.h | 3 +-- 11 files changed, 31 insertions(+), 38 deletions(-) create mode 100644 src/rawmidi/alsarawmidi.h diff --git a/src/rawmidi/alsarawmidi-enum-types.h b/src/rawmidi/alsarawmidi-enum-types.h index 7c385b1..6f47d2d 100644 --- 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 - /** * 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 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 +#include + +#include + +#include +#include + +#include +#include +#include + +#include + +#include + +#endif diff --git a/src/rawmidi/meson.build b/src/rawmidi/meson.build index 30809a4..ae9b9f4 100644 --- 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 ', ) 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 394f0d3..8a9a92b 100644 --- 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 - -#include -#include - -#include "substream-info.h" -#include "substream-params.h" -#include "substream-status.h" - -#include +#include "alsarawmidi.h" G_BEGIN_DECLS diff --git a/src/rawmidi/query.c b/src/rawmidi/query.c index 11a9f2e..0d3d683 100644 --- 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 diff --git a/src/rawmidi/query.h b/src/rawmidi/query.h index 41d948e..a688833 100644 --- 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 -#include - -#include -#include +#include G_BEGIN_DECLS diff --git a/src/rawmidi/stream-pair.c b/src/rawmidi/stream-pair.c index 44cf68a..744d3ae 100644 --- 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 diff --git a/src/rawmidi/stream-pair.h b/src/rawmidi/stream-pair.h index eb3186e..f16174f 100644 --- 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 -#include - -#include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/src/rawmidi/substream-info.h b/src/rawmidi/substream-info.h index fcab034..bc17c0b 100644 --- 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 -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/rawmidi/substream-params.h b/src/rawmidi/substream-params.h index 1c662a3..b139079 100644 --- 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 -#include +#include G_BEGIN_DECLS diff --git a/src/rawmidi/substream-status.h b/src/rawmidi/substream-status.h index f1af9b5..73ed1b6 100644 --- 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 -#include +#include G_BEGIN_DECLS -- 2.47.3