summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <ppaalanen@gmail.com>2012-05-29 12:38:30 (GMT)
committerPekka Paalanen <ppaalanen@gmail.com>2012-07-12 07:29:15 (GMT)
commit7d6c6451dec8f93b644d99304ee7ace5dbc4f27f (patch)
tree88250043eefe191f210d46a172c095f8f073062d
parentc8156427f014cf00a59f857fa00672b53fd5b433 (diff)
downloadwayland-android-4.0.1_r1.2-b.tar.gz
wayland-android-4.0.1_r1.2-b.tar.xz
android: build libwayland-cursorandroid-4.0.1_r1.2-b
includes: android: set icondir for cursors
-rw-r--r--Android.mk9
-rw-r--r--cursor/Makefile.am16
2 files changed, 22 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index e2e9c0a..3f6bfed 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,8 @@ include $(CLEAR_VARS)
WAYLAND_TOP := $(LOCAL_PATH)
WAYLAND_BUILT_MAKEFILES := \
- $(WAYLAND_TOP)/src/Android.mk
+ $(WAYLAND_TOP)/src/Android.mk \
+ $(WAYLAND_TOP)/cursor/Android.mk
wayland-configure:
cd $(WAYLAND_TOP) ; \
@@ -19,7 +20,9 @@ wayland-configure:
PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \
PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
./configure --host=arm-linux-androideabi \
- --disable-scanner
+ --with-icondir=/system/usr/share/cursors \
+ --disable-scanner \
+ --disable-documentation
for file in $(WAYLAND_BUILT_MAKEFILES); do \
rm -f $$file && \
make -C $$(dirname $$file) $$(basename $$file) ; \
@@ -37,7 +40,7 @@ wayland-clean:
CONFIGURE_TARGETS += wayland-configure
CONFIGURE_RESET_TARGETS += wayland-reset
AGGREGATE_CLEAN_TARGETS += wayland-clean
-CONFIGURE_PKG_CONFIG_LIBDIR := $(CONFIGURE_PKG_CONFIG_LIBDIR):$(WAYLAND_TOP)/src
+CONFIGURE_PKG_CONFIG_LIBDIR := $(CONFIGURE_PKG_CONFIG_LIBDIR):$(WAYLAND_TOP)/src:$(WAYLAND_TOP)/cursor
-include $(WAYLAND_BUILT_MAKEFILES)
diff --git a/cursor/Makefile.am b/cursor/Makefile.am
index 3987546..8216a2f 100644
--- a/cursor/Makefile.am
+++ b/cursor/Makefile.am
@@ -18,3 +18,19 @@ AM_CFLAGS = \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
-DICONDIR=\"$(ICONDIR)\"
+
+
+# Only Android below this line
+
+Android.mk: Makefile
+ androgenizer \
+ -:PROJECT wayland \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ \
+ -:STATIC libwayland-cursor \
+ -:TAGS optional \
+ -:SOURCES $(libwayland_cursor_la_SOURCES) \
+ -:CFLAGS $(AM_CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
+ \
+ -:PASSTHROUGH 'wayland-clean: clean-libwayland-cursor' \
+ > $@