From: Emil Velikov Date: Thu, 13 Apr 2017 15:12:02 +0000 (+0100) Subject: gallium/dri: remove unneeded HAVE_SHARED_GLAPI guard X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4ea5f4b74c05d99e9c771b585ba531ed99a84bc5;p=mesa.git gallium/dri: remove unneeded HAVE_SHARED_GLAPI guard Always true, since the dri modules required shared glapi. With earlier commit (da410e6afad "configure: explicitly require shared glapi for enable-dri") we even made that explicit during the configure stage. Signed-off-by: Emil Velikov Reviewed-by: Nicolai Hähnle --- diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 8363406c581..e61df81228e 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -1,9 +1,5 @@ include $(top_srcdir)/src/gallium/Automake.inc -if HAVE_SHARED_GLAPI -SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la -endif - AM_CFLAGS = \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ @@ -55,7 +51,7 @@ gallium_dri_la_LIBADD = \ $(top_builddir)/src/gallium/drivers/noop/libnoop.la \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ - $(SHARED_GLAPI_LIB) \ + $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(SELINUX_LIBS) \ $(EXPAT_LIBS) \ $(LIBDRM_LIBS) \