[Mesa-dev] [PATCH 10/23] st/dri: Remove the old libdridrm library

[Emil Velikov]

With all the hw drivers converted, we can remove the no longer used library.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/state_trackers/dri/drm/Makefile.am | 13 +++----------
 src/gallium/targets/dri/Makefile.am            |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/gallium/state_trackers/dri/drm/Makefile.am b/src/gallium/state_trackers/dri/drm/Makefile.am
index d04a06a..8052e6b 100644
--- 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 bba5219..3833217 100644
--- 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 \
-- 
2.0.0