From b6364fcb0ca60a889985f5cde3cf5f48e9bf4007 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Fri, 23 Sep 2011 15:47:59 +0100 Subject: [PATCH 5/5] gabble: copy plugin-base files to gabble directory Android doesn't like building this stuff in a common directory to the salut plugin because it stores the object files in the same place, but salut != gabble... Signed-off-by: Jonny Lamb --- gabble/Makefile.am | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gabble/Makefile.am b/gabble/Makefile.am index f2de8f6..16227ab 100644 --- a/gabble/Makefile.am +++ b/gabble/Makefile.am @@ -15,21 +15,23 @@ ytstenut_gabble_la_LIBADD = \ $(GABBLE_LIBS) \ $(TELEPATHY_YTSTENUT_LIBS) +copied_files = \ + ytstenut.c \ + caps-manager.c \ + channel-manager.c \ + utils.c + ytstenut_gabble_la_SOURCES = \ - $(top_srcdir)/plugin-base/ytstenut.c \ - $(top_srcdir)/plugin-base/ytstenut.h \ - $(top_srcdir)/plugin-base/caps-manager.c \ - $(top_srcdir)/plugin-base/caps-manager.h \ + $(copied_files) \ status.c \ - status.h \ - message-channel.c \ - message-channel.h \ - $(top_srcdir)/plugin-base/channel-manager.c \ - $(top_srcdir)/plugin-base/channel-manager.h \ - $(top_srcdir)/plugin-base/utils.c \ - $(top_srcdir)/plugin-base/utils.h + message-channel.c + +CLEANFILES = $(copied_files) Android.mk: Makefile.am + for i in $(copied_files); do \ + cp $(top_srcdir)/plugin-base/$$i .; \ + done androgenizer -:PROJECT ytstenut-plugins \ -:SHARED ytstenut-gabble -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -- 1.7.7