From e507a14113eab3c2c4c34a977b237f505080bd2a Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 22 Apr 2014 08:36:50 +0200 Subject: [PATCH] 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 --- Makefile.am | 6 ++---- 1 file 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