aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Paul2016-02-03 09:52:15 -0600
committerSean Paul2016-02-03 09:52:15 -0600
commit870942e56aac024da5e0a621275f6561a4ddab1b (patch)
treef50e065f5088a40e2a34ae83e2e3ff6ab2e6f625 /Makefile.am
parentbd4d0d244019a72be9ca51ac3e8f35201b271f1b (diff)
parentb38a4b2326c1be5702f5cb73a53c0ed74c12d510 (diff)
downloadexternal-libgbm-870942e56aac024da5e0a621275f6561a4ddab1b.tar.gz
external-libgbm-870942e56aac024da5e0a621275f6561a4ddab1b.tar.xz
external-libgbm-870942e56aac024da5e0a621275f6561a4ddab1b.zip
Merge tag 'tags/libdrm-2.4.66' into master
Tag libdrm-2.4.66 from git://anongit.freedesktop.org/mesa/drm Signed-off-by: Sean Paul <seanpaul@chromium.org> Conflicts: Android.mk Makefile.am configure.ac freedreno/Android.mk include/drm/drm_mode.h intel/Android.mk libkms/Android.mk nouveau/Android.mk radeon/Android.mk tegra/tegra.c tests/Makefile.am xf86drmMode.c xf86drmMode.h Change-Id: I3186bde7f196d2f3438c4334591ee2a0c1371c96
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am46
1 files changed, 44 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index c4cd3f6e..11ed1028 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,24 @@ include Makefile.sources
22 22
23ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} 23ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
24 24
25AM_DISTCHECK_CONFIGURE_FLAGS = \
26 --enable-udev \
27 --enable-libkms \
28 --enable-intel \
29 --enable-radeon \
30 --enable-amdgpu \
31 --enable-nouveau \
32 --enable-vmwgfx \
33 --enable-omap-experimental-api \
34 --enable-exynos-experimental-api \
35 --enable-freedreno \
36 --enable-freedreno-kgsl\
37 --enable-tegra-experimental-api \
38 --enable-install-test-programs \
39 --enable-cairo-tests \
40 --enable-manpages \
41 --enable-valgrind
42
25pkgconfigdir = @pkgconfigdir@ 43pkgconfigdir = @pkgconfigdir@
26pkgconfig_DATA = libdrm.pc 44pkgconfig_DATA = libdrm.pc
27 45
@@ -41,6 +59,10 @@ if HAVE_RADEON
41RADEON_SUBDIR = radeon 59RADEON_SUBDIR = radeon
42endif 60endif
43 61
62if HAVE_AMDGPU
63AMDGPU_SUBDIR = amdgpu
64endif
65
44if HAVE_OMAP 66if HAVE_OMAP
45OMAP_SUBDIR = omap 67OMAP_SUBDIR = omap
46endif 68endif
@@ -57,19 +79,39 @@ if HAVE_TEGRA
57TEGRA_SUBDIR = tegra 79TEGRA_SUBDIR = tegra
58endif 80endif
59 81
82if BUILD_MANPAGES
83if HAVE_MANPAGES_STYLESHEET
84MAN_SUBDIR = man
85endif
86endif
87
60if HAVE_ROCKCHIP 88if HAVE_ROCKCHIP
61ROCKCHIP_SUBDIR = rockchip 89ROCKCHIP_SUBDIR = rockchip
62endif 90endif
63 91
64SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(FREEDRENO_SUBDIR) $(TEGRA_SUBDIR) $(ROCKCHIP_SUBDIR) tests man 92SUBDIRS = \
93 . \
94 $(LIBKMS_SUBDIR) \
95 $(INTEL_SUBDIR) \
96 $(NOUVEAU_SUBDIR) \
97 $(RADEON_SUBDIR) \
98 $(AMDGPU_SUBDIR) \
99 $(OMAP_SUBDIR) \
100 $(EXYNOS_SUBDIR) \
101 $(FREEDRENO_SUBDIR) \
102 $(TEGRA_SUBDIR) \
103 tests \
104 $(MAN_SUBDIR) \
105 $(ROCKCHIP_SUBDIR)
65 106
66libdrm_la_LTLIBRARIES = libdrm.la 107libdrm_la_LTLIBRARIES = libdrm.la
67libdrm_ladir = $(libdir) 108libdrm_ladir = $(libdir)
68libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined 109libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
69libdrm_la_LIBADD = @CLOCK_LIB@ 110libdrm_la_LIBADD = @CLOCK_LIB@ -lm
70 111
71libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm 112libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
72AM_CFLAGS = \ 113AM_CFLAGS = \
114 $(WARN_CFLAGS) \
73 $(VALGRIND_CFLAGS) 115 $(VALGRIND_CFLAGS)
74 116
75libdrm_la_SOURCES = $(LIBDRM_FILES) 117libdrm_la_SOURCES = $(LIBDRM_FILES)