From 0399d7ab3f69624b7f0b7b39e948432959fe270e Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 30 Jun 2015 22:43:50 +0100 Subject: [PATCH] gbm: do not build intermittent libgbm_dri static library The only user of it (libgbm.la) immediately links it. Just build it directly into the library. Signed-off-by: Emil Velikov Reviewed-by: Matt Turner --- 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 da4195df31c..9a584cab352 100644 --- a/src/gbm/Makefile.am +++ b/src/gbm/Makefile.am @@ -39,18 +39,15 @@ libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.l endif if HAVE_DRI2 -noinst_LTLIBRARIES = libgbm_dri.la -libgbm_dri_la_SOURCES = \ +libgbm_la_SOURCES += \ backends/dri/gbm_dri.c \ backends/dri/gbm_driint.h -libgbm_dri_la_CFLAGS = \ - $(AM_CFLAGS) \ +AM_CFLAGS += \ -DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_SEARCH_DIR)"' \ $(LIBDRM_CFLAGS) libgbm_la_LIBADD += \ - libgbm_dri.la \ $(LIBDRM_LIBS) endif -- 2.30.2