[gxml] Make it suitable as Meson subproject



commit af1029b71667dab36c28a6e83363fef00fe462ad
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Mon Feb 18 14:50:37 2019 -0600

    Make it suitable as Meson subproject

 examples/vala/meson.build | 2 +-
 gxml/meson.build          | 8 ++++++--
 test/meson.build          | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/examples/vala/meson.build b/examples/vala/meson.build
index 8b3a0e0..50b705e 100644
--- a/examples/vala/meson.build
+++ b/examples/vala/meson.build
@@ -1,4 +1,4 @@
 executable('gxml-vala', 'example.vala',
-       link_with: [lib],
+       link_with: [libgxml],
        dependencies: [xml, gio, gee, inc_rooth_dep]
        )
diff --git a/gxml/meson.build b/gxml/meson.build
index e9759e4..1cad641 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -142,7 +142,7 @@ LT_CURRENT='2'
 LT_REVISION='1'
 LT_AGE='1'
 LT_VERSION='1'
-lib = library(VERSIONED_PROJECT_NAME,
+libgxml = library(VERSIONED_PROJECT_NAME,
        valasources+sources+configvapi,
        version : LT_VERSION,
        soversion : LT_VERSION+'.'+LT_AGE+'.'+LT_REVISION,
@@ -173,7 +173,11 @@ custom_target('typelib',
                join_paths(meson.current_build_dir(), GIR_NAME)
        ],
        output: TYPELIB_NAME,
-       depends: lib,
+       depends: libgxml,
        install: true,
        install_dir: join_paths(get_option('libdir'), 'girepository-1.0'))
 endif
+
+
+libgxml_dep = declare_dependency(include_directories : inc_rooth_dep,
+  link_with : libgxml)
diff --git a/test/meson.build b/test/meson.build
index 5dd414f..62ab2c1 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -58,7 +58,7 @@ t = executable('tests', files_tests + configvapi + configtestvapi,
        vala_args : [],
        c_args: tests_cargs,
        dependencies : [ gio, gee, xml, inc_libh_dep, testdirs_dep, inc_rooth_dep],
-       link_with: lib
+       link_with: libgxml
 )
 
 test ('tests', t)
@@ -71,7 +71,7 @@ feedreader_files = ([
 feedreadert = executable('feedreader_tests', feedreader_files + configvapi + configtestvapi,
        vala_args : [],
        dependencies : [ gio, gee, xml, inc_libh_dep, testdirs_dep, inc_rooth_dep],
-       link_with: lib
+       link_with: libgxml
 )
 
 # test ('feedreader_tests', feedreadert)


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