drivers/x11: remove unneeded GLX_SHARED_GLAPI define

[mesa.git] / src / mesa / drivers / x11 / Makefile.am

diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
index 4c63d59a57cf8910e271934c71b9111658629107..8c6b67d6a8d704a3bda33b25591fb7950c4bfcd5 100644 (file)
--- a/src/mesa/drivers/x11/Makefile.am
+++ b/src/mesa/drivers/x11/Makefile.am
@@ -23,17 +23,24 @@
 # GLX extension.  All rendering is converted to Xlib calls.  No hardware
 # acceleration.
 
+EXTRA_DIST = SConscript
+
+if HAVE_SHARED_GLAPI
+SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+endif
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/mesa/main \
        $(X11_INCLUDES) \
        $(DEFINES)
 
-if HAVE_X11_DRIVER
 lib_LTLIBRARIES = lib@GL_LIB@.la
-endif
 
 lib@GL_LIB@_la_SOURCES = \
        glxapi.h \
@@ -46,6 +53,8 @@ lib@GL_LIB@_la_SOURCES = \
        xm_api.c \
        xm_buffer.c \
        xm_dd.c \
+       xmesa.h \
+       xmesa_x.h \
        xm_line.c \
        xm_tri.c
 
@@ -59,11 +68,13 @@ GL_PATCH = 0
 lib@GL_LIB@_la_LIBADD = \
        $(top_builddir)/src/mesa/libmesa.la \
        $(top_builddir)/src/mapi/glapi/libglapi.la \
+       $(SHARED_GLAPI_LIB) \
        $(GL_LIB_DEPS)
 
 lib@GL_LIB@_la_LDFLAGS = \
        -no-undefined \
        -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \
-       -Wl,--no-undefined
+       $(GC_SECTIONS) \
+       $(LD_NO_UNDEFINED)
 
 include $(top_srcdir)/install-lib-links.mk