[gtk: 1/2] tools: Don't static and dynamic link on libgtk4
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 1/2] tools: Don't static and dynamic link on libgtk4
- Date: Mon, 1 Feb 2021 00:44:09 +0000 (UTC)
commit 1048ad1a01e5fe0b995307d89b0925548da78754
Author: Xavier Claessens <xavier claessens collabora com>
Date: Sun Jan 31 11:03:16 2021 -0500
tools: Don't static and dynamic link on libgtk4
tools/meson.build | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/tools/meson.build b/tools/meson.build
index e93f97d32a..de724e55f4 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,30 +1,29 @@
# Installed tools
gtk_tools = [
- ['gtk4-query-settings', ['gtk-query-settings.c'], []],
+ ['gtk4-query-settings', ['gtk-query-settings.c'], [libgtk_dep]],
['gtk4-builder-tool', ['gtk-builder-tool.c',
'gtk-builder-tool-simplify.c',
'gtk-builder-tool-validate.c',
'gtk-builder-tool-enumerate.c',
- 'gtk-builder-tool-preview.c'], [] ],
- ['gtk4-update-icon-cache', ['updateiconcache.c'], [ libgtk_static ] ],
- ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static ] ],
+ 'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+ ['gtk4-update-icon-cache', ['updateiconcache.c'], [ libgtk_static_dep ] ],
+ ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
]
if os_unix
- gtk_tools += [['gtk4-launch', ['gtk-launch.c'], []]]
+ gtk_tools += [['gtk4-launch', ['gtk-launch.c'], [libgtk_dep]]]
endif
foreach tool: gtk_tools
tool_name = tool.get(0)
tool_srcs = tool.get(1)
- tool_libs = tool.get(2)
+ tool_deps = tool.get(2)
exe = executable(tool_name,
sources: tool_srcs,
include_directories: [confinc],
c_args: common_cflags,
- link_with: tool_libs,
- dependencies: libgtk_dep,
+ dependencies: tool_deps,
install: true,
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]