autotools: don't build libGLES*.so with GLVND
authorEric Engestrom <eric.engestrom@intel.com>
Tue, 5 Mar 2019 11:49:33 +0000 (11:49 +0000)
committerEric Engestrom <eric.engestrom@intel.com>
Fri, 8 Mar 2019 15:13:36 +0000 (15:13 +0000)
GLVND already provides these, so distro packagers have been deleting
them all along. Let's save ourselves the trouble and not build them in
the first place.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/mapi/Makefile.am

index daaf46ddb238d01e53220a8e1efffb8cd08f4630..69978e7a468b4fca40c21afcb4300acfaf51040b 100644 (file)
@@ -175,6 +175,8 @@ glapi_test_LDADD = \
 endif
 endif
 
+if USE_LIBGLVND
+else
 if HAVE_OPENGL_ES1
 TESTS += es1api/ABI-check
 
@@ -207,12 +209,15 @@ es1api_libGLESv1_CM_la_LDFLAGS = \
        $(LD_NO_UNDEFINED)
 
 es1api_libGLESv1_CM_la_LIBADD += shared-glapi/libglapi.la
-endif
+endif # HAVE_OPENGL_ES1
+endif # USE_LIBGLVND
 
 es1api/glapi_mapi_tmp.h: $(glapi_gen_mapi_deps)
        $(MKDIR_GEN)
        $(glapi_gen_mapi) glesv1 $(glapi_gen_gl_xml) > $@
 
+if USE_LIBGLVND
+else
 if HAVE_OPENGL_ES2
 TESTS += es2api/ABI-check
 
@@ -251,7 +256,8 @@ es2api_libGLESv2_la_LDFLAGS = \
        $(LD_NO_UNDEFINED)
 
 es2api_libGLESv2_la_LIBADD += shared-glapi/libglapi.la
-endif
+endif # HAVE_OPENGL_ES2
+endif # USE_LIBGLVND
 
 es2api/glapi_mapi_tmp.h: $(glapi_gen_mapi_deps)
        $(MKDIR_GEN)