From a8bc8c65ce63abbe15ceeaf0460b11265cdf5c29 Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 6 Nov 2018 08:09:26 +0100 Subject: [PATCH] examples: only link clients to wlroots if necessary --- examples/idle.c | 4 +--- examples/input-method.c | 2 +- examples/meson.build | 17 ++++++++--------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/examples/idle.c b/examples/idle.c index 3e1565ca..a6a4f5c0 100644 --- a/examples/idle.c +++ b/examples/idle.c @@ -1,12 +1,12 @@ #include #include +#include #include #include #include #include #include #include -#include #include "idle-client-protocol.h" static struct org_kde_kwin_idle *idle_manager = NULL; @@ -109,8 +109,6 @@ void *main_loop(void *data) { } int main(int argc, char *argv[]) { - wlr_log_init(WLR_DEBUG, NULL); - if (parse_args(argc, argv) != 0) { return -1; } diff --git a/examples/input-method.c b/examples/input-method.c index 3e485d1c..4e375306 100644 --- a/examples/input-method.c +++ b/examples/input-method.c @@ -1,6 +1,7 @@ #define _POSIX_C_SOURCE 200809L #include #include +#include #include #include #include @@ -9,7 +10,6 @@ #include #include #include -#include #include "input-method-unstable-v2-client-protocol.h" #include "text-input-unstable-v3-client-protocol.h" #include "xdg-shell-client-protocol.h" diff --git a/examples/meson.build b/examples/meson.build index 90dbeca8..cbf39347 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -59,7 +59,7 @@ examples = { }, 'idle': { 'src': 'idle.c', - 'dep': [wayland_client, wlr_protos, wlroots, threads], + 'dep': [wayland_client, wlr_protos, threads], }, 'idle-inhibit': { 'src': 'idle-inhibit.c', @@ -75,7 +75,7 @@ examples = { }, 'gamma-control': { 'src': 'gamma-control.c', - 'dep': [wayland_client, wayland_cursor, wlr_protos, wlroots], + 'dep': [wayland_client, wayland_cursor, wlr_protos, math], }, 'pointer-constraints': { 'src': 'pointer-constraints.c', @@ -91,7 +91,6 @@ examples = { threads, wayland_client, wlr_protos, - wlroots, ], }, 'screencopy': { @@ -103,13 +102,13 @@ examples = { 'dep': [wayland_client, wlr_protos, wlroots], }, 'input-method': { - 'src': 'input-method.c', - 'dep': [wayland_client, wlr_protos, wlroots] + libepoll, - }, + 'src': 'input-method.c', + 'dep': [wayland_client, wlr_protos] + libepoll, + }, 'text-input': { - 'src': 'text-input.c', - 'dep': [wayland_cursor, wayland_client, wlr_protos, wlroots], - }, + 'src': 'text-input.c', + 'dep': [wayland_cursor, wayland_client, wlr_protos, wlroots], + }, } foreach name, info : examples