build: Fix GLES linkage without libglapi

fixes a regression introduced with
fc9ea7c74dc5cb996c3d9fe6663fd6da080e8360

NOTE: This is a candidate for the 9.0 branch.

Reported-by: Brian Paul <brianp@vmware.com>
Acked-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/mapi/es1api/Makefile.am b/src/mapi/es1api/Makefile.am
index c49c86ebeed7bfd40671a7553d20fe7aea710bca..c163a396c7f270270ba8008a6af215dc95da1f9b 100644 (file)
--- a/src/mapi/es1api/Makefile.am
+++ b/src/mapi/es1api/Makefile.am
@@ -41,9 +41,13 @@ GLES_include_HEADERS = \
 lib_LTLIBRARIES = libGLESv1_CM.la
 
 libGLESv1_CM_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h
-libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS) ../shared-glapi/libglapi.la
+libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS)
 libGLESv1_CM_la_LDFLAGS = -version-number 1:1 -no-undefined
 
+if HAVE_SHARED_GLAPI
+libGLESv1_CM_la_LIBADD += ../shared-glapi/libglapi.la
+endif
+
 include ../glapi/gen/glapi_gen.mk
 glapi_mapi_tmp.h: ../glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
        $(call glapi_gen_mapi,$<,es1api)

diff --git a/src/mapi/es2api/Makefile.am b/src/mapi/es2api/Makefile.am
index 5e02e1c449a2edb5d5e259b583bd3df848545a2b..0538f736dfab2271675f10e46cd78785d3979da7 100644 (file)
--- a/src/mapi/es2api/Makefile.am
+++ b/src/mapi/es2api/Makefile.am
@@ -45,9 +45,13 @@ GLES3_include_HEADERS = \
 lib_LTLIBRARIES = libGLESv2.la
 
 libGLESv2_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h
-libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS) ../shared-glapi/libglapi.la
+libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS)
 libGLESv2_la_LDFLAGS = -version-number 2 -no-undefined
 
+if HAVE_SHARED_GLAPI
+libGLESv2_la_LIBADD += ../shared-glapi/libglapi.la
+endif
+
 include ../glapi/gen/glapi_gen.mk
 glapi_mapi_tmp.h: ../glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
        $(call glapi_gen_mapi,$<,es2api)