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 <o-takashi@sakamocchi.jp>

diff --git a/src/ctl/alsactl-enum-types.h b/src/ctl/alsactl-enum-types.h
index 794bd746ec9cebb72f36cd10a319b23be8479a26..5f2c35438ae05d15efdcad6a8a4338b2b7b28044 100644 (file)
--- 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 <sound/asound.h>
-
 /**
  * ALSACtlElemType:
  * @ALSACTL_ELEM_TYPE_NONE:         Unudentified type.

diff --git a/src/ctl/alsactl.h b/src/ctl/alsactl.h
new file mode 100644 (file)
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 <glib.h>
+#include <glib-object.h>
+
+#include <sound/asound.h>
+
+#include <alsactl-sigs-marshal.h>
+
+#include <alsactl-enum-types.h>
+#include <alsactl-enums.h>
+
+#include <elem-id.h>
+
+#include <card-info.h>
+#include <elem-info.h>
+#include <elem-value.h>
+#include <card.h>
+
+#include <query.h>
+
+#endif

diff --git a/src/ctl/card-info.h b/src/ctl/card-info.h
index 4bd800ecedcf700a9d9eb2f6c0933ecb4680b29d..dcc80127991425ee832271f7b78ad220384fd950 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
+#include <alsactl.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/ctl/card.c b/src/ctl/card.c
index cbd6e2bd9b95635149c415a8fea031ccde0ea35d..d42e58d17a9666a0f4aa43ed99eaa2eaa7a35b17 100644 (file)
--- 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 <sys/types.h>

diff --git a/src/ctl/card.h b/src/ctl/card.h
index 93fb01011e4928c35db8d21bf89fdee4f99c1878..801558f912d72b1e39cf5c547ee3ba7021a08a51 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <ctl/card-info.h>
-#include <ctl/elem-id.h>
-#include <ctl/elem-info.h>
-#include <ctl/elem-value.h>
-
-#include <ctl/alsactl-sigs-marshal.h>
+#include <alsactl.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/ctl/elem-id.h b/src/ctl/elem-id.h
index b20f5819421880b497e7c0d0ebea2a274acea54b..0eff970900b2eb8d48553a355bae3264feaf55b3 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <ctl/alsactl-enums.h>
-
-#include <sound/asound.h>
+#include <alsactl.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/ctl/elem-info.h b/src/ctl/elem-info.h
index 9fd57edcf9d1139c3363cbf76fdaa96ffa10e19b..1e67db46e7c145caa3838407491320f6a8f7771c 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <ctl/elem-id.h>
-
-#include <ctl/alsactl-enums.h>
+#include <alsactl.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/ctl/elem-value.h b/src/ctl/elem-value.h
index 5e554edd57980f59b0f3ac5b4a30ef7b4d435ea1..1f812e01b9fa5b25d9212623ace8890a57d23ade 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <ctl/elem-id.h>
+#include <alsactl.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/ctl/meson.build b/src/ctl/meson.build
index f98d7dd7b57a65f44b89a93f24f9e425d6b6b82a..e4fdc4901ef653805bdeab9947414b4c2ed438b8 100644 (file)
--- 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 <alsactl.h>',
   )
 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 3ff6149ab06773fdb4afde9aedae493bdff9b589..7250bf4a4ee6de7b8bf9b26b12ddaf48bc351b80 100644 (file)
--- 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 <string.h>
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include "card-info.h"
-#include "elem-id.h"
-#include "elem-info.h"
-#include "elem-value.h"
-
-#include <sound/asound.h>
+#include "alsactl.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/ctl/query.c b/src/ctl/query.c
index 1430643d3bdcb7e831852ae9b8566b395fa59611..560cf609f24c30673e1d780d92548ccba0030f6c 100644 (file)
--- 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 <string.h>

diff --git a/src/ctl/query.h b/src/ctl/query.h
index d9d3c72d98acc9ea8762d0229ae620539280cdaa..0f1faf0c9f6a0c8fe5176f00c0248e0ca22debcd 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
+#include <alsactl.h>
 
 G_BEGIN_DECLS