[Mesa-dev] [PATCH 03/11] mesa/dricore: Drop compatibility for the old Mesa build system and -avoid-version.

[Johannes Obermayr]

---
 configure.ac                    |    1 +
 src/mesa/libdricore/Makefile.am |   23 ++++++++---------------
 2 Dateien geändert, 9 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-)

diff --git a/configure.ac b/configure.ac
index 72df83c..10b306e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -945,6 +945,7 @@ AC_ARG_ENABLE([glx-tls],
     [GLX_USE_TLS="$enableval"],
     [GLX_USE_TLS=no])
 AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
+AM_CONDITIONAL(HAVE_GLX_TLS, test x$GLX_USE_TLS = xyes)
 
 AS_IF([test "x$GLX_USE_TLS" = xyes -a "x$ax_pthread_ok" = xyes],
       [DEFINES="${DEFINES} -DGLX_USE_TLS -DHAVE_PTHREAD"])
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index 753548e..54c5060 100644
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
@@ -39,10 +39,16 @@ libdricore at VERSION@_la_SOURCES = \
 	$(LIBGLSL_FILES) \
 	$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
 	$(top_builddir)/src/glsl/builtin_function.cpp
-libdricore at VERSION@_la_LDFLAGS = -version-number 1:0
+libdricore at VERSION@_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version
 libdricore at VERSION@_la_LIBADD = \
         ../program/libdricore_program.la \
-        $()
+        $(DLOPEN_LIBS)
+
+if HAVE_SHARED_GLAPI
+libdricore at VERSION@_la_LIBADD += ../../mapi/shared-glapi/libglapi.la
+else
+libdricore at VERSION@_la_LIBADD += ../../mapi/glapi/libglapi.la
+endif
 
 if HAVE_X86_ASM
 libdricore at VERSION@_la_SOURCES += $(X86_FILES)
@@ -67,17 +73,4 @@ endif
 
 if HAVE_DRI
 lib_LTLIBRARIES = libdricore at VERSION@.la
-
-# 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: libdricore at VERSION@.la
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-	ln -f .libs/libdricore at VERSION@.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libdricore at VERSION@.so.1;
-	ln -sf libdricore at VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore at VERSION@.so
 endif
-
-CLEANFILES = \
-	$(top_builddir)/$(LIB_DIR)/libdricore at VERSION@.so.1 \
-	$(top_builddir)/$(LIB_DIR)/libdricore at VERSION@.so
-
--include $(DEPENDS)
-- 
1.7.10.4