diff options
| author | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2011-11-11 15:20:06 -0300 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-22 17:37:42 +0000 |
| commit | 16281498c3613e237b4096ee99789f80d02076c8 (patch) | |
| tree | 7dd9b4f78a7f0607dbcd4f9d2527a62c9183873e | |
| parent | bcce213e495424684e2cda11f6e5559032e481b4 (diff) | |
Support building under Android, modified from an original patch by Derek Foreman
https://bugs.freedesktop.org/show_bug.cgi?id=42509
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Android.mk | 32 | ||||
| -rw-r--r-- | wocky/Makefile.am | 9 |
3 files changed, 41 insertions, 1 deletions
@@ -39,6 +39,7 @@ valgrind.*.log .cvsignore Thumbs.db autom4te.cache +Android.mk Makefile Makefile.in INSTALL diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..fb33af9 --- /dev/null +++ b/Android.mk @@ -0,0 +1,32 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +WOCKY_BUILT_SOURCES := \ + wocky/Android.mk + +wocky-configure-real: + cd $(WOCKY_TOP) ; \ + CC="$(CONFIGURE_CC)" \ + CFLAGS="$(CONFIGURE_CFLAGS)" \ + LD=$(TARGET_LD) \ + LDFLAGS="$(CONFIGURE_LDFLAGS)" \ + CPP=$(CONFIGURE_CPP) \ + CPPFLAGS="$(CONFIGURE_CPPFLAGS) -I$(GCRYPT_TOP)/src -I$(GPG_ERROR_TOP)/src" \ + PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \ + PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \ + $(WOCKY_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \ + --disable-Werror && \ + for file in $(WOCKY_BUILT_SOURCES); do \ + rm -f $$file && \ + make -C $$(dirname $$file) $$(basename $$file) ; \ + done + +wocky-configure: wocky-configure-real + +.PHONY: wocky-configure + +CONFIGURE_TARGETS += wocky-configure + +#include all the subdirs... +-include $(WOCKY_TOP)/wocky/Android.mk diff --git a/wocky/Makefile.am b/wocky/Makefile.am index 330ff78..3dcd81a 100644 --- a/wocky/Makefile.am +++ b/wocky/Makefile.am @@ -238,4 +238,11 @@ $(filter %-enumtypes.c,$(built_sources)): %-enumtypes.c: %.h Makefile.in --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ $< > $@ - +Android.mk: Makefile.am $(built_sources) $(built_headers) + androgenizer -:PROJECT wocky -:SHARED wocky -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(handwritten_sources) $(built_sources) \ + -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFLAGS) \ + -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \ + -:LDFLAGS $(AM_LDFLAGS) $(GCRYPT_LIBS) \ + > $@ |