build: don't build shl_gl if GLES is disabled
authorDavid Herrmann <dh.herrmann@gmail.com>
Tue, 22 Apr 2014 06:36:50 +0000 (08:36 +0200)
committerDavid Herrmann <dh.herrmann@gmail.com>
Tue, 22 Apr 2014 06:36:50 +0000 (08:36 +0200)
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>
Makefile.am

index f82e0a1..be2dc30 100644 (file)
@@ -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