From 6b9e765b83fb5e1fabdb7ecaba95518bade656d9 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derek.foreman@collabora.co.uk>
Date: Mon, 16 May 2011 10:22:54 -0400
Subject: [PATCH 2/5] Support building for Android

Conflicts:

	salut/Makefile.am

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
---
 .gitignore                  |    1 +
 Android.mk                  |   36 ++++++++++++++++++++++++++++++++++++
 mission-control/Makefile.am |   12 ++++++++++++
 salut/Makefile.am           |   12 ++++++++++++
 4 files changed, 61 insertions(+), 0 deletions(-)
 create mode 100644 Android.mk

diff --git a/.gitignore b/.gitignore
index 3d5763b..0052753 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+Android.mk
 Makefile
 Makefile.in
 config.h
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..e45694d
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,36 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+YTSTENUT_PLUGINS_BUILT_SOURCES := \
+	mission-control/Android.mk \
+	salut/Android.mk
+
+ytstenut-plugins-configure-real:
+	cd $(YTSTENUT_PLUGINS_TOP) ; \
+	CXX="$(CONFIGURE_CXX)" \
+	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) \
+	$(YTSTENUT_PLUGINS_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \
+		--disable-spec-documentation --disable-qt4 \
+		--disable-Werror && \
+	for file in $(YTSTENUT_PLUGINS_BUILT_SOURCES); do \
+		rm -f $$file && \
+		make -C $$(dirname $$file) $$(basename $$file) ; \
+	done
+
+ytstenut-plugins-configure: ytstenut-plugins-configure-real
+
+.PHONY: ytstenut-plugins-configure
+
+CONFIGURE_TARGETS += ytstenut-plugins-configure
+
+#include all the subdirs...
+-include $(YTSTENUT_PLUGINS_TOP)/mission-control/Android.mk
+-include $(YTSTENUT_PLUGINS_TOP)/salut/Android.mk
diff --git a/mission-control/Makefile.am b/mission-control/Makefile.am
index 939c5f1..ec189a6 100644
--- a/mission-control/Makefile.am
+++ b/mission-control/Makefile.am
@@ -22,3 +22,15 @@ mcp_account_manager_ytstenut_la_LDFLAGS = \
 	-avoid-version \
 	-no-undefined \
 	-export-symbols-regex 'mcp_plugin_ref_nth_object|mcd_plugin_init'
+
+Android.mk: Makefile.am
+	androgenizer -:PROJECT ytstenut_plugins \
+	 -:SHARED mcp-account-manager-ytstenut \
+	 -:TAGS eng debug \
+	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+	 -:SOURCES $(mcp_account_manager_ytstenut_la_SOURCES) \
+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	  $(AM_CFLAGS) \
+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+	 -:LDFLAGS $(mcp_account_manager_ytstenut_la_LIBADD) \
+	> $@
diff --git a/salut/Makefile.am b/salut/Makefile.am
index 20ea5ac..3149518 100644
--- a/salut/Makefile.am
+++ b/salut/Makefile.am
@@ -28,3 +28,15 @@ ytstenut_salut_la_SOURCES = \
 	$(top_srcdir)/plugin-base/channel-manager.h \
 	$(top_srcdir)/plugin-base/utils.c \
 	$(top_srcdir)/plugin-base/utils.h
+
+Android.mk: Makefile.am
+	androgenizer -:PROJECT ytstenut-plugins \
+	 -:SHARED ytstenut-salut -:TAGS eng debug \
+	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+	 -:SOURCES $(ytstenut_salut_la_SOURCES) \
+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	  $(AM_CFLAGS) -I../../wocky \
+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+	 -:LDFLAGS $(AM_LDFLAGS) $(ytstenut_salut_la_LIBADD) -lwocky \
+	  -ltelepathy-salut -lxml2 \
+	> $@
-- 
1.7.7