meson.build: Add an explicit weston dependency

Required when building the compositor locally, without yocto/OE as
weston cflags includes the full path to weston.

Bug-AGL: SPEC-4725
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: If3a4e8238cb40c6fbe0db26bd1056fce48243038

diff --git a/meson.build b/meson.build
index 463b0fe..388f785 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -141,6 +141,7 @@ libweston_dep = dependency(libweston_version)
 
 deps_libweston = [
   dependency('wayland-server'),
+  dependency('weston'),
   libweston_dep,
   dependency('libweston-desktop-10'),
 ]

diff --git a/src/compositor.c b/src/compositor.c
index 60d5dd2..5ef3b34 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -49,7 +49,7 @@
 #include <libweston/windowed-output-api.h>
 #include <libweston/config-parser.h>
 #include <libweston/weston-log.h>
-#include <weston/weston.h>
+#include <weston.h>
 
 #include "shared/os-compatibility.h"
 #include "shared/helpers.h"

diff --git a/src/main.c b/src/main.c
index d1390f0..8056a9d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include <weston/weston.h>
+#include <weston.h>
 
 int main(int argc, char *argv[])
 {

diff --git a/src/shell.c b/src/shell.c
index ddb8981..db9638f 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -38,7 +38,7 @@
 #include <libweston/libweston.h>
 #include <libweston/config-parser.h>
 
-#include <weston/weston.h>
+#include <weston.h>
 #include "shared/os-compatibility.h"
 #include "shared/helpers.h"
 #include "shared/process-util.h"