Merge remote-tracking branch 'origin/master' into lollipop-x86

[android-x86/external-libdrm.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 13df80c..feecba7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,9 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
        --enable-libkms \
        --enable-intel \
        --enable-radeon \
+       --enable-amdgpu \
        --enable-nouveau \
+       --enable-vc4 \
        --enable-vmwgfx \
        --enable-omap-experimental-api \
        --enable-exynos-experimental-api \
@@ -36,7 +38,8 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
        --enable-tegra-experimental-api \
        --enable-install-test-programs \
        --enable-cairo-tests \
-       --enable-manpages
+       --enable-manpages \
+       --enable-valgrind
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm.pc
@@ -57,6 +60,10 @@ if HAVE_RADEON
 RADEON_SUBDIR = radeon
 endif
 
+if HAVE_AMDGPU
+AMDGPU_SUBDIR = amdgpu
+endif
+
 if HAVE_OMAP
 OMAP_SUBDIR = omap
 endif
@@ -73,6 +80,10 @@ if HAVE_TEGRA
 TEGRA_SUBDIR = tegra
 endif
 
+if HAVE_VC4
+VC4_SUBDIR = vc4
+endif
+
 if BUILD_MANPAGES
 if HAVE_MANPAGES_STYLESHEET
 MAN_SUBDIR = man
@@ -85,17 +96,19 @@ SUBDIRS = \
        $(INTEL_SUBDIR) \
        $(NOUVEAU_SUBDIR) \
        $(RADEON_SUBDIR) \
+       $(AMDGPU_SUBDIR) \
        $(OMAP_SUBDIR) \
        $(EXYNOS_SUBDIR) \
        $(FREEDRENO_SUBDIR) \
        $(TEGRA_SUBDIR) \
+       $(VC4_SUBDIR) \
        tests \
        $(MAN_SUBDIR)
 
 libdrm_la_LTLIBRARIES = libdrm.la
 libdrm_ladir = $(libdir)
 libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
-libdrm_la_LIBADD = @CLOCK_LIB@
+libdrm_la_LIBADD = @CLOCK_LIB@ -lm
 
 libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
 AM_CFLAGS = \