summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-04-22 08:36:50 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2014-04-22 08:36:50 +0200
commite507a14113eab3c2c4c34a977b237f505080bd2a (patch)
treeb8608dcfb806413e96bf1a4ea0e7a965fa4eb233
parent3b6fb0f75f50621eff2d6c1dfb5d9a0ce0f9216d (diff)
downloadkmscon-e507a14113eab3c2c4c34a977b237f505080bd2a.tar.gz
kmscon-e507a14113eab3c2c4c34a977b237f505080bd2a.tar.bz2
kmscon-e507a14113eab3c2c4c34a977b237f505080bd2a.zip
build: don't build shl_gl if GLES is disabled
We required GL headers for shl_gl.h. Even though the linker strips all the GL dependencies if it's disabled during compilation, we still require it as build-time dependency. Avoid that by not including shl_gl in any non-GL builds. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
-rw-r--r--Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index f82e0a1..be2dc30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -214,9 +214,7 @@ libshl_la_SOURCES = \
src/shl_hook.h \
src/shl_misc.h \
src/shl_register.h \
- src/shl_flagset.h \
- src/shl_gl.h \
- src/shl_gl_math.c
+ src/shl_flagset.h
libshl_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(XKBCOMMON_CFLAGS) \
@@ -229,7 +227,7 @@ libshl_la_LIBADD = \
$(XKBCOMMON_LIBS)
if BUILD_HAVE_GLES2
-libshl_la_SOURCES += src/shl_gl_shader.c
+libshl_la_SOURCES += src/shl_gl.h src/shl_gl_shader.c src/shl_gl_math.c
libshl_la_CPPFLAGS += $(GLES2_CFLAGS)
libshl_la_LIBADD += $(GLES2_LIBS)
endif