From 4913f08760d29073ff9a535175def47a243643d0 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Wed, 16 Mar 2022 09:03:48 +0900 Subject: [PATCH] ctl: 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/ctl/alsactl-enum-types.h | 2 -- src/ctl/alsactl.h | 24 ++++++++++++++++++++++++ src/ctl/card-info.h | 3 +-- src/ctl/card.c | 2 -- src/ctl/card.h | 10 +--------- src/ctl/elem-id.h | 7 +------ src/ctl/elem-info.h | 7 +------ src/ctl/elem-value.h | 5 +---- src/ctl/meson.build | 8 +++++--- src/ctl/privates.h | 12 +----------- src/ctl/query.c | 1 - src/ctl/query.h | 3 +-- 12 files changed, 36 insertions(+), 48 deletions(-) create mode 100644 src/ctl/alsactl.h diff --git a/src/ctl/alsactl-enum-types.h b/src/ctl/alsactl-enum-types.h index 794bd74..5f2c354 100644 --- a/src/ctl/alsactl-enum-types.h +++ b/src/ctl/alsactl-enum-types.h @@ -2,8 +2,6 @@ #ifndef __ALSA_GOBJECT_ALSACTL_ENUM_TYPES__H__ #define __ALSA_GOBJECT_ALSACTL_ENUM_TYPES__H__ -#include - /** * ALSACtlElemType: * @ALSACTL_ELEM_TYPE_NONE: Unudentified type. diff --git a/src/ctl/alsactl.h b/src/ctl/alsactl.h new file mode 100644 index 0000000..b537978 --- /dev/null +++ b/src/ctl/alsactl.h @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +#ifndef __ALSA_GOBJECT_ALSACTL_H__ +#define __ALSA_GOBJECT_ALSACTL_H__ + +#include +#include + +#include + +#include + +#include +#include + +#include + +#include +#include +#include +#include + +#include + +#endif diff --git a/src/ctl/card-info.h b/src/ctl/card-info.h index 4bd800e..dcc8012 100644 --- a/src/ctl/card-info.h +++ b/src/ctl/card-info.h @@ -2,8 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSACTL_CARD_INFO__H__ #define __ALSA_GOBJECT_ALSACTL_CARD_INFO__H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/src/ctl/card.c b/src/ctl/card.c index cbd6e2b..d42e58d 100644 --- a/src/ctl/card.c +++ b/src/ctl/card.c @@ -1,6 +1,4 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "card.h" -#include "query.h" #include "privates.h" #include diff --git a/src/ctl/card.h b/src/ctl/card.h index 93fb010..801558f 100644 --- a/src/ctl/card.h +++ b/src/ctl/card.h @@ -2,15 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSACTL_CARD__H__ #define __ALSA_GOBJECT_ALSACTL_CARD__H__ -#include -#include - -#include -#include -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/ctl/elem-id.h b/src/ctl/elem-id.h index b20f581..0eff970 100644 --- a/src/ctl/elem-id.h +++ b/src/ctl/elem-id.h @@ -2,12 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSACTL_ELEM_ID__H__ #define __ALSA_GOBJECT_ALSACTL_ELEM_ID__H__ -#include -#include - -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/ctl/elem-info.h b/src/ctl/elem-info.h index 9fd57ed..1e67db4 100644 --- a/src/ctl/elem-info.h +++ b/src/ctl/elem-info.h @@ -2,12 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSACTL_ELEM_INFO__H__ #define __ALSA_GOBJECT_ALSACTL_ELEM_INFO__H__ -#include -#include - -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/ctl/elem-value.h b/src/ctl/elem-value.h index 5e554ed..1f812e0 100644 --- a/src/ctl/elem-value.h +++ b/src/ctl/elem-value.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSACTL_ELEM_VALUE__H__ #define __ALSA_GOBJECT_ALSACTL_ELEM_VALUE__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/ctl/meson.build b/src/ctl/meson.build index f98d7dd..e4fdc49 100644 --- a/src/ctl/meson.build +++ b/src/ctl/meson.build @@ -18,6 +18,7 @@ sources = files( ) headers = files( + 'alsactl.h', 'query.h', 'card.h', 'card-info.h', @@ -61,7 +62,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 = [] @@ -93,7 +94,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, @@ -104,7 +105,7 @@ install_headers(headers, pkg = import('pkgconfig') pkg.generate(library, description: 'GObject instrospection library for control interface in asound.h', - subdirs: meson.project_name(), + subdirs: inc_dir, ) # Generate metadata for gobject introspection. @@ -120,6 +121,7 @@ gnome.generate_gir(library, 'GLib-2.0', 'GObject-2.0', ], + header: 'alsactl.h', install: true, ) diff --git a/src/ctl/privates.h b/src/ctl/privates.h index 3ff6149..7250bf4 100644 --- a/src/ctl/privates.h +++ b/src/ctl/privates.h @@ -2,17 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSACTL_PRIVATES__H__ #define __ALSA_GOBJECT_ALSACTL_PRIVATES__H__ -#include - -#include -#include - -#include "card-info.h" -#include "elem-id.h" -#include "elem-info.h" -#include "elem-value.h" - -#include +#include "alsactl.h" G_BEGIN_DECLS diff --git a/src/ctl/query.c b/src/ctl/query.c index 1430643..560cf60 100644 --- a/src/ctl/query.c +++ b/src/ctl/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/ctl/query.h b/src/ctl/query.h index d9d3c72..0f1faf0 100644 --- a/src/ctl/query.h +++ b/src/ctl/query.h @@ -2,8 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSACTL_QUERY__H__ #define __ALSA_GOBJECT_ALSACTL_QUERY__H__ -#include -#include +#include G_BEGIN_DECLS -- 2.47.3