[vlc-devel] [PATCH] inhibit/wayland: Simplify include path

Marvin Scholz epirat07 at gmail.com
Wed Jul 17 15:28:18 CEST 2019


This is needed for meson, which automatically sets the include
path needed to find the file without relying on exact build dir
layout.
---
 modules/misc/Makefile.am               | 1 +
 modules/misc/inhibit/wl-idle-inhibit.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/misc/Makefile.am b/modules/misc/Makefile.am
index 300ef1d961..f5cbaea1be 100644
--- a/modules/misc/Makefile.am
+++ b/modules/misc/Makefile.am
@@ -68,6 +68,7 @@ libwl_idle_inhibit_plugin_la_SOURCES = misc/inhibit/wl-idle-inhibit.c
 nodist_libwl_idle_inhibit_plugin_la_SOURCES = \
 	misc/inhibit/idle-inhibit-client-protocol.h \
 	misc/inhibit/idle-inhibit-protocol.c
+libwl_idle_inhibit_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/misc/inhibit
 libwl_idle_inhibit_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
 libwl_idle_inhibit_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS)
 if HAVE_WAYLAND
diff --git a/modules/misc/inhibit/wl-idle-inhibit.c b/modules/misc/inhibit/wl-idle-inhibit.c
index 269c8bfdc2..9e51f8f917 100644
--- a/modules/misc/inhibit/wl-idle-inhibit.c
+++ b/modules/misc/inhibit/wl-idle-inhibit.c
@@ -30,7 +30,7 @@
 #include <string.h>
 
 #include <wayland-client.h>
-#include "misc/inhibit/idle-inhibit-client-protocol.h"
+#include "idle-inhibit-client-protocol.h"
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-- 
2.20.1 (Apple Git-117)



More information about the vlc-devel mailing list