From a702b60782d713ebce9199b0007d8beb083e49fe Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Wed, 12 Apr 2017 12:33:12 +0200 Subject: chamelium: Fix build issues on Android Makefile.sources are included 1:1 in Android.mk files, and are not parsed by automake. And yet those had some automake conditional logic. Moving it to .am file is enough for now. Also igt_chamelium.h included config.h without proper "HAVE_CONFIG_H" guard, and the file itself was included unconditionally. Signed-off-by: Arkadiusz Hiler Reviewed-by: Michal Wajdeczko --- lib/Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/Makefile.am') diff --git a/lib/Makefile.am b/lib/Makefile.am index c0ddf298..91e72c44 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -22,6 +22,13 @@ if !HAVE_LIBDRM_INTEL stubs/drm/intel_bufmgr.h endif +if HAVE_CHAMELIUM +lib_source_list += \ + igt_chamelium.h \ + igt_chamelium.c \ + $(NULL) +endif + AM_CPPFLAGS = -I$(top_srcdir) AM_CFLAGS = \ $(CWARNFLAGS) \ -- cgit v1.2.3