From: Matt Turner <mattst88@gmail.com>
Date: Fri, 17 Aug 2012 22:43:27 +0000 (-0700)
Subject: build: Clean glx Makefile.am
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9786394e5969593f9a0ea6e5653168197506523;p=mesa.git

build: Clean glx Makefile.am

mapi/glapi is already built when make is run in src/glx.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 40e6b609dbf..4aa900a538a 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@GL_LIB@.la
 	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
 	ln -f .libs/lib@GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.1
 	ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so
-
-$(GLAPI_LIB):
-	@$(MAKE) -C $(TOP)/src/mapi/glapi