OSDN Git Service
(root)
/
android-x86
/
external-libdrm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeon: Fix typo in stderr message
[android-x86/external-libdrm.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
9514cc5
..
2ceb352
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-27,7
+27,9
@@
AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-libkms \
--enable-intel \
--enable-radeon \
--enable-libkms \
--enable-intel \
--enable-radeon \
+ --enable-amdgpu \
--enable-nouveau \
--enable-nouveau \
+ --enable-vc4 \
--enable-vmwgfx \
--enable-omap-experimental-api \
--enable-exynos-experimental-api \
--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-tegra-experimental-api \
--enable-install-test-programs \
--enable-cairo-tests \
- --enable-manpages
+ --enable-manpages \
+ --enable-valgrind
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm.pc
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libdrm.pc
@@
-57,6
+60,10
@@
if HAVE_RADEON
RADEON_SUBDIR = radeon
endif
RADEON_SUBDIR = radeon
endif
+if HAVE_AMDGPU
+AMDGPU_SUBDIR = amdgpu
+endif
+
if HAVE_OMAP
OMAP_SUBDIR = omap
endif
if HAVE_OMAP
OMAP_SUBDIR = omap
endif
@@
-73,12
+80,35
@@
if HAVE_TEGRA
TEGRA_SUBDIR = tegra
endif
TEGRA_SUBDIR = tegra
endif
-SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(FREEDRENO_SUBDIR) $(TEGRA_SUBDIR) tests man
+if HAVE_VC4
+VC4_SUBDIR = vc4
+endif
+
+if BUILD_MANPAGES
+if HAVE_MANPAGES_STYLESHEET
+MAN_SUBDIR = man
+endif
+endif
+
+SUBDIRS = \
+ . \
+ $(LIBKMS_SUBDIR) \
+ $(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_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 = \
libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
AM_CFLAGS = \
@@
-90,8
+120,6
@@
libdrm_la_SOURCES = $(LIBDRM_FILES)
libdrmincludedir = ${includedir}
libdrminclude_HEADERS = $(LIBDRM_H_FILES)
libdrmincludedir = ${includedir}
libdrminclude_HEADERS = $(LIBDRM_H_FILES)
-EXTRA_DIST = Android.mk
-
klibdrmincludedir = ${includedir}/libdrm
klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES)
klibdrmincludedir = ${includedir}/libdrm
klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES)