---
configure.ac | 12 +++++---
src/egl/drivers/dri2/egl_dri2.c | 4 ---
src/gallium/auxiliary/Makefile.am | 14 +++++-----
src/gallium/drivers/llvmpipe/Makefile.am | 2 +-
src/gallium/targets/egl-static/Makefile.am | 6 ++--
src/gallium/targets/gbm/Makefile.am | 2 +-
src/gallium/targets/opencl/Makefile.am | 2 +-
src/gallium/targets/pipe-loader/Makefile.am | 2 +-
src/gallium/targets/vdpau-nouveau/Makefile.am | 2 +-
src/gallium/targets/vdpau-r300/Makefile.am | 2 +-
src/gallium/targets/vdpau-r600/Makefile.am | 2 +-
src/gallium/targets/vdpau-radeonsi/Makefile.am | 2 +-
src/gallium/targets/vdpau-softpipe/Makefile.am | 2 +-
src/gallium/targets/xa-vmwgfx/Makefile.am | 2 +-
src/gallium/targets/xorg-i915/Makefile.am | 2 +-
src/gallium/targets/xorg-nouveau/Makefile.am | 2 +-
src/gallium/targets/xorg-r600/Makefile.am | 2 +-
src/gallium/targets/xorg-radeonsi/Makefile.am | 2 +-
src/gallium/targets/xvmc-nouveau/Makefile.am | 2 +-
src/gallium/targets/xvmc-r300/Makefile.am | 2 +-
src/gallium/targets/xvmc-r600/Makefile.am | 2 +-
src/gallium/targets/xvmc-softpipe/Makefile.am | 2 +-
src/gallium/tests/trivial/Makefile.am | 2 +-
src/gallium/tests/unit/Makefile.am | 2 +-
src/mapi/shared-glapi/Makefile.am | 2 +-
src/mesa/Makefile.am | 38 +++++++++++++-------------
src/mesa/main/tests/Makefile.am | 2 +-
src/mesa/main/tests/hash_table/Makefile.am | 2 +-
28 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/configure.ac b/configure.ac
index 94815e6..a4e11d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,10 @@ dnl LIB_DIR - library basename
LIB_DIR=`echo $libdir | $SED 's%.*/%%'`
AC_SUBST([LIB_DIR])
+dnl Where to install internal libraries
+mesalibdir="\$(libdir)/mesa-${VERSION}"
+AC_SUBST([mesalibdir])
+
dnl Cache LDFLAGS and CPPFLAGS so we can add to them and restore later
_SAVE_LDFLAGS="$LDFLAGS"
_SAVE_CPPFLAGS="$CPPFLAGS"
@@ -838,10 +842,10 @@ AC_SUBST([GLESv2_PC_LIB_PRIV])
AC_SUBST([DRICOMMON_LIB],
"\$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la")
-LIBGALLIUM_LIB="\$(top_builddir)/src/gallium/auxiliary/libgallium${VERSION}.la"
-MESACORE_LIB="\$(top_builddir)/src/mesa/libmesacore${VERSION}.la"
-MESADRI_LIB="\$(top_builddir)/src/mesa/libmesadri${VERSION}.la"
-MESAGALLIUM_LIB="\$(top_builddir)/src/mesa/libmesagallium${VERSION}.la"
+LIBGALLIUM_LIB="\$(top_builddir)/src/gallium/auxiliary/libgallium.la"
+MESACORE_LIB="\$(top_builddir)/src/mesa/libmesacore.la"
+MESADRI_LIB="\$(top_builddir)/src/mesa/libmesadri.la"
+MESAGALLIUM_LIB="\$(top_builddir)/src/mesa/libmesagallium.la"
DRI_LIB_DEPS="${MESACORE_LIB} ${MESADRI_LIB}"
AC_SUBST([LIBMESAGALLIUM_LIBS], "${MESACORE_LIB} ${MESAGALLIUM_LIB}
${LIBGALLIUM_LIB}")
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 04ab564..bc7bdc7 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1916,12 +1916,8 @@ dri2_load(_EGLDriver *drv)
{
struct dri2_egl_driver *dri2_drv = dri2_egl_driver(drv);
#ifdef HAVE_SHARED_GLAPI
-#ifdef HAVE_ANDROID_PLATFORM
const char *libname = "libglapi.so";
#else
- const char *libname = "libglapi.so.0";
-#endif
-#else
/*
* Both libGL.so and libglapi.so are glapi providers. There is no way to
* tell which one to load.
diff --git a/src/gallium/auxiliary/Makefile.am
b/src/gallium/auxiliary/Makefile.am
index acf1440..2826af9 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -3,11 +3,11 @@ AUTOMAKE_OPTIONS = subdir-objects
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
-lib_LTLIBRARIES = libgallium@VERSION@.la
+mesalib_LTLIBRARIES = libgallium.la
-libgallium@VERSION@_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version
+libgallium_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version
-libgallium@VERSION@_la_LIBADD = $(DLOPEN_LIBS) $(CLOCK_LIB)
+libgallium_la_LIBADD = $(DLOPEN_LIBS) $(CLOCK_LIB)
AM_CFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary/util \
@@ -16,7 +16,7 @@ AM_CFLAGS = \
AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
-libgallium@VERSION@_la_SOURCES = \
+libgallium_la_SOURCES = \
$(C_SOURCES) \
$(GENERATED_SOURCES)
@@ -32,14 +32,14 @@ if LLVM_NEEDS_FNORTTI
AM_CXXFLAGS += -fno-rtti
endif
-libgallium@VERSION@_la_SOURCES += \
+libgallium_la_SOURCES += \
$(GALLIVM_SOURCES) \
$(GALLIVM_CPP_SOURCES)
-libgallium@VERSION@_la_LDFLAGS += \
+libgallium_la_LDFLAGS += \
$(LLVM_LDFLAGS)
-libgallium@VERSION@_la_LIBADD += \
+libgallium_la_LIBADD += \
$(LLVM_GALLIUM_LIBS)
endif
diff --git a/src/gallium/drivers/llvmpipe/Makefile.am
b/src/gallium/drivers/llvmpipe/Makefile.am
index 1897483..e99a2b8 100644
--- a/src/gallium/drivers/llvmpipe/Makefile.am
+++ b/src/gallium/drivers/llvmpipe/Makefile.am
@@ -86,7 +86,7 @@ TESTS = $(check_PROGRAMS)
TEST_LIBS = \
libllvmpipe.la \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(DLOPEN_LIBS) \
$(PTHREAD_LIBS)
diff --git a/src/gallium/targets/egl-static/Makefile.am
b/src/gallium/targets/egl-static/Makefile.am
index ca2e207..84e9463 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -52,7 +52,7 @@ egl_gallium_la_SOURCES = \
egl_st.c
egl_gallium_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/identity/libidentity.la \
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
@@ -103,8 +103,8 @@ AM_CPPFLAGS += \
-DFEATURE_GL=1
egl_gallium_la_LIBADD += \
- $(top_builddir)/src/mesa/libmesagallium@VERSION@.la \
- $(top_builddir)/src/mesa/libmesacore@VERSION@.la \
+ $(top_builddir)/src/mesa/libmesagallium.la \
+ $(top_builddir)/src/mesa/libmesacore.la \
$(GLAPI_LIB)
endif
diff --git a/src/gallium/targets/gbm/Makefile.am
b/src/gallium/targets/gbm/Makefile.am
index 5f05d32..02ba233 100644
--- a/src/gallium/targets/gbm/Makefile.am
+++ b/src/gallium/targets/gbm/Makefile.am
@@ -46,7 +46,7 @@ gbm_gallium_drm_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
$(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(LIBUDEV_LIBS) \
$(LIBDRM_LIBS) \
-lm
diff --git a/src/gallium/targets/opencl/Makefile.am
b/src/gallium/targets/opencl/Makefile.am
index 8aa361d..845babe 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -10,7 +10,7 @@ libOpenCL_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
$(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(GALLIUM_PIPE_LOADER_LIBS) $(LIBUDEV_LIBS) $(LLVM_OPENCL_LIBS) \
-ldl \
-lclangCodeGen \
diff --git a/src/gallium/targets/pipe-loader/Makefile.am
b/src/gallium/targets/pipe-loader/Makefile.am
index 70ef1c0..5461fc1 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -36,7 +36,7 @@ pipedir = $(libdir)/gallium-pipe
pipe_LTLIBRARIES =
PIPE_LIBS = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am
b/src/gallium/targets/vdpau-nouveau/Makefile.am
index 4e02cc5..38f9bfb 100644
--- a/src/gallium/targets/vdpau-nouveau/Makefile.am
+++ b/src/gallium/targets/vdpau-nouveau/Makefile.am
@@ -45,7 +45,7 @@ libvdpau_nouveau_la_LDFLAGS = \
-no-undefined
libvdpau_nouveau_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
diff --git a/src/gallium/targets/vdpau-r300/Makefile.am
b/src/gallium/targets/vdpau-r300/Makefile.am
index 3439152..9a3e4bc 100644
--- a/src/gallium/targets/vdpau-r300/Makefile.am
+++ b/src/gallium/targets/vdpau-r300/Makefile.am
@@ -45,7 +45,7 @@ libvdpau_r300_la_LDFLAGS = \
-no-undefined
libvdpau_r300_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \
$(top_builddir)/src/gallium/drivers/r300/libr300.la \
$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
diff --git a/src/gallium/targets/vdpau-r600/Makefile.am
b/src/gallium/targets/vdpau-r600/Makefile.am
index d405db9..e768605 100644
--- a/src/gallium/targets/vdpau-r600/Makefile.am
+++ b/src/gallium/targets/vdpau-r600/Makefile.am
@@ -44,7 +44,7 @@ libvdpau_r600_la_LDFLAGS = \
-no-undefined
libvdpau_r600_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
diff --git a/src/gallium/targets/vdpau-radeonsi/Makefile.am
b/src/gallium/targets/vdpau-radeonsi/Makefile.am
index e0a524c..798f74a 100644
--- a/src/gallium/targets/vdpau-radeonsi/Makefile.am
+++ b/src/gallium/targets/vdpau-radeonsi/Makefile.am
@@ -45,7 +45,7 @@ libvdpau_radeonsi_la_LDFLAGS = \
-no-undefined
libvdpau_radeonsi_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
diff --git a/src/gallium/targets/vdpau-softpipe/Makefile.am
b/src/gallium/targets/vdpau-softpipe/Makefile.am
index 6848032..f01cfce 100644
--- a/src/gallium/targets/vdpau-softpipe/Makefile.am
+++ b/src/gallium/targets/vdpau-softpipe/Makefile.am
@@ -44,7 +44,7 @@ libvdpau_softpipe_la_LDFLAGS = \
-no-undefined
libvdpau_softpipe_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
diff --git a/src/gallium/targets/xa-vmwgfx/Makefile.am
b/src/gallium/targets/xa-vmwgfx/Makefile.am
index cefaf79..f87187d 100644
--- a/src/gallium/targets/xa-vmwgfx/Makefile.am
+++ b/src/gallium/targets/xa-vmwgfx/Makefile.am
@@ -40,7 +40,7 @@ libxatracker_la_SOURCES = vmw_target.c
libxatracker_la_LDFLAGS = -version-number $(XA_MAJOR):$(XA_MINOR):$(XA_TINY)
libxatracker_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/xa/libxatracker.la \
$(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
$(top_builddir)/src/gallium/drivers/svga/libsvga.la \
diff --git a/src/gallium/targets/xorg-i915/Makefile.am
b/src/gallium/targets/xorg-i915/Makefile.am
index 276dd89..3109f95 100644
--- a/src/gallium/targets/xorg-i915/Makefile.am
+++ b/src/gallium/targets/xorg-i915/Makefile.am
@@ -44,7 +44,7 @@ i915_drv_la_SOURCES = \
i915_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
i915_drv_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
$(top_builddir)/src/gallium/drivers/i915/libi915.la \
diff --git a/src/gallium/targets/xorg-nouveau/Makefile.am
b/src/gallium/targets/xorg-nouveau/Makefile.am
index 144b668..df4ac10 100644
--- a/src/gallium/targets/xorg-nouveau/Makefile.am
+++ b/src/gallium/targets/xorg-nouveau/Makefile.am
@@ -44,7 +44,7 @@ nouveau2_drv_la_SOURCES = \
nouveau2_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
nouveau2_drv_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
diff --git a/src/gallium/targets/xorg-r600/Makefile.am
b/src/gallium/targets/xorg-r600/Makefile.am
index 1460940..4bf8cc5 100644
--- a/src/gallium/targets/xorg-r600/Makefile.am
+++ b/src/gallium/targets/xorg-r600/Makefile.am
@@ -44,7 +44,7 @@ r600g_drv_la_SOURCES = \
r600g_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
r600g_drv_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
diff --git a/src/gallium/targets/xorg-radeonsi/Makefile.am
b/src/gallium/targets/xorg-radeonsi/Makefile.am
index 9d21092..1f46bee 100644
--- a/src/gallium/targets/xorg-radeonsi/Makefile.am
+++ b/src/gallium/targets/xorg-radeonsi/Makefile.am
@@ -45,7 +45,7 @@ radeonsi_drv_la_SOURCES = \
radeonsi_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
radeonsi_drv_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am
b/src/gallium/targets/xvmc-nouveau/Makefile.am
index 0207446..4550ea9 100644
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -43,7 +43,7 @@ libXvMCnouveau_la_LDFLAGS = \
-no-undefined
libXvMCnouveau_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
diff --git a/src/gallium/targets/xvmc-r300/Makefile.am
b/src/gallium/targets/xvmc-r300/Makefile.am
index a11e51e..dfa0082 100644
--- a/src/gallium/targets/xvmc-r300/Makefile.am
+++ b/src/gallium/targets/xvmc-r300/Makefile.am
@@ -46,7 +46,7 @@ libXvMCr300_la_LDFLAGS = \
-no-undefined
libXvMCr300_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \
$(top_builddir)/src/gallium/drivers/r300/libr300.la \
$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
diff --git a/src/gallium/targets/xvmc-r600/Makefile.am
b/src/gallium/targets/xvmc-r600/Makefile.am
index f8f4ea1..ba86bb1 100644
--- a/src/gallium/targets/xvmc-r600/Makefile.am
+++ b/src/gallium/targets/xvmc-r600/Makefile.am
@@ -44,7 +44,7 @@ libXvMCr600_la_LDFLAGS = \
-no-undefined
libXvMCr600_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
diff --git a/src/gallium/targets/xvmc-softpipe/Makefile.am
b/src/gallium/targets/xvmc-softpipe/Makefile.am
index 864bc07..7c68591 100644
--- a/src/gallium/targets/xvmc-softpipe/Makefile.am
+++ b/src/gallium/targets/xvmc-softpipe/Makefile.am
@@ -44,7 +44,7 @@ libXvMCsoftpipe_la_LDFLAGS = \
-no-undefined
libXvMCsoftpipe_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
diff --git a/src/gallium/tests/trivial/Makefile.am
b/src/gallium/tests/trivial/Makefile.am
index 6b95b2e..d65eb86 100644
--- a/src/gallium/tests/trivial/Makefile.am
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
LDADD = $(GALLIUM_PIPE_LOADER_LIBS) \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(LIBUDEV_LIBS) \
$(DLOPEN_LIBS) \
$(PTHREAD_LIBS) \
diff --git a/src/gallium/tests/unit/Makefile.am
b/src/gallium/tests/unit/Makefile.am
index cf9e060..c157cc0 100644
--- a/src/gallium/tests/unit/Makefile.am
+++ b/src/gallium/tests/unit/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/winsys
LDADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
diff --git a/src/mapi/shared-glapi/Makefile.am
b/src/mapi/shared-glapi/Makefile.am
index 68d6a43..9857a86 100644
--- a/src/mapi/shared-glapi/Makefile.am
+++ b/src/mapi/shared-glapi/Makefile.am
@@ -4,7 +4,7 @@ TOP = $(top_srcdir)
GLAPI = $(top_srcdir)/src/mapi/glapi
include $(top_srcdir)/src/mapi/Makefile.sources
-lib_LTLIBRARIES = libglapi.la
+mesalib_LTLIBRARIES = libglapi.la
libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)
libglapi_la_LIBADD = $(PTHREAD_LIBS) $(SELINUX_LIBS)
libglapi_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 59cfd0c..4e059d5 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -75,26 +75,26 @@ main/get_hash.h: $(GLAPI)/gl_and_es_API.xml
main/get_hash_params.py \
-f $< > $@.tmp; \
mv $@.tmp $@;
-lib_LTLIBRARIES =
+mesalib_LTLIBRARIES =
check_LTLIBRARIES =
if NEED_LIBMESACORE
-lib_LTLIBRARIES += libmesacore@VERSION@.la
-libmesacore@VERSION@_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version
+mesalib_LTLIBRARIES += libmesacore.la
+libmesacore_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version
else
-check_LTLIBRARIES += libmesacore@VERSION@.la
+check_LTLIBRARIES += libmesacore.la
endif
if HAVE_GALLIUM
-lib_LTLIBRARIES += libmesagallium@VERSION@.la
-libmesagallium@VERSION@_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version
+mesalib_LTLIBRARIES += libmesagallium.la
+libmesagallium_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version
endif
if NEED_LIBMESADRI
-lib_LTLIBRARIES += libmesadri@VERSION@.la
-libmesadri@VERSION@_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version
+mesalib_LTLIBRARIES += libmesadri.la
+libmesadri_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version
else
-check_LTLIBRARIES += libmesadri@VERSION@.la
+check_LTLIBRARIES += libmesadri.la
endif
SRCDIR = $(top_srcdir)/src/mesa/
@@ -130,32 +130,32 @@ AM_CPPFLAGS += \
endif
-libmesacore@VERSION@_la_SOURCES = $(MESA_CORE_FILES)
+libmesacore_la_SOURCES = $(MESA_CORE_FILES)
-libmesacore@VERSION@_la_LIBADD = \
+libmesacore_la_LIBADD = \
$(top_builddir)/src/mesa/program/libmesacore_program.la \
$(top_builddir)/src/glsl/libglsl.la \
$(GLAPI_LIB) \
$(DLOPEN_LIBS)
-nodist_EXTRA_libmesadri@VERSION@_la_SOURCES = dummy.cpp
+nodist_EXTRA_libmesadri_la_SOURCES = dummy.cpp
-libmesadri@VERSION@_la_SOURCES = \
+libmesadri_la_SOURCES = \
$(MESA_FILES) \
$(MESA_ASM_FILES_FOR_ARCH)
-libmesadri@VERSION@_la_LIBADD = \
- libmesacore@VERSION@.la \
+libmesadri_la_LIBADD = \
+ libmesacore.la \
$(GLAPI_LIB) \
$(DLOPEN_LIBS)
-libmesagallium@VERSION@_la_SOURCES = $(MESA_GALLIUM_FILES)
+libmesagallium_la_SOURCES = $(MESA_GALLIUM_FILES)
-libmesagallium@VERSION@_la_LIBADD = \
- libmesacore@VERSION@.la \
- $(top_builddir)/src/gallium/auxiliary/libgallium@VERSION@.la \
+libmesagallium_la_LIBADD = \
+ libmesacore.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(GLAPI_LIB) \
$(DLOPEN_LIBS)
diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am
index 36e5987..4e10c3c 100644
--- a/src/mesa/main/tests/Makefile.am
+++ b/src/mesa/main/tests/Makefile.am
@@ -19,7 +19,7 @@ main_test_SOURCES = \
enum_strings.cpp
main_test_LDADD = \
- $(top_builddir)/src/mesa/libmesadri@VERSION@.la \
+ $(top_builddir)/src/mesa/libmesadri.la \
$(top_builddir)/src/gtest/libgtest.la \
$(GLAPI_LIB) \
$(PTHREAD_LIBS) \
diff --git a/src/mesa/main/tests/hash_table/Makefile.am
b/src/mesa/main/tests/hash_table/Makefile.am
index 6d1e87c..236c774 100644
--- a/src/mesa/main/tests/hash_table/Makefile.am
+++ b/src/mesa/main/tests/hash_table/Makefile.am
@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
$(DEFINES) $(INCLUDE_DIRS)
LDADD = \
- $(top_builddir)/src/mesa/libmesacore@VERSION@.la \
+ $(top_builddir)/src/mesa/libmesacore.la \
$(PTHREAD_LIBS) \
$(DLOPEN_LIBS)
--
1.8.1.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
