summaryrefslogtreecommitdiff
path: root/lib/mesa/src/intel/Makefile.common.am
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2017-12-31 07:12:27 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2017-12-31 07:12:27 +0000
commit051645c92924bf915d82bf219f2ed67309b5577a (patch)
tree4aae126dd8e5a18c6a9926a5468d1561e6038a07 /lib/mesa/src/intel/Makefile.common.am
parent2dae6fe6f74cf7fb9fd65285302c0331d9786b00 (diff)
Merge Mesa 17.2.8
Diffstat (limited to 'lib/mesa/src/intel/Makefile.common.am')
-rw-r--r--lib/mesa/src/intel/Makefile.common.am8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/mesa/src/intel/Makefile.common.am b/lib/mesa/src/intel/Makefile.common.am
index a8be54a26..1c1c2eed3 100644
--- a/lib/mesa/src/intel/Makefile.common.am
+++ b/lib/mesa/src/intel/Makefile.common.am
@@ -21,4 +21,10 @@
noinst_LTLIBRARIES += common/libintel_common.la
-common_libintel_common_la_SOURCES = $(COMMON_FILES)
+common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS)
+common_libintel_common_la_SOURCES = $(COMMON_FILES) $(DECODER_FILES)
+
+if HAVE_PLATFORM_ANDROID
+common_libintel_common_la_CFLAGS += $(ANDROID_CFLAGS)
+common_libintel_common_la_LIBADD = $(ANDROID_LIBS)
+endif