[gxml/gxml-0.16] meson: re-name targets to use it as subproject



commit 0b4f5c07de1664c1dcd3275e9cd367ba8ea77cc8
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Fri Jan 25 14:32:46 2019 -0600

    meson: re-name targets to use it as subproject

 examples/vala/meson.build |  4 ++--
 gxml/meson.build          |  6 +++---
 test/meson.build          | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/examples/vala/meson.build b/examples/vala/meson.build
index 8b3a0e0..1c68d8a 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]
-       )
+       )
\ No newline at end of file
diff --git a/gxml/meson.build b/gxml/meson.build
index e448223..878dbf7 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -141,7 +141,7 @@ LT_CURRENT='1'
 LT_REVISION='0'
 LT_AGE='0'
 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,
@@ -163,7 +163,7 @@ lib = library(VERSIONED_PROJECT_NAME,
        ])
 
 g_ir_compiler = find_program('g-ir-compiler')
-custom_target('typelib',
+custom_target('libgxml_typelib',
        command: [
                g_ir_compiler,
                '--shared-library', 'lib'+PROJECT_NAME+'-@0@.so'.format (API_VERSION),
@@ -171,6 +171,6 @@ 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'))
diff --git a/test/meson.build b/test/meson.build
index 0685756..1b8e0f0 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -43,10 +43,10 @@ files_tests = ([
                'GomSchemaTest.vala'
        ])
 
-t = executable('tests', files_tests + configvapi + configtestvapi,
+t = executable('gxml_tests', files_tests + configvapi + configtestvapi,
        vala_args : [],
        dependencies : [ gio, gee, xml, inc_libh_dep, testdirs_dep, inc_rooth_dep],
-       link_with: lib
+       link_with: libgxml
 )
 
 test ('tests', t)
@@ -56,10 +56,10 @@ feedreader_files = ([
 ])
 
 
-feedreadert = executable('feedreader_tests', feedreader_files + configvapi + configtestvapi,
+feedreadert = executable('gxml_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)
+# test ('feedreader_tests', feedreadert)
\ No newline at end of file


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