summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2012-06-12 13:37:58 -0700
committerEric Anholt <eric@anholt.net>2012-06-21 10:10:46 -0700
commit37c3cbe053809c7d615f86cde0599175c6d83545 (patch)
tree8b0c8dfa29ab3879474ebc7fd8b061399bb344f2 /src
parent4113ac6a0f13338ee5f9c5fa0be13f37b515108d (diff)
downloadexternal_mesa3d-37c3cbe053809c7d615f86cde0599175c6d83545.zip
external_mesa3d-37c3cbe053809c7d615f86cde0599175c6d83545.tar.gz
external_mesa3d-37c3cbe053809c7d615f86cde0599175c6d83545.tar.bz2
dricore: Turn it into a normal library.
Our intention is still that it's not abi stable, so make the package version number get included in the library name. Now you can parallel install dricore-using drivers from multiple mesa versions. We can put it into lib now that we're following library versioning rules (assuming that ABIs don't change within a single Mesa point release). LD_LIBRARY_PATH still doesn't work with a non-/, non-/usr prefix because libtool uses rpath instead of runpath for nonstandard prefixes.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/libdricore/Makefile.am18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am
index 866f8f1..26d8a88 100644
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
@@ -32,13 +32,11 @@ AM_CPPFLAGS = \
$(API_DEFINES) \
$(DEFINES)
-dridir = $(libdir)/dri
-
AM_CFLAGS = $(CFLAGS_NOVISIBILITY) -DUSE_DRICORE
AM_CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE
AM_CCASFLAGS = $(CFLAGS_NOVISIBILITY) -DUSE_DRICORE
-libdricore_la_SOURCES = \
+libdricore@VERSION@_la_SOURCES = \
$(MESA_FILES) \
$(MESA_CXX_FILES) \
$(LIBGLCPP_GENERATED_FILES) \
@@ -47,8 +45,8 @@ libdricore_la_SOURCES = \
$(LIBGLSL_CXX_FILES) \
$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
$(top_srcdir)/src/glsl/builtin_function.cpp
-libdricore_la_LDFLAGS = -module -avoid-version -shared
-libdricore_la_LIBADD = libdricore-asm.la
+libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
+libdricore@VERSION@_la_LIBADD = libdricore-asm.la
# This is separated from libdricore to avoid conflics in object
# outputs between main/clip.c and sparc/clip.c. The documented way to
@@ -72,16 +70,18 @@ endif
if HAVE_DRICORE
noinst_LTLIBRARIES = libdricore-asm.la
-dri_LTLIBRARIES = libdricore.la
+lib_LTLIBRARIES = libdricore@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.la
+all-local: libdricore@VERSION@.la
$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/libdricore.so $(top_builddir)/$(LIB_DIR)/libdricore.so;
+ ln -f .libs/libdricore@VERSION@.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1;
+ ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
endif
CLEANFILES = \
- $(top_builddir)/$(LIB_DIR)/libdricore.so
+ $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1 \
+ $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
-include $(DEPENDS)