summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2015-06-30 22:43:50 +0100
committerEmil Velikov <[email protected]>2015-07-22 16:35:27 +0100
commit0399d7ab3f69624b7f0b7b39e948432959fe270e (patch)
tree365ffca49f787c9ac216bccf924639b8656e2644
parent8e5e18ac286f0782380c72cebffd4c54c98e4ccb (diff)
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 <[email protected]> Reviewed-by: Matt Turner <[email protected]>
-rw-r--r--src/gbm/Makefile.am7
1 files 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