loader: rework xmlconfig dependency

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

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 5884e33f80231d6242eabe5c5e8bacff5df1011b..34600475d98745f0ef942c7e0c50b4c3a66ee704 100644 (file)
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -20,7 +20,6 @@
 # IN THE SOFTWARE.
 
 if HAVE_SHARED_GLAPI
-SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
 SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
 
@@ -37,12 +36,11 @@ AM_CFLAGS = \
        -I$(top_srcdir)/include/GL/internal \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/loader \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_srcdir)/src/mapi/glapi \
        -I$(top_builddir)/src/mapi \
+       -I$(top_srcdir)/src/mapi \
        -I$(top_builddir)/src/mapi/glapi \
+       -I$(top_srcdir)/src/mapi/glapi \
        $(VISIBILITY_CFLAGS) \
-       $(SHARED_GLAPI_CFLAGS) \
        $(EXTRA_DEFINES_XF86VIDMODE) \
        -D_REENTRANT \
        -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
@@ -99,7 +97,9 @@ libglx_la_SOURCES = \
        singlepix.c \
        vertarr.c
 
-libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la
+libglx_la_LIBADD = \
+       $(top_builddir)/src/loader/libloader.la \
+       $(top_builddir)/src/util/libxmlconfig.la
 
 if HAVE_DRISW
 libglx_la_SOURCES += \
@@ -155,7 +155,7 @@ libglx_la_LIBADD += \
          $(builddir)/windows/libwindowsglx.la
 endif
 
-if USE_LIBGLVND_GLX
+if USE_LIBGLVND
 AM_CFLAGS += \
        -DGL_LIB_NAME=\"lib@GL_LIB@.so.0\" \
        $(GLVND_CFLAGS)
@@ -174,7 +174,10 @@ AM_CFLAGS += \
 GL_LIB_VERSION=1:2
 endif
 
+# Push the libdrm furhter up, as due to libtool bug we might end up relinking
+# against the system one.
 GL_LIBS = \
+       $(LIBDRM_LIBS) \
        libglx.la \
        $(top_builddir)/src/mapi/glapi/libglapi.la \
        $(SHARED_GLAPI_LIB) \