summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Soliverez <alvaro.soliverez@collabora.co.uk>2011-11-14 20:16:56 (GMT)
committerWill Thompson <will.thompson@collabora.co.uk>2011-11-21 16:41:41 (GMT)
commit41bef427fdbe32c5c2cb6eee2a8b91f35148db31 (patch)
treee1487c0bc2d10a41d794c22a81a8f25b89275c94
parentafdf1a935297f61a6c09e316eefb00dc6a9cf8d4 (diff)
downloadtelepathy-yell-41bef427fdbe32c5c2cb6eee2a8b91f35148db31.tar.gz
telepathy-yell-41bef427fdbe32c5c2cb6eee2a8b91f35148db31.tar.xz
Support building for AndroidHEADmaster
This adds a missing explicit dependency on GIO, and adds build targets for Androgenizer. Modified from an original patch by Derek Foreman. https://bugs.freedesktop.org/show_bug.cgi?id=42523
-rw-r--r--.gitignore1
-rw-r--r--Android.mk31
-rw-r--r--configure.ac3
-rw-r--r--telepathy-yell/Makefile.am11
4 files changed, 45 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index bf17dac..4f581ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@
/telepathy-yell/*.pc
/telepathy-yell/extensions.html
/stamp-h1
+Android.mk
Makefile
Makefile.in
_gen
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..906cd55
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,31 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+TELEPATHY_YELL_BUILT_SOURCES := \
+ telepathy-yell/Android.mk
+
+telepathy-yell-configure-real:
+ cd $(TELEPATHY_YELL_TOP) ; \
+ CC="$(CONFIGURE_CC)" \
+ CFLAGS="$(CONFIGURE_CFLAGS)" \
+ LD=$(TARGET_LD) \
+ LDFLAGS="$(CONFIGURE_LDFLAGS)" \
+ CPP=$(CONFIGURE_CPP) \
+ CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
+ PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \
+ PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
+ $(TELEPATHY_YELL_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \
+ --disable-Werror && \
+ for file in $(TELEPATHY_YELL_BUILT_SOURCES); do \
+ rm -f $$file && \
+ make -C $$(dirname $$file) $$(basename $$file) ; \
+ done
+
+telepathy-yell-configure: telepathy-yell-configure-real
+
+.PHONY: telepathy-yell-configure
+
+CONFIGURE_TARGETS += telepathy-yell-configure
+
+-include $(TELEPATHY_YELL_TOP)/telepathy-yell/Android.mk
diff --git a/configure.ac b/configure.ac
index ede3669..e317747 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,8 @@ AC_ARG_ENABLE(shared-library,
AM_CONDITIONAL(ENABLE_SHARED_LIBRARY, test "x$ENABLE_SHARED_LIBRARY" != "xno")
dnl Check for Glib
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28, gobject-2.0 >= 2.26, gio-2.0 >= 2.28])
+PKG_CHECK_MODULES(GLIB,
+ [glib-2.0 >= 2.28, gobject-2.0 >= 2.26, gio-2.0 >= 2.28, gio-2.0 >= 2.28])
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
diff --git a/telepathy-yell/Makefile.am b/telepathy-yell/Makefile.am
index cf1302e..9de5884 100644
--- a/telepathy-yell/Makefile.am
+++ b/telepathy-yell/Makefile.am
@@ -193,3 +193,14 @@ _gen/svc-%.c _gen/svc-%.h: _gen/%.xml \
--not-implemented-func='tp_dbus_g_method_return_not_implemented' \
--allow-unstable \
$< Tpy_Svc_
+
+Android.mk: Makefile.am $(BUILT_SOURCES)
+ androgenizer -:PROJECT telepathy-yell -:SHARED telepathy-yell -:TAGS eng debug \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ -:SOURCES $(libtelepathy_yell_la_SOURCES) \
+ $(nodist_libtelepathy_yell_la_SOURCES) \
+ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CFLAGS) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+ -:LDFLAGS $(libtelepathy_yell_la_LIBADD) \
+ > $@