targets/dri-ilo: make the driver installable
authorChia-I Wu <olvaffe@gmail.com>
Sat, 15 Mar 2014 15:18:35 +0000 (23:18 +0800)
committerChia-I Wu <olvaffe@gmail.com>
Sun, 16 Mar 2014 05:26:22 +0000 (13:26 +0800)
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@gmail.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
src/gallium/targets/dri-ilo/Makefile.am

index 18d3c44573c3f13896c623db8a2ff9790091af41..20f45a29fdd339d9902954fa5fe18cf4829ec503 100644 (file)
@@ -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 \