aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Yoo2017-05-09 00:32:30 -0500
committerRichard Yoo2017-05-09 01:08:15 -0500
commitd8ed3020112ded2e210e652f5a8f367d5f847157 (patch)
treea56c761e21902ba6b24df5c5b8168372ab995162 /Makefile.am
parent0da99b8ab0f691ad7ec7f4c5c8a09c5df92486a1 (diff)
parentd4b8344363b4e0f0e831e5722b6df5cc0bb08df8 (diff)
downloadexternal-libdrm-d8ed3020112ded2e210e652f5a8f367d5f847157.tar.gz
external-libdrm-d8ed3020112ded2e210e652f5a8f367d5f847157.tar.xz
external-libdrm-d8ed3020112ded2e210e652f5a8f367d5f847157.zip
Merge tag libdrm-2.4.75 into aosp/masterandroid-n-iot-preview-4
Below is a brief summary of patches pulled in: 0da99b8a (m/master, aosp/master) Move libdrm.so to vendor partition d4b83443 (tag: libdrm-2.4.75) Bump version for 2.4.75 release dae413e4 (tag: libdrm-2.4.74) Bump version for release 317bdff1 (tag: libdrm-2.4.73) Bump version for release 8cf43127 (tag: libdrm-2.4.72) Bump version for release a44c9c31 (tag: libdrm-2.4.71) Bump version for release 20208455 (tag: android-o-preview-1, tag: android-n-mr2-preview-2, tag: android-n-mr2-preview-1, aosp/sdk-release, aosp/o-preview) add a flag control that private libdrm can be chosen Bug: 35871718 Test: aosp_arm-eng compiles Change-Id: I81985fd41d5c0d8a732705dc2a4bee8eb5d459bb
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am16
1 files changed, 14 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 11ed1028..2bf644be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,7 @@ include Makefile.sources
22 22
23ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} 23ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
24 24
25AM_MAKEFLAGS = -s
25AM_DISTCHECK_CONFIGURE_FLAGS = \ 26AM_DISTCHECK_CONFIGURE_FLAGS = \
26 --enable-udev \ 27 --enable-udev \
27 --enable-libkms \ 28 --enable-libkms \
@@ -29,12 +30,14 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
29 --enable-radeon \ 30 --enable-radeon \
30 --enable-amdgpu \ 31 --enable-amdgpu \
31 --enable-nouveau \ 32 --enable-nouveau \
33 --enable-vc4 \
32 --enable-vmwgfx \ 34 --enable-vmwgfx \
33 --enable-omap-experimental-api \ 35 --enable-omap-experimental-api \
34 --enable-exynos-experimental-api \ 36 --enable-exynos-experimental-api \
35 --enable-freedreno \ 37 --enable-freedreno \
36 --enable-freedreno-kgsl\ 38 --enable-freedreno-kgsl\
37 --enable-tegra-experimental-api \ 39 --enable-tegra-experimental-api \
40 --enable-etnaviv-experimental-api \
38 --enable-install-test-programs \ 41 --enable-install-test-programs \
39 --enable-cairo-tests \ 42 --enable-cairo-tests \
40 --enable-manpages \ 43 --enable-manpages \
@@ -79,6 +82,14 @@ if HAVE_TEGRA
79TEGRA_SUBDIR = tegra 82TEGRA_SUBDIR = tegra
80endif 83endif
81 84
85if HAVE_VC4
86VC4_SUBDIR = vc4
87endif
88
89if HAVE_ETNAVIV
90ETNAVIV_SUBDIR = etnaviv
91endif
92
82if BUILD_MANPAGES 93if BUILD_MANPAGES
83if HAVE_MANPAGES_STYLESHEET 94if HAVE_MANPAGES_STYLESHEET
84MAN_SUBDIR = man 95MAN_SUBDIR = man
@@ -100,6 +111,8 @@ SUBDIRS = \
100 $(EXYNOS_SUBDIR) \ 111 $(EXYNOS_SUBDIR) \
101 $(FREEDRENO_SUBDIR) \ 112 $(FREEDRENO_SUBDIR) \
102 $(TEGRA_SUBDIR) \ 113 $(TEGRA_SUBDIR) \
114 $(VC4_SUBDIR) \
115 $(ETNAVIV_SUBDIR) \
103 tests \ 116 tests \
104 $(MAN_SUBDIR) \ 117 $(MAN_SUBDIR) \
105 $(ROCKCHIP_SUBDIR) 118 $(ROCKCHIP_SUBDIR)
@@ -119,8 +132,6 @@ libdrm_la_SOURCES = $(LIBDRM_FILES)
119libdrmincludedir = ${includedir} 132libdrmincludedir = ${includedir}
120libdrminclude_HEADERS = $(LIBDRM_H_FILES) 133libdrminclude_HEADERS = $(LIBDRM_H_FILES)
121 134
122EXTRA_DIST = Android.mk
123
124klibdrmincludedir = ${includedir}/libdrm 135klibdrmincludedir = ${includedir}/libdrm
125klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES) 136klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES)
126 137
@@ -128,6 +139,7 @@ if HAVE_VMWGFX
128klibdrminclude_HEADERS += $(LIBDRM_INCLUDE_VMWGFX_H_FILES) 139klibdrminclude_HEADERS += $(LIBDRM_INCLUDE_VMWGFX_H_FILES)
129endif 140endif
130 141
142EXTRA_DIST = include/drm/README
131 143
132copy-headers : 144copy-headers :
133 cp -r $(kernel_source)/include/uapi/drm/*.h $(top_srcdir)/include/drm/ 145 cp -r $(kernel_source)/include/uapi/drm/*.h $(top_srcdir)/include/drm/