From 010403eb8a5a27de729410b2d0443dbf0f527a54 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Wed, 22 Aug 2012 21:11:47 +0200 Subject: [PATCH] build: ...and now fix build without GLES2 Defining *_la_CPPFLAGS var in "if...endif" block breaks generation of Makefile.in - automake assumes it's defined unconditionally and uses it for building objects. So we need to define it properly in both cases. Signed-off-by: Marcin Slusarz --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index e83c246..2a5a00f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -270,6 +270,8 @@ libkmscon_static_la_SOURCES = \ src/static_misc.c \ external/htable.h \ external/htable.c +libkmscon_static_la_CPPFLAGS = \ + $(AM_CPPFLAGS) if KMSCON_HAVE_GLES2 nodist_libkmscon_static_la_SOURCES = \ @@ -278,8 +280,7 @@ nodist_libkmscon_static_la_SOURCES = \ src/static_gl_shader.c \ src/static_shaders.c -libkmscon_static_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ +libkmscon_static_la_CPPFLAGS += \ $(GLES2_CFLAGS) endif