[at-spi2-core] support building a static library



commit a151316c7f926e7c5b2b711a5c97fc123f1d1c53
Author: Rafael Kitover <rkitover gmail com>
Date:   Sun Feb 18 16:06:27 2018 -0500

    support building a static library
    
    Change the atspi library definition in meson.build to `library()`
    instead of `shared_library()` so that when meson is called with
    `--default-library static` a static library is built.
    
    For this to work, also change the `declare_dependency()` in
    `dbind/meson.build` to be a list of sources instead of a `link_with:`
    `static_library()`.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=793762

 atspi/meson.build |    2 +-
 dbind/meson.build |   10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/atspi/meson.build b/atspi/meson.build
index 0a8da85..17bfc45 100644
--- a/atspi/meson.build
+++ b/atspi/meson.build
@@ -67,7 +67,7 @@ atspi_enums = gnome.mkenums('atspi-enum-types',
                             install_header: true)
 atspi_enum_h = atspi_enums[1]
 
-atspi = shared_library('atspi', atspi_sources + atspi_enums,
+atspi = library('atspi', atspi_sources + atspi_enums,
                        version: soversion,
                        soversion: soversion.split('.')[0],
                        include_directories: [ root_inc, registryd_inc ],
diff --git a/dbind/meson.build b/dbind/meson.build
index e122645..5a9f02d 100644
--- a/dbind/meson.build
+++ b/dbind/meson.build
@@ -3,12 +3,10 @@ dbind_sources = [
   'dbind-any.c',
 ]
 
-dbind = static_library('dbind', dbind_sources,
-                       include_directories: root_inc,
-                       dependencies: [ libdbus_dep, glib_dep ],
-                       c_args: [ '-DG_LOG_DOMAIN="dbind"' ])
-
-dbind_dep = declare_dependency(link_with: dbind)
+dbind_dep = declare_dependency(sources: dbind_sources,
+                               include_directories: root_inc,
+                               compile_args: [ '-DG_LOG_DOMAIN="dbind"' ],
+                               dependencies: [ libdbus_dep, glib_dep ])
 
 test('dbind-test',
      executable('dbind-test', [ 'dbtest.c', '../atspi/atspi-gmain.c' ],


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