dri_util: set implemented version of the DRI_CORE extension

[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 52febbb8d1ba66ef031e67822097411a356ee7ec..7a3513233f014375352d7bb25741f778e56e8733 100644 (file)
--- a/src/mesa/drivers/x11/Makefile.am
+++ b/src/mesa/drivers/x11/Makefile.am
@@ -29,19 +29,17 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mesa/main \
        $(X11_INCLUDES) \
-       $(API_DEFINES) \
        $(DEFINES)
 
 if HAVE_X11_DRIVER
-lib_LTLIBRARIES = libGL.la
+lib_LTLIBRARIES = lib@GL_LIB@.la
 endif
 
-libGL_la_SOURCES = \
+lib@GL_LIB@_la_SOURCES = \
        glxapi.h \
        glxheader.h \
        xfonts.h \
        xmesaP.h \
-       xm_image.h \
        fakeglx.c \
        glxapi.c \
        xfonts.c \
@@ -51,24 +49,22 @@ libGL_la_SOURCES = \
        xm_line.c \
        xm_tri.c
 
+# Force usage of a C++ linker
+nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
+
 GL_MAJOR = 1
 GL_MINOR = 6
 GL_PATCH = 0
 
-libGL_la_LIBADD = \
+lib@GL_LIB@_la_LIBADD = \
        $(top_builddir)/src/mesa/libmesa.la \
-       $(top_builddir)/src/mapi/glapi/libglapi.la
-libGL_la_LDFLAGS = \
-       -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \
+       $(top_builddir)/src/mapi/glapi/libglapi.la \
        $(GL_LIB_DEPS)
 
-if HAVE_SHARED_GLAPI
-libGL_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR) -l$(GLAPI_LIB)
-endif
+lib@GL_LIB@_la_LDFLAGS = \
+       -no-undefined \
+       -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \
+       $(GC_SECTIONS) \
+       $(LD_NO_UNDEFINED)
 
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the driver into /lib of the build tree.
-all-local: libGL.la
-       $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-       ln -f .libs/libGL.so.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/libGL.so.1
-       ln -sf libGL.so.1 $(top_builddir)/$(LIB_DIR)/libGL.so
+include $(top_srcdir)/install-lib-links.mk