From: Matt Turner <mattst88@gmail.com>
Date: Thu, 18 Dec 2014 04:28:19 +0000 (-0800)
Subject: mapi: Remove vgapi from SUBDIRS.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=961def10745b52cb7430eaed8913a457a322556c;p=mesa.git

mapi: Remove vgapi from SUBDIRS.

OpenVG is disabled with via autotools.
---

diff --git a/configure.ac b/configure.ac
index a4c5c74c299..1cce51742ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2401,8 +2401,6 @@ AC_CONFIG_FILES([Makefile
 		src/mapi/es1api/glesv1_cm.pc
 		src/mapi/es2api/glesv2.pc
 		src/mapi/glapi/gen/Makefile
-		src/mapi/vgapi/Makefile
-		src/mapi/vgapi/vg.pc
 		src/mesa/Makefile
 		src/mesa/gl.pc
 		src/mesa/drivers/dri/dri.pc
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 024283c5510..f6fc477a2b7 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -214,8 +214,10 @@ endif
 es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
 	$(call glapi_gen_mapi,$<,es2api)
 
-if HAVE_OPENVG
-SUBDIRS += vgapi
-endif
+# XXX: Inline vgapi's Makefile.am here.
+EXTRA_DIST += vgapi
+# if HAVE_OPENVG
+# SUBDIRS += vgapi
+# endif
 
 include $(top_srcdir)/install-lib-links.mk