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.
So we need to define it properly in both cases.

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
This commit is contained in:
Marcin Slusarz 2012-08-22 21:11:47 +02:00
parent beb7c25137
commit 010403eb8a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -270,6 +270,8 @@ libkmscon_static_la_SOURCES = \
src/static_misc.c \ src/static_misc.c \
external/htable.h \ external/htable.h \
external/htable.c external/htable.c
libkmscon_static_la_CPPFLAGS = \
$(AM_CPPFLAGS)
if KMSCON_HAVE_GLES2 if KMSCON_HAVE_GLES2
nodist_libkmscon_static_la_SOURCES = \ nodist_libkmscon_static_la_SOURCES = \
@ -278,8 +280,7 @@ nodist_libkmscon_static_la_SOURCES = \
src/static_gl_shader.c \ src/static_gl_shader.c \
src/static_shaders.c src/static_shaders.c
libkmscon_static_la_CPPFLAGS = \ libkmscon_static_la_CPPFLAGS += \
$(AM_CPPFLAGS) \
$(GLES2_CFLAGS) $(GLES2_CFLAGS)
endif endif