From a151316c7f926e7c5b2b711a5c97fc123f1d1c53 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sun, 18 Feb 2018 16:06:27 -0500 Subject: 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 --- dbind/meson.build | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'dbind') diff --git a/dbind/meson.build b/dbind/meson.build index e1226456..5a9f02d6 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' ], -- cgit v1.2.1