[Mesa-dev] [PATCH 17/21] gbm: Get rid of libgbm_dri.la.

[Johannes Obermayr]

---
 src/gbm/Makefile.am | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 440d4e0..4859e7c 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -28,18 +28,15 @@ libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.l
 endif
 
 if HAVE_DRI
-noinst_LTLIBRARIES = libgbm_dri.la
-libgbm_dri_la_SOURCES = \
+libgbm_la_SOURCES += \
 	backends/dri/gbm_dri.c \
 	backends/dri/driver_name.c
 
-libgbm_dri_la_CFLAGS = \
-	$(AM_CFLAGS) \
+AM_CFLAGS += \
 	-DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_SEARCH_DIR)"' \
 	$(LIBDRM_CFLAGS)
 
 libgbm_la_LIBADD += \
-	libgbm_dri.la \
 	$(GLAPI_LIB) \
 	$(LIBDRM_LIBS)
 endif
-- 
1.8.1.4