From 24564c77d61d429649110c751c65ba2aa161303c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 17 Aug 2013 17:50:07 -0400 Subject: [PATCH] build: Fix srcdir != builddir Need to ensure the wayland/ directory exists in $(builddir), and find the headers there too. --- src/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 1c0ac255a..491e78445 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,6 +32,7 @@ INCLUDES= \ if HAVE_WAYLAND INCLUDES += \ -I$(srcdir)/wayland \ + -I$(builddir)/wayland \ -DXWAYLAND_PATH='"@XWAYLAND_PATH@"' endif @@ -357,9 +358,12 @@ mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in if HAVE_WAYLAND wayland/%-protocol.c : $(top_builddir)/protocol/%.xml + mkdir -p wayland $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ wayland/%-server-protocol.h : $(top_builddir)/protocol/%.xml + mkdir -p wayland $(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@ wayland/%-client-protocol.h : $(top_builddir)/protocol/%.xml + mkdir -p wayland $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ endif