norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: ...and now fix build without GLES2

Browse Source 
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 <marcin.slusarz@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
Marcin Slusarz 2012-08-22 21:11:47 +02:00 committed by David Herrmann
parent beb7c25137
commit 6a61caab9a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -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
#