summaryrefslogtreecommitdiffstats
path: root/src/glx
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-08-17 15:43:27 -0700
committerMatt Turner <[email protected]>2012-08-22 11:08:06 -0700
commitf9786394e5969593f9a0ea6e5653168197506523 (patch)
tree4c2bc51948370856c790f46e0a4eac5ac7349953 /src/glx
parentd9b109892d862709fe9696ecee5764d35501c982 (diff)
build: Clean glx Makefile.am
mapi/glapi is already built when make is run in src/glx. Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/Makefile.am5
1 files changed, 1 insertions, 4 deletions
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@[email protected]
$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
ln -f .libs/lib@[email protected] $(top_builddir)/$(LIB_DIR)/lib@[email protected]
ln -sf lib@[email protected] $(top_builddir)/$(LIB_DIR)/lib@[email protected]
-
-$(GLAPI_LIB):
- @$(MAKE) -C $(TOP)/src/mapi/glapi