From 6a61caab9adec155a3ec2ab7289675955b1f2b76 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. configure.ac clears all variables if each dependency is disabled so we can include it unconditionally. Signed-off-by: Marcin Slusarz Signed-off-by: David Herrmann --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index e83c246..81aed9e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -271,16 +271,16 @@ libkmscon_static_la_SOURCES = \ external/htable.h \ external/htable.c +libkmscon_static_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(GLES2_CFLAGS) + if KMSCON_HAVE_GLES2 nodist_libkmscon_static_la_SOURCES = \ src/static_gl.h \ src/static_gl_math.c \ src/static_gl_shader.c \ src/static_shaders.c - -libkmscon_static_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(GLES2_CFLAGS) endif #