Remove obsolete Android build cruft

This is not needed any longer.

diff --git a/.gitignore b/.gitignore
index 6587b0f..4cc7c00 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-Android.mk
 ABOUT-NLS
 INSTALL
 Makefile

diff --git a/Android.mk b/Android.mk
deleted file mode 100644 (file)
index cb4eeec..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-# This file is the top android makefile for all sub-modules.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-gstreamer_TOP := $(LOCAL_PATH)
-
-GST_BUILT_SOURCES :=           \
-       gst/gstenumtypes.h              \
-       gst/gstenumtypes.c              \
-       gst/parse/grammar.tab.h \
-       gst/parse/grammar.tab.c \
-       gst/parse/grammar.output        \
-       gst/parse/lex.priv_gst_parse_yy.c \
-       pkgconfig/gstreamer-1.0.pc       \
-       pkgconfig/gstreamer-base-1.0.pc      \
-       pkgconfig/gstreamer-controller-1.0.pc    \
-       pkgconfig/gstreamer-net-1.0.pc  \
-       pkgconfig/gstreamer-1.0-uninstalled.pc       \
-       pkgconfig/gstreamer-base-1.0-uninstalled.pc      \
-       pkgconfig/gstreamer-controller-1.0-uninstalled.pc    \
-       pkgconfig/gstreamer-net-1.0-uninstalled.pc      \
-       gst/Android.mk \
-       gst/parse/Android.mk \
-       libs/Android.mk \
-       libs/gst/Android.mk \
-       libs/gst/base/Android.mk \
-       libs/gst/controller/Android.mk \
-       libs/gst/net/Android.mk \
-       libs/gst/helpers/Android.mk \
-       plugins/Android.mk \
-       plugins/elements/Android.mk \
-       plugins/indexers/Android.mk \
-       tests/examples/controller/Android.mk \
-       tools/Android.mk
-
-GST_BUILT_SOURCES := $(patsubst %, $(abspath $(gstreamer_TOP))/%, $(GST_BUILT_SOURCES))
-
-.PHONY: gst-configure gst-configure-real
-gst-configure-real:
-       echo $(GST_BUILT_SOURCES)
-       cd $(gstreamer_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 $(gstreamer_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \
-       --prefix=/system --disable-nls \
-       --disable-valgrind --disable-gtk-doc && \
-       for file in $(GST_BUILT_SOURCES); do \
-               rm -f $$file && \
-               make -C $$(dirname $$file) $$(basename $$file) ; \
-       done
-
-gst-configure: gst-configure-real
-
-CONFIGURE_TARGETS += gst-configure
-
--include $(gstreamer_TOP)/gst/Android.mk
--include $(gstreamer_TOP)/libs/Android.mk
--include $(gstreamer_TOP)/plugins/Android.mk
--include $(gstreamer_TOP)/tools/Android.mk
--include $(gstreamer_TOP)/tests/examples/controller/Android.mk

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 853c0f5..b0fe9cc 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -268,23 +268,6 @@ gstenumtypes.c: $(gst_headers)
 
 gcov: $(libgstreamer_@GST_API_VERSION@_la_SOURCES:=.gcov)
 
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer -:SHARED libgstreamer-@GST_API_VERSION@ \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstreamer_@GST_API_VERSION@_la_SOURCES) \
-                  $(nodist_libgstreamer_@GST_API_VERSION@_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(libgstreamer_@GST_API_VERSION@_la_CFLAGS) \
-        -:LDFLAGS $(libgstreamer_@GST_API_VERSION@_la_LDFLAGS) \
-                  $(libgstreamer_@GST_API_VERSION@_la_LIBADD) \
-                  -ldl \
-        -:SUBDIR gst/parse \
-        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst \
-        -:HEADERS $(libgstreamer_@GST_API_VERSION@include_HEADERS) \
-        -:LIBFILTER_STATIC gstparse \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-       > $@
-
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = Gst-@GST_API_VERSION@.gir
 

diff --git a/gst/parse/Makefile.am b/gst/parse/Makefile.am
index a26d471..bb873aa 100644 (file)
--- a/gst/parse/Makefile.am
+++ b/gst/parse/Makefile.am
@@ -19,14 +19,6 @@ libgstparse_la_LIBADD = $(GST_ALL_LIBS)
 
 noinst_HEADERS = types.h
 
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer -:STATIC libgstparse -:TAGS eng debug \
-        -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstparse_la_SOURCES) $(nodist_libgstparse_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(libgstparse_la_CFLAGS) \
-        -:LDFLAGS $(libgstparse_la_LIBADD) \
-       > $@
-
 grammar.tab.c grammar.tab.h: grammar.y
        $(AM_V_GEN)$(BISON_PATH) -d -v -ppriv_gst_parse_yy $(srcdir)/grammar.y -o grammar.tab.c && \
        mv grammar.tab.c grammar.tab_tmp.c && \

diff --git a/libs/Makefile.am b/libs/Makefile.am
index c351b24..062cb55 100644 (file)
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -1,6 +1 @@
 SUBDIRS = gst
-
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer \
-        -:SUBDIR libs/gst \
-       > $@

diff --git a/libs/gst/Makefile.am b/libs/gst/Makefile.am
index f1ae69c..c89aad1 100644 (file)
--- a/libs/gst/Makefile.am
+++ b/libs/gst/Makefile.am
@@ -14,9 +14,3 @@ SUBDIRS_ALWAYS = base controller net
 
 SUBDIRS = $(SUBDIRS_ALWAYS) $(SUBDIRS_CHECK) $(SUBDIRS_HELPERS)
 DIST_SUBDIRS = $(SUBDIRS_ALWAYS) check helpers
-
-Android.mk: Makefile.am
-       echo $(PWD)
-       androgenizer -:PROJECT gstreamer \
-        -:SUBDIR $(patsubst %, libs/gst/%, $(SUBDIRS)) \
-       > $@

diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am
index c82e123..12bf293 100644 (file)
--- a/libs/gst/base/Makefile.am
+++ b/libs/gst/base/Makefile.am
@@ -57,18 +57,6 @@ CLEANFILES = *.gcno *.gcda *.gcov
 
 gcov: $(libgstbase_@GST_API_VERSION@_la_SOURCES:=.gcov)
 
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer -:SHARED libgstbase-@GST_API_VERSION@ -:TAGS eng debug \
-        -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstbase_@GST_API_VERSION@_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(libgstbase_@GST_API_VERSION@_la_CFLAGS) \
-        -:LDFLAGS $(libgstbase_@GST_API_VERSION@_la_LDFLAGS) \
-                  $(libgstbase_@GST_API_VERSION@_la_LIBADD) \
-        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/base \
-        -:HEADERS $(libgstbase_@GST_API_VERSION@include_HEADERS) \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-       > $@
-
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = GstBase-@GST_API_VERSION@.gir
 

diff --git a/libs/gst/controller/Makefile.am b/libs/gst/controller/Makefile.am
index a014cf9..922845d 100644 (file)
--- a/libs/gst/controller/Makefile.am
+++ b/libs/gst/controller/Makefile.am
@@ -29,18 +29,6 @@ CLEANFILES = *.gcno *.gcda *.gcov
 
 gcov: $(libgstcontroller_@GST_API_VERSION@_la_SOURCES:=.gcov)
 
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer -:SHARED libgstcontroller-@GST_API_VERSION@ -:TAGS eng debug \
-        -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstcontroller_@GST_API_VERSION@_la_SOURCES) \
-        -:CFLAGS $(libgstcontroller_@GST_API_VERSION@_la_CFLAGS) \
-        -:LDFLAGS $(libgstcontroller_@GST_API_VERSION@_la_LDFLAGS) \
-                  $(libgstcontroller_@GST_API_VERSION@_la_LIBADD) \
-        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/controller \
-        -:HEADERS $(libgstcontroller_@GST_API_VERSION@_include_HEADERS) \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-       > $@
-
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir
 

diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am
index 182849c..1f1eacc 100644 (file)
--- a/libs/gst/helpers/Makefile.am
+++ b/libs/gst/helpers/Makefile.am
@@ -26,15 +26,6 @@ gst_plugin_scanner_SOURCES = gst-plugin-scanner.c
 gst_plugin_scanner_CFLAGS = $(GST_OBJ_CFLAGS)
 gst_plugin_scanner_LDADD = $(GST_OBJ_LIBS)
 
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer -:EXECUTABLE gst-plugin-scanner  -:TAGS eng debug \
-        -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(gst_plugin_scanner_SOURCES) \
-        -:CFLAGS $(gst_plugin_scanner_CFLAGS) \
-        -:LDFLAGS $(gst_plugin_scanner_LDADD) \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-       > $@
-
 # clean out the old one to make sure everything is udpated correctly
 # remove again after release
 CLEANFILES = plugin-scanner

diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am
index 4fcc69d..f78f679 100644 (file)
--- a/libs/gst/net/Makefile.am
+++ b/libs/gst/net/Makefile.am
@@ -28,18 +28,6 @@ CLEANFILES = *.gcno *.gcda *.gcov
 
 gcov: $(libgstnet_@GST_API_VERSION@_la_SOURCES:=.gcov)
 
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer -:SHARED libgstnet-@GST_API_VERSION@ -:TAGS eng debug \
-        -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstnet_@GST_API_VERSION@_la_SOURCES) \
-        -:CFLAGS $(libgstnet_@GST_API_VERSION@_la_CFLAGS) \
-        -:LDFLAGS $(libgstnet_@GST_API_VERSION@_la_LDFLAGS) \
-                  $(libgstnet_@GST_API_VERSION@_la_LIBADD) \
-        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/net \
-        -:HEADERS $(libgstnet_@GST_API_VERSION@_include_HEADERS) \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-       > $@
-
 
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES = GstNet-@GST_API_VERSION@.gir

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 17233d2..4e46e71 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,8 +1,3 @@
 SUBDIRS = elements
 
 DIST_SUBDIRS = elements
