st/dri: Remove the old libdridrm library

With all the hw drivers converted, we can go back to having
a single libdridrm provider.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Rob Clark <robclark@freedesktop.org>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <thomas.stellard@amd.com>

diff --git a/src/gallium/state_trackers/dri/drm/Makefile.am b/src/gallium/state_trackers/dri/drm/Makefile.am
index d04a06a9fcc5b7cf64c54bfe41262cb6d5c2d27a..8052e6bf750ad985f6b0b7f80772c11301c3077e 100644 (file)
--- a/src/gallium/state_trackers/dri/drm/Makefile.am
+++ b/src/gallium/state_trackers/dri/drm/Makefile.am
@@ -36,18 +36,11 @@ AM_CPPFLAGS = \
        $(LIBDRM_CFLAGS) \
        $(VISIBILITY_CFLAGS)
 
-noinst_LTLIBRARIES = libdridrm.la libdridrm_s.la
-
-libdridrm_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -DSPLIT_TARGETS=1
-
 if HAVE_GALLIUM_STATIC_TARGETS
-libdridrm_s_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
+AM_CPPFLAGS += \
        -DGALLIUM_STATIC_TARGETS=1
 endif # HAVE_GALLIUM_STATIC_TARGETS
 
-libdridrm_la_SOURCES = $(C_SOURCES)
+noinst_LTLIBRARIES = libdridrm.la
 
-libdridrm_s_la_SOURCES = $(C_SOURCES)
+libdridrm_la_SOURCES = $(C_SOURCES)

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 2c100ff3d7addcc16e5b38886b54c76cce24d5fc..88242a97fa650f636b82d25ca683e759c5bd75e0 100644 (file)
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -32,7 +32,7 @@ endif # HAVE_LD_VERSION_SCRIPT
 gallium_dri_la_LIBADD = \
        $(top_builddir)/src/mesa/libmesagallium.la \
        $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
-       $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm_s.la \
+       $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
        $(top_builddir)/src/gallium/drivers/noop/libnoop.la \