Mesa (master): targets/dri-ilo: make the driver installable

[Chia-I Wu]

Module: Mesa
Branch: master
Commit: 361902ec04ee54a51f73cd6129d59a6fd7160097
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=361902ec04ee54a51f73cd6129d59a6fd7160097

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Sat Mar 15 23:18:35 2014 +0800

targets/dri-ilo: make the driver installable

install-gallium-links.mk fails to create the compat link for ilo_dri.so
because it looks for dri_LTLIBRARIES instead of noinst_LTLIBRARIES.  Fix this
by switching to dri_LTLIBRARIES (and make the driver installable).

Since pci_id_driver_map.h and the DDX both tell libGL.so to look for "i965",
ilo_dri.so will never be loaded even enabled and installed.  The change should
not create any more confusion.

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Acked-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/gallium/targets/dri-ilo/Makefile.am |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gallium/targets/dri-ilo/Makefile.am b/src/gallium/targets/dri-ilo/Makefile.am
index 18d3c44..20f45a2 100644
--- a/src/gallium/targets/dri-ilo/Makefile.am
+++ b/src/gallium/targets/dri-ilo/Makefile.am
@@ -30,13 +30,12 @@ AM_CPPFLAGS = \
 	-DGALLIUM_TRACE \
 	-DGALLIUM_GALAHAD
 
-noinst_LTLIBRARIES = ilo_dri.la
+dridir = $(DRI_DRIVER_INSTALL_DIR)
+dri_LTLIBRARIES = ilo_dri.la
 
 ilo_dri_la_SOURCES = target.c
 
-# need -rpath to create a noinst shared library
-ilo_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS) \
-		     -rpath $(abs_builddir)
+ilo_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
 
 ilo_dri_la_LIBADD = \
 	$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \