aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/meson.build3
-rw-r--r--common/meson.build3
-rw-r--r--include/cairo.h2
-rw-r--r--swaybar/meson.build3
-rw-r--r--swaybg/meson.build4
-rw-r--r--swaymsg/meson.build2
-rw-r--r--swaynag/meson.build2
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(
8 gdk_pixbuf, 8 gdk_pixbuf,
9 pango, 9 pango,
10 pangocairo, 10 pangocairo,
11 wlroots, 11 wayland_client
12 wayland_client,
13 ], 12 ],
14 link_with: [lib_sway_common], 13 link_with: [lib_sway_common],
15 include_directories: sway_inc 14 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(
15 cairo, 15 cairo,
16 gdk_pixbuf, 16 gdk_pixbuf,
17 pango, 17 pango,
18 pangocairo, 18 pangocairo
19 wlroots
20 ], 19 ],
21 include_directories: sway_inc 20 include_directories: sway_inc
22) 21)
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 @@
4#include "config.h" 4#include "config.h"
5#include <stdint.h> 5#include <stdint.h>
6#include <cairo/cairo.h> 6#include <cairo/cairo.h>
7#include <wlr/types/wlr_output.h> 7#include <wayland-client-protocol.h>
8#if HAVE_GDK_PIXBUF 8#if HAVE_GDK_PIXBUF
9#include <gdk-pixbuf/gdk-pixbuf.h> 9#include <gdk-pixbuf/gdk-pixbuf.h>
10#endif 10#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 = [
16 pangocairo, 16 pangocairo,
17 rt, 17 rt,
18 wayland_client, 18 wayland_client,
19 wayland_cursor, 19 wayland_cursor
20 wlroots,
21] 20]
22if have_tray 21if have_tray
23 if systemd.found() 22 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(
7 client_protos, 7 client_protos,
8 gdk_pixbuf, 8 gdk_pixbuf,
9 jsonc, 9 jsonc,
10 math,
11 pango, 10 pango,
12 pangocairo, 11 pangocairo,
13 wayland_client, 12 wayland_client
14 wlroots,
15 ], 13 ],
16 link_with: [lib_sway_common, lib_sway_client], 14 link_with: [lib_sway_common, lib_sway_client],
17 install: true 15 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(
2 'swaymsg', 2 'swaymsg',
3 'main.c', 3 'main.c',
4 include_directories: [sway_inc], 4 include_directories: [sway_inc],
5 dependencies: [jsonc, wlroots], 5 dependencies: [jsonc],
6 link_with: [lib_sway_common], 6 link_with: [lib_sway_common],
7 install: true 7 install: true
8) 8)
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(
11 cairo, 11 cairo,
12 client_protos, 12 client_protos,
13 gdk_pixbuf, 13 gdk_pixbuf,
14 math,
15 pango, 14 pango,
16 pangocairo, 15 pangocairo,
17 wayland_client, 16 wayland_client,
18 wayland_cursor, 17 wayland_cursor,
19 wlroots,
20 ], 18 ],
21 link_with: [lib_sway_common, lib_sway_client], 19 link_with: [lib_sway_common, lib_sway_client],
22 install: true 20 install: true