[PATCH weston] build: Fix build when Wayland headers are not in standard prefix

[Bryce W. Harrington]

On Mon, Feb 03, 2014 at 05:55:39PM +0200, Ander Conselvan de Oliveira wrote:
> The move to a single Makefile.am missed to set a few _CFLAGS variables,
> causing the build to fail if the Wayland headers are not installed in
> the standard prefix.

Looks like Pekka caught these already with commits 5124b53a and cca3a06c

Bryce
> ---
>  Makefile.am | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 753ff83..06d2434 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -547,6 +547,7 @@ weston_info_SOURCES =				\
>  	shared/os-compatibility.c		\
>  	shared/os-compatibility.h
>  weston_info_LDADD = $(WESTON_INFO_LIBS)
> +weston_info_CFLAGS = $(CLIENT_CFLAGS)
>  
>  weston_desktop_shell_SOURCES = clients/desktop-shell.c
>  nodist_weston_desktop_shell_SOURCES =			\
> @@ -835,27 +836,34 @@ nodist_libtest_client_la_SOURCES =		\
>  	protocol/wayland-test-protocol.c	\
>  	protocol/wayland-test-client-protocol.h
>  libtest_client_la_LIBADD = $(TEST_CLIENT_LIBS) libshared.la libtest-runner.la
> +libtest_client_la_CFLAGS = $(COMPOSITOR_CFLAGS)
>  
>  bad_buffer_weston_SOURCES = tests/bad-buffer-test.c
>  bad_buffer_weston_LDADD = libtest-client.la
> +bad_buffer_weston_CFLAGS = $(COMPOSITOR_CFLAGS)
>  
>  keyboard_weston_SOURCES = tests/keyboard-test.c
>  keyboard_weston_LDADD = libtest-client.la
> +keyboard_weston_CFLAGS = $(COMPOSITOR_CFLAGS)
>  
>  event_weston_SOURCES = tests/event-test.c
>  event_weston_LDADD = libtest-client.la
> +event_weston_CFLAGS = $(COMPOSITOR_CFLAGS)
>  
>  button_weston_SOURCES = tests/button-test.c
>  button_weston_LDADD = libtest-client.la
> +button_weston_CFLAGS = $(COMPOSITOR_CFLAGS)
>  
>  text_weston_SOURCES = tests/text-test.c
>  nodist_text_weston_SOURCES =			\
>  	protocol/text-protocol.c		\
>  	protocol/text-client-protocol.h
>  text_weston_LDADD = libtest-client.la
> +text_weston_CFLAGS = $(COMPOSITOR_CFLAGS)
>  
>  subsurface_weston_SOURCES = tests/subsurface-test.c
>  subsurface_weston_LDADD = libtest-client.la
> +subsurface_weston_CFLAGS = $(COMPOSITOR_CFLAGS)
>  
>  if ENABLE_EGL
>  weston_tests += buffer-count.weston
> -- 
> 1.8.1.2
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel