diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-02-01 00:44:08 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-01 00:44:08 +0000 |
| commit | 752da5c2a547d3ea93a7b3f23a33e66f50a330f9 (patch) | |
| tree | 6b0438a27e4aa6f2ba66de697ae760eade5c9b4b | |
| parent | de4b8d547bb58137c63d4a640b920dabca17b849 (diff) | |
| parent | 1048ad1a01e5fe0b995307d89b0925548da78754 (diff) | |
| download | gtk+-752da5c2a547d3ea93a7b3f23a33e66f50a330f9.tar.gz | |
Merge branch 'tool-static' into 'master'
tools: Don't static and dynamic link on libgtk4
See merge request GNOME/gtk!3138
| -rw-r--r-- | tools/meson.build | 15 |
1 files 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, ) |