Mesa (master): mapi: Remove vgapi from SUBDIRS.

Matt Turner mattst88 at kemper.freedesktop.org
Fri Jan 23 22:48:25 UTC 2015


Module: Mesa
Branch: master
Commit: 961def10745b52cb7430eaed8913a457a322556c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=961def10745b52cb7430eaed8913a457a322556c

Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Dec 17 20:28:19 2014 -0800

mapi: Remove vgapi from SUBDIRS.

OpenVG is disabled with via autotools.

---

 configure.ac         |    2 --
 src/mapi/Makefile.am |    8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index a4c5c74..1cce517 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 024283c..f6fc477 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




More information about the mesa-commit mailing list