From e6a7817e45ccd0312198a5040e78b27325b543bd Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 13 Aug 2017 08:21:57 -0400 Subject: [PATCH] Fix build on systems without systemd --- backend/meson.build | 2 +- dummy.c | 2 ++ meson.build | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 dummy.c diff --git a/backend/meson.build b/backend/meson.build index 7fcf00b8..dcf7837a 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -25,7 +25,7 @@ backend_files = files( ) if systemd.found() - wlr_files += files('session/logind.c') + backend_files += files('session/logind.c') endif lib_wlr_backend = static_library('wlr_backend', backend_files, diff --git a/dummy.c b/dummy.c new file mode 100644 index 00000000..870fde8a --- /dev/null +++ b/dummy.c @@ -0,0 +1,2 @@ +// This is used to make meson happy +void dummy(void); diff --git a/meson.build b/meson.build index d79290bd..fb8df1cb 100644 --- a/meson.build +++ b/meson.build @@ -43,8 +43,6 @@ if systemd.found() add_project_arguments('-DHAS_SYSTEMD', language: 'c') endif -wlr_files = [] - subdir('protocol') subdir('backend') subdir('render') @@ -70,7 +68,7 @@ _wlr_deps = [ math, ] -lib_wlr = library('wlroots', wlr_files, +lib_wlr = library('wlroots', files('dummy.c'), link_whole: [ lib_wl_protos, lib_wlr_backend,