[libgee/meson: 16/24] Meson: Removed Utils namespace in docs



commit cc87d1e38e38ef549e9517d627b1029d4972b103
Author: Daniel Espinosa <daniel espinosa pwmc mx>
Date:   Mon May 15 10:22:11 2017 -0500

    Meson: Removed Utils namespace in docs
    
    Here efectibaly remove header and VAPI for internals,
    as reported by commit: 8e931bc334b2cba6d1311c30c8de034619bbfdbe

 doc/meson.build | 5 +++--
 gee/meson.build | 9 ++-------
 2 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/doc/meson.build b/doc/meson.build
index 750d608..0bf410f 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -9,7 +9,7 @@ vapidirvapi = '--vapidir='+join_paths (meson.current_source_dir (),'vapi')
 docsdir = join_paths (get_option ('datadir'), 'devhelp','books')
 
 custom_target ('valadocs',
-               input : sources,
+               input : valasources,
                output : outdir,
                command : [valadoc,
                        driver,
@@ -20,7 +20,8 @@ custom_target ('valadocs',
                        '--pkg=gio-2.0',
                        vapidir,
                        vapidirvapi,
-                       utilsvapi,
+                       '--vapidir', join_paths (meson.source_root (),'utils'),
+                       '--pkg=geeutils',
                        '--directory=@OUTDIR@',
                        valasources],
                install : true,
diff --git a/gee/meson.build b/gee/meson.build
index cd58a0f..39dd46e 100644
--- a/gee/meson.build
+++ b/gee/meson.build
@@ -94,16 +94,13 @@ sources = files ([])
 includehdir = include_directories ('.')
 includehdir_dep = declare_dependency (include_directories : includehdir)
 
-includehdir_dep = declare_dependency (include_directories : includehdir)
-
 gee = library('gee-@0@'.format(API_VERSION),
-       valasources + sources + utilsf + utilsvapi,
+       valasources + sources,
        version : PROJECT_VERSION,
        vala_header : 'gee.h',
        vala_vapi : 'gee-@0@.vapi'.format(API_VERSION),
        vala_gir : 'Gee-@0@.gir'.format(API_VERSION),
-       vala_internal_header : 'gee-internals.h',
-       vala_internal_vapi : 'gee-internals-0.8.vapi',
+       vala_args : [ '--pkg', 'geeutils'],
        dependencies : [ gio, include_utils_h_dir_dep ],
        install : true,
        install_dir : [
@@ -111,8 +108,6 @@ gee = library('gee-@0@'.format(API_VERSION),
                join_paths (get_option('includedir'),'gee-@0@'.format (API_VERSION)),
                true,
                true,
-               true,
-               true
        ])
 
 g_ir_compiler = find_program('g-ir-compiler')


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