[gtk: 1/3] build: Don't hardcode shared_library() in meson.
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 1/3] build: Don't hardcode shared_library() in meson.
- Date: Fri, 15 Nov 2019 23:25:32 +0000 (UTC)
commit bb9c07d8fe8b90c42ba81fb5bb6f8a9826252660
Author: Niklas Hambüchen <mail nh2 me>
Date: Mon Nov 11 16:37:46 2019 +0100
build: Don't hardcode shared_library() in meson.
Instead, use the standard library().
This is a meson best practice.
Fixes -Ddefault_library=static not having any effect.
gtk/meson.build | 18 +++++++++---------
testsuite/reftests/meson.build | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 65576f92c6..4cdad1feb5 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1007,15 +1007,15 @@ if cc.has_header('langinfo.h')
endif
# Library
-libgtk = shared_library('gtk-4',
- soversion: gtk_soversion,
- sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
- c_args: gtk_cargs + common_cflags,
- include_directories: [confinc, gdkinc, gskinc, gtkinc],
- dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
- link_with: [libgtk_css, libgdk, libgsk, ],
- link_args: common_ldflags,
- install: true)
+libgtk = library('gtk-4',
+ soversion: gtk_soversion,
+ sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
+ c_args: gtk_cargs + common_cflags,
+ include_directories: [confinc, gdkinc, gskinc, gtkinc],
+ dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
+ link_with: [libgtk_css, libgdk, libgsk, ],
+ link_args: common_ldflags,
+ install: true)
gtk_dep_sources = [gtkversion, gtktypebuiltins_h]
# Introspection
diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index 632e97ffeb..cf6042ab1a 100644
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -1,9 +1,9 @@
# FIXME: $(no_undefined) ?
-libgtkreftestprivate = shared_library('gtkreftestprivate',
+libgtkreftestprivate = library('gtkreftestprivate',
'reftest-compare.c', 'reftest-module.c', 'reftest-snapshot.c',
dependencies : libgtk_dep)
-libreftest = shared_library('reftest',
+libreftest = library('reftest',
[ 'expand-expander.c',
'frame-inhibitor.c',
'letter-spacing.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]