-
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer \
-        -:SUBDIR $(patsubst %,plugins/%, $(SUBDIRS)) \
-       > $@

diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index ee3c9fb..db4d38c 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -68,14 +68,3 @@ CLEANFILES = *.gcno *.gcda *.gcov *.gcov.out
        $(GCOV) -b -f -o $^ > $@.out
 
 gcov: $(libgstcoreelements_la_SOURCES:=.gcov)
-
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer -:SHARED libgstcoreelements -:TAGS eng debug \
-        -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstcoreelements_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(libgstcoreelements_la_CFLAGS) \
-        -:LDFLAGS $(libgstcoreelements_la_LDFLAGS) \
-                   $(libgstcoreelements_la_LIBADD) \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:=$$\(TARGET_OUT\)/lib/gstreamer-@GST_API_VERSION@ \
-       > $@

diff --git a/tests/examples/controller/Makefile.am b/tests/examples/controller/Makefile.am
index 06d39ed..fd50697 100644 (file)
--- a/tests/examples/controller/Makefile.am
+++ b/tests/examples/controller/Makefile.am
@@ -5,15 +5,3 @@ AM_CFLAGS  = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs
 LDADD = \
        $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_API_VERSION@.la \
        $(GST_OBJ_LIBS)
-
-Android.mk: Makefile.am audio-example.c
-       androgenizer \
-       -:PROJECT audio-example -:EXECUTABLE audio-example \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES audio-example.c \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(AM_CFLAGS) \
-        -:LDFLAGS -lgstcontroller-@GST_API_VERSION@ \
-            $(GST_OBJ_LIBS) -ldl \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-       > $@

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 08bdace..46f814d 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -19,21 +19,6 @@ gst_launch_@GST_API_VERSION@_CFLAGS = $(GST_OBJ_CFLAGS)
 gst_launch_@GST_API_VERSION@_LDADD = $(GST_OBJ_LIBS)
 endif
 
-Android.mk: Makefile.am
-       androgenizer -:PROJECT gstreamer \
-        -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:EXECUTABLE gst-inspect-@GST_API_VERSION@ -:TAGS eng debug \
-        -:SOURCES $(gst_inspect_@GST_API_VERSION@_SOURCES) \
-        -:CFLAGS $(DEFS) $(gst_inspect_@GST_API_VERSION@_CFLAGS) \
-        -:LDFLAGS $(gst_inspect_@GST_API_VERSION@_LDADD) \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-        -:EXECUTABLE gst-launch-@GST_API_VERSION@ -:TAGS eng debug \
-        -:SOURCES $(gst_launch_@GST_API_VERSION@_SOURCES) \
-        -:CFLAGS $(DEFS) $(gst_launch_@GST_API_VERSION@_CFLAGS) \
-        -:LDFLAGS $(gst_launch_@GST_API_VERSION@_LDADD) \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-       > $@
-
 manpages = \
        gst-inspect-@GST_API_VERSION@.1 \
        gst-typefind-@GST_API_VERSION@.1