summaryrefslogtreecommitdiff
path: root/lib/mesa/src/gbm/Makefile.am
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2017-08-26 16:59:42 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2017-08-26 16:59:42 +0000
commit81ece42815e80818f160cdd85fab57d65b56ad15 (patch)
tree1059ff094da1aa50334115952fcb1cfcbda3acc6 /lib/mesa/src/gbm/Makefile.am
parentb0244145d5bb49623d58f6b5cab8143ada692b60 (diff)
Revert to Mesa 13.0.6 to hopefully address rendering issues a handful of
people have reported with xpdf/fvwm on ivy bridge with modesetting driver.
Diffstat (limited to 'lib/mesa/src/gbm/Makefile.am')
-rw-r--r--lib/mesa/src/gbm/Makefile.am20
1 files changed, 9 insertions, 11 deletions
diff --git a/lib/mesa/src/gbm/Makefile.am b/lib/mesa/src/gbm/Makefile.am
index 9a584cab3..aba8d1ec3 100644
--- a/lib/mesa/src/gbm/Makefile.am
+++ b/lib/mesa/src/gbm/Makefile.am
@@ -1,3 +1,5 @@
+include Makefile.sources
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = main/gbm.pc
@@ -15,12 +17,7 @@ lib_LTLIBRARIES = libgbm.la
include_HEADERS = main/gbm.h
libgbm_la_SOURCES = \
- main/backend.c \
- main/backend.h \
- main/common_drm.h \
- main/gbm.c \
- main/gbm.h \
- main/gbmint.h
+ $(gbm_core_FILES)
libgbm_la_LDFLAGS = \
-no-undefined \
@@ -32,7 +29,7 @@ libgbm_la_LIBADD = \
$(top_builddir)/src/loader/libloader.la \
$(DLOPEN_LIBS)
-if HAVE_EGL_PLATFORM_WAYLAND
+if HAVE_PLATFORM_WAYLAND
AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM
AM_CFLAGS += $(WAYLAND_CFLAGS)
libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS)
@@ -40,15 +37,16 @@ endif
if HAVE_DRI2
libgbm_la_SOURCES += \
- backends/dri/gbm_dri.c \
- backends/dri/gbm_driint.h
+ $(gbm_dri_FILES)
AM_CFLAGS += \
-DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_SEARCH_DIR)"' \
- $(LIBDRM_CFLAGS)
+ $(LIBDRM_CFLAGS) \
+ $(PTHREADSTUBS_CFLAGS)
libgbm_la_LIBADD += \
- $(LIBDRM_LIBS)
+ $(LIBDRM_LIBS) \
+ $(PTHREADSTUBS_LIBS)
endif
TESTS = gbm-symbols-check