From 4b1eaaf731b0e29497edc4c85153f2cf417fb5ce Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Mon, 21 Jan 2019 13:01:09 -0500 Subject: [PATCH] Removed unused wlroots dependency for sway(bg|bar|msg|nag) Also remove direct libm dependency where unused. --- client/meson.build | 3 +-- common/meson.build | 3 +-- include/cairo.h | 2 +- swaybar/meson.build | 3 +-- swaybg/meson.build | 4 +--- swaymsg/meson.build | 2 +- swaynag/meson.build | 2 -- 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/client/meson.build b/client/meson.build index 2bdda457..abe6f1eb 100644 --- a/client/meson.build +++ b/client/meson.build @@ -8,8 +8,7 @@ lib_sway_client = static_library( gdk_pixbuf, pango, pangocairo, - wlroots, - wayland_client, + wayland_client ], link_with: [lib_sway_common], include_directories: sway_inc diff --git a/common/meson.build b/common/meson.build index 3af1f1d5..8561d6cf 100644 --- a/common/meson.build +++ b/common/meson.build @@ -15,8 +15,7 @@ lib_sway_common = static_library( cairo, gdk_pixbuf, pango, - pangocairo, - wlroots + pangocairo ], include_directories: sway_inc ) diff --git a/include/cairo.h b/include/cairo.h index f28c072f..d1b9b8d7 100644 --- a/include/cairo.h +++ b/include/cairo.h @@ -4,7 +4,7 @@ #include "config.h" #include #include -#include +#include #if HAVE_GDK_PIXBUF #include #endif diff --git a/swaybar/meson.build b/swaybar/meson.build index b35f8169..469145ae 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -16,8 +16,7 @@ swaybar_deps = [ pangocairo, rt, wayland_client, - wayland_cursor, - wlroots, + wayland_cursor ] if have_tray if systemd.found() diff --git a/swaybg/meson.build b/swaybg/meson.build index 8704de6d..2b93da47 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -7,11 +7,9 @@ executable( client_protos, gdk_pixbuf, jsonc, - math, pango, pangocairo, - wayland_client, - wlroots, + wayland_client ], link_with: [lib_sway_common, lib_sway_client], install: true diff --git a/swaymsg/meson.build b/swaymsg/meson.build index b78e6cb0..3a27fa9f 100644 --- a/swaymsg/meson.build +++ b/swaymsg/meson.build @@ -2,7 +2,7 @@ executable( 'swaymsg', 'main.c', include_directories: [sway_inc], - dependencies: [jsonc, wlroots], + dependencies: [jsonc], link_with: [lib_sway_common], install: true ) diff --git a/swaynag/meson.build b/swaynag/meson.build index 2ba3ed95..9c29fd1a 100644 --- a/swaynag/meson.build +++ b/swaynag/meson.build @@ -11,12 +11,10 @@ executable( cairo, client_protos, gdk_pixbuf, - math, pango, pangocairo, wayland_client, wayland_cursor, - wlroots, ], link_with: [lib_sway_common, lib_sway_client], install: true