From 4a967f2d9d1b31016cf4a2a752d88346914c967f Mon Sep 17 00:00:00 2001 From: Markus Ongyerth Date: Thu, 24 May 2018 21:59:55 +0200 Subject: [PATCH] move sway specific ipc code out of common Moves the ipc-client code out of common into a dedicated ipc library to allow moving swaybg/swaylock into a separate project more easily --- common/meson.build | 1 - {common => ipc}/ipc-client.c | 0 ipc/meson.build | 8 ++++++++ meson.build | 1 + sway/meson.build | 2 +- swaybar/meson.build | 2 +- swaymsg/meson.build | 2 +- 7 files changed, 12 insertions(+), 4 deletions(-) rename {common => ipc}/ipc-client.c (100%) create mode 100644 ipc/meson.build diff --git a/common/meson.build b/common/meson.build index 06311f555..242ec84f1 100644 --- a/common/meson.build +++ b/common/meson.build @@ -3,7 +3,6 @@ lib_sway_common = static_library( files( 'background-image.c', 'cairo.c', - 'ipc-client.c', 'log.c', 'list.c', 'pango.c', diff --git a/common/ipc-client.c b/ipc/ipc-client.c similarity index 100% rename from common/ipc-client.c rename to ipc/ipc-client.c diff --git a/ipc/meson.build b/ipc/meson.build new file mode 100644 index 000000000..9df9cb64f --- /dev/null +++ b/ipc/meson.build @@ -0,0 +1,8 @@ +lib_sway_ipc = static_library( + 'sway-ipc', + files( + 'ipc-client.c', + ), + dependencies: [ ], + include_directories: sway_inc +) diff --git a/meson.build b/meson.build index 890c1787f..7d107c67f 100644 --- a/meson.build +++ b/meson.build @@ -115,6 +115,7 @@ sway_inc = include_directories('include') subdir('include') subdir('protocols') subdir('common') +subdir('ipc') subdir('sway') subdir('swaymsg') diff --git a/sway/meson.build b/sway/meson.build index 72347d51c..fcb15ae9c 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -143,6 +143,6 @@ executable( sway_sources, include_directories: [sway_inc], dependencies: sway_deps, - link_with: [lib_sway_common], + link_with: [lib_sway_common, lib_sway_ipc], install: true ) diff --git a/swaybar/meson.build b/swaybar/meson.build index d65edb11e..fcc68df76 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -23,6 +23,6 @@ executable( wayland_cursor, wlroots, ], - link_with: [lib_sway_common, lib_sway_client], + link_with: [lib_sway_common, lib_sway_client, lib_sway_ipc], install: true ) diff --git a/swaymsg/meson.build b/swaymsg/meson.build index 8638b838d..6d4282103 100644 --- a/swaymsg/meson.build +++ b/swaymsg/meson.build @@ -3,6 +3,6 @@ executable( 'main.c', include_directories: [sway_inc], dependencies: [jsonc, wlroots], - link_with: [lib_sway_common], + link_with: [lib_sway_common, lib_sway_ipc], install: true )