[json-glib] Ensure that introspection scans all the headers



commit 4641cad9c3c9a26a1cb22d8517b971747b0271b6
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Mar 13 15:33:52 2017 +0000

    Ensure that introspection scans all the headers
    
    We have a couple of generated header files, which means we need to list
    them as sources for the introspection scanner.

 json-glib/meson.build |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/json-glib/meson.build b/json-glib/meson.build
index 747bf8b..d110f20 100644
--- a/json-glib/meson.build
+++ b/json-glib/meson.build
@@ -6,7 +6,6 @@ configure_file(output: 'config.h', configuration: cdata)
 source_h = [
   'json-builder.h',
   'json-generator.h',
-  'json-glib.h',
   'json-gobject.h',
   'json-gvariant.h',
   'json-parser.h',
@@ -55,7 +54,7 @@ json_version_h = configure_file(input: 'json-version.h.in',
                                 install: true,
                                 configuration: version_data)
 
-install_headers(source_h, subdir: install_header_subdir)
+install_headers(source_h + [ 'json-glib.h', ], subdir: install_header_subdir)
 
 json_c_args = [
   '-DJSON_COMPILATION',
@@ -94,9 +93,13 @@ pkgg.generate(libraries: [ json_lib ],
               description: 'JSON Parser for GLib.',
               requires: 'glib-2.0 gio-2.0')
 
+# Generated headers, used to declare the dependency for internal
+# targets
+json_gen_headers = [ json_version_h, json_glib_enums.get(1), ]
+
 if build_gir
     gnome.generate_gir(json_lib,
-                       sources: source_c + source_h,
+                       sources: source_c + source_h + json_glib_enums + [ json_version_h ],
                        namespace: 'Json',
                        nsversion: apiversion,
                        identifier_prefix: 'Json',
@@ -107,9 +110,6 @@ if build_gir
                        extra_args: ['-DJSON_COMPILATION'])
 endif
 
-# Generated headers, used to declare the dependency for internal
-# targets
-json_gen_headers = [ json_version_h, json_glib_enums.get(1), ]
 json_glib_dep = declare_dependency(link_with: json_lib,
                                    include_directories: root_dir,
                                    dependencies: [ gobject_dep, gio_dep, ],


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]