diff options
| author | Alessandro Decina <alessandro.d@gmail.com> | 2011-01-27 17:32:28 +0100 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@collabora.co.uk> | 2011-04-11 11:31:38 -0400 |
| commit | ade0f2ac1962f79cb4d3f0a5f1be946fef05deca (patch) | |
| tree | e3859d342bdb3e3184fd6b16b811e4ac2ba747f9 | |
| parent | 8b46358ef8389cfa6e09225fe6f8efa29386d8a5 (diff) | |
android: make it ready for androgenizer
Remove the android/ top dir
Fix the Makefile.am to be androgenized
To build gstreamer for android we are now using androgenizer which generates the needed Android.mk files.
Androgenizer can be found here: http://git.collabora.co.uk/?p=user/derek/androgenizer.git
| -rw-r--r-- | Android.mk | 32 | ||||
| -rw-r--r-- | gnl/Makefile.am | 17 |
2 files changed, 48 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..be6f389 --- /dev/null +++ b/Android.mk @@ -0,0 +1,32 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +GNONLIN_TOP := $(LOCAL_PATH) + +GNL_BUILT_SOURCES := \ + gnl/Android.mk +GNL_BUILT_SOURCES := $(patsubst %, $(abspath $(GNONLIN_TOP))/%, $(GNL_BUILT_SOURCES)) + +.PHONY: gnonlin-configure gnonlin-configure-real +gnonlin-configure-real: + cd $(GNONLIN_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=/ \ + $(abspath $(GNONLIN_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \ + --disable-gtk-doc --disable-valgrind --prefix=/system && \ + for file in $(GNL_BUILT_SOURCES); do \ + rm -f $$file && \ + make -C $$(dirname $$file) $$(basename $$file) ; \ + done + +gnonlin-configure: gnonlin-configure-real + +CONFIGURE_TARGETS += gnonlin-configure + +-include $(GNONLIN_TOP)/gnl/Android.mk diff --git a/gnl/Makefile.am b/gnl/Makefile.am index d9b065a..3751e3e 100644 --- a/gnl/Makefile.am +++ b/gnl/Makefile.am @@ -1,5 +1,5 @@ built_header_make = gnlmarshal.h -build_source_make = gnlmarshal.c +built_source_make = gnlmarshal.c plugin_LTLIBRARIES = libgnl.la EXTRA_libgnl_la_SOURCES = gnlmarshal.list @@ -52,3 +52,18 @@ gnlmarshal.c: gnlmarshal.list echo "#include \"gnlmarshal.h\"" >> gnlmarshal.c.tmp && \ glib-genmarshal --body --prefix=gnl_marshal $^ >> gnlmarshal.c.tmp && \ mv gnlmarshal.c.tmp gnlmarshal.c + + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgnl -:SHARED libgnl \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgnl_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgnl_la_CFLAGS) \ + -:LDFLAGS $(libgnl_la_LDFLAGS) \ + $(libgnl_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ |