[PATCH weston 08/17] android: build evdev.c into android backend

[Pekka Paalanen]

Android backend needs mtdev now, and evdev-touchpad.c, too.

Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
---
 configure.ac             |    1 +
 src/Makefile.am          |   16 +++++++++++-----
 src/compositor-android.c |    1 +
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6945652..a750b8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,6 +124,7 @@ AC_ARG_ENABLE(android-compositor,
 AM_CONDITIONAL(ENABLE_ANDROID_COMPOSITOR, test x$enable_android_compositor = xyes)
 if test x$enable_android_compositor = xyes; then
   AC_DEFINE([BUILD_ANDROID_COMPOSITOR], [1], [Build the compositor for Android 4.0])
+  PKG_CHECK_MODULES(ANDROID_COMPOSITOR, [mtdev >= 1.1.0])
 fi
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f4b8eea..361632c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -143,12 +143,18 @@ endif
 if ENABLE_ANDROID_COMPOSITOR
 android_backend = android-backend.la
 android_backend_la_LDFLAGS = -module -avoid-version
-android_backend_la_LIBADD = $(COMPOSITOR_LIBS)
-android_backend_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
+android_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(ANDROID_COMPOSITOR_LIBS)
+android_backend_la_CFLAGS =			\
+	$(GCC_CFLAGS)				\
+	$(COMPOSITOR_CFLAGS)			\
+	$(ANDROID_COMPOSITOR_CFLAGS)
 android_backend_la_CXXFLAGS = $(GCC_CXXFLAGS) $(COMPOSITOR_CFLAGS)
-android_backend_la_SOURCES = \
-	compositor-android.c \
-	android-framebuffer.cpp \
+android_backend_la_SOURCES =			\
+	compositor-android.c			\
+	evdev.c					\
+	evdev.h					\
+	evdev-touchpad.c			\
+	android-framebuffer.cpp			\
 	android-framebuffer.h
 endif
 
diff --git a/src/compositor-android.c b/src/compositor-android.c
index 54cfa2e..1657e9c 100644
--- a/src/compositor-android.c
+++ b/src/compositor-android.c
@@ -31,6 +31,7 @@
 #include "compositor.h"
 #include "android-framebuffer.h"
 #include "log.h"
+#include "evdev.h"
 
 struct android_compositor;
 
-- 
1.7.8.6