isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-11 00:26:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix srcdir != builddir

Browse Source 
Need to ensure the wayland/ directory exists in $(builddir), and find
the headers there too.
This commit is contained in:
Colin Walters 2013-08-17 17:50:07 -04:00
parent 18a21b67c2
commit 24564c77d6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -32,6 +32,7 @@ INCLUDES= \
if HAVE_WAYLAND if HAVE_WAYLAND
INCLUDES += \ INCLUDES += \
-I$(srcdir)/wayland \ -I$(srcdir)/wayland \
-I$(builddir)/wayland \
-DXWAYLAND_PATH='"@XWAYLAND_PATH@"' -DXWAYLAND_PATH='"@XWAYLAND_PATH@"'
endif endif
@ -357,9 +358,12 @@ mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
if HAVE_WAYLAND if HAVE_WAYLAND
wayland/%-protocol.c : $(top_builddir)/protocol/%.xml wayland/%-protocol.c : $(top_builddir)/protocol/%.xml
mkdir -p wayland
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
wayland/%-server-protocol.h : $(top_builddir)/protocol/%.xml wayland/%-server-protocol.h : $(top_builddir)/protocol/%.xml
mkdir -p wayland
$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@ $(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
wayland/%-client-protocol.h : $(top_builddir)/protocol/%.xml wayland/%-client-protocol.h : $(top_builddir)/protocol/%.xml
mkdir -p wayland
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
endif endif