dri2: Trust our own driver name lookup over the server's.

[mesa.git] / src / glx / Makefile.am

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 40e6b609dbf5834e0b668554201efb7583a12cd4..54a0cc027da0b07ae12b7c0aa0edc05f5fe708f4 100644 (file)
--- 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
@@ -35,10 +35,12 @@ endif
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/include/GL/internal \
+       -I$(top_srcdir)/src/loader \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mapi/glapi \
        -I$(top_builddir)/src/mapi \
        -I$(top_builddir)/src/mapi/glapi \
+       $(VISIBILITY_CFLAGS) \
        $(SHARED_GLAPI_CFLAGS) \
        $(EXTRA_DEFINES_XF86VIDMODE) \
        -D_REENTRANT \
@@ -76,6 +78,7 @@ libglx_la_SOURCES = \
          indirect_vertex_program.c \
          pixel.c \
          pixelstore.c \
+         query_renderer.c \
          render2.c \
          renderpix.c \
          single2.c \
@@ -91,8 +94,16 @@ libglx_la_SOURCES = \
          glxhash.c \
          dri2_glx.c \
          dri2.c \
+         dri2_query_renderer.c \
          applegl_glx.c
 
+if HAVE_DRI3
+libglx_la_SOURCES += \
+          dri3_glx.c
+endif
+
+libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la
+
 GL_LIBS = \
        libglx.la \
        $(SHARED_GLAPI_LIBS) \
@@ -113,6 +124,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