[Mesa-dev] [PATCH 08/10] build: Clean glx Makefile.am

Matt Turner mattst88 at gmail.com
Fri Aug 17 16:46:36 PDT 2012


mapi/glapi is already built when make is run in src/glx.
---
 src/glx/Makefile.am |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 40e6b60..4aa900a 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -26,7 +26,7 @@ endif
 
 SUBDIRS=. tests
 
-GLAPI_LIB = ../mapi/glapi/libglapi.la
+GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la
 
 if HAVE_XF86VIDMODE
 EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
@@ -113,6 +113,3 @@ all-local: lib at GL_LIB@.la
 	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
 	ln -f .libs/lib at GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib at GL_LIB@.so.1
 	ln -sf lib at GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib at GL_LIB@.so
-
-$(GLAPI_LIB):
-	@$(MAKE) -C $(TOP)/src/mapi/glapi
-- 
1.7.8.6



More information about the mesa-dev mailing list