projects / platform / upstream / gst-plugins-ugly.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f209829)
Remove obsolete Android build cruft
authorTim-Philipp Müller <tim@centricular.com>
Sun, 26 Apr 2015 16:56:22 +0000 (17:56 +0100)
committerTim-Philipp Müller <tim@centricular.com>
Sun, 26 Apr 2015 16:56:31 +0000 (17:56 +0100)
This is not needed any longer.

Android.mk [deleted file] patch | blob | history
ext/mad/Makefile.am patch | blob | history
ext/x264/Makefile.am patch | blob | history
gst/asfdemux/Makefile.am patch | blob | history
gst/dvdlpcmdec/Makefile.am patch | blob | history
gst/dvdsub/Makefile.am patch | blob | history
gst/realmedia/Makefile.am patch | blob | history
gst/xingmux/Makefile.am patch | blob | history

diff --git a/Android.mk b/Android.mk
deleted file mode 100644 (file)
index bb82117..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-GST_PLUGINS_UGLY_TOP := $(LOCAL_PATH)
-
-GST_PLUGINS_UGLY_BUILT_SOURCES = \
-       ext/mad/Android.mk \
-       gst/realmedia/Android.mk \
-       gst/dvdsub/Android.mk \
-       gst/dvdlpcmdec/Android.mk \
-       gst/asfdemux/Android.mk \
-       ext/x264/Android.mk
-
-GST_PLUGINS_UGLY_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_UGLY_TOP))/%, $(GST_PLUGINS_UGLY_BUILT_SOURCES))
-
-.PHONY: gst-plugins-ugly-configure gst-plugins-ugly-configure-real
-
-gst-plugins-ugly-configure-real:
-       cd $(GST_PLUGINS_UGLY_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 $(GST_PLUGINS_UGLY_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \
-       --prefix=/system --disable-orc --disable-valgrind --disable-gtk-doc && \
-       for file in $(GST_PLUGINS_UGLY_BUILT_SOURCES); do \
-               rm -f $$file && \
-               make -C $$(dirname $$file) $$(basename $$file) ; \
-       done
-
-gst-plugins-ugly-configure: gst-plugins-ugly-configure-real
-
-CONFIGURE_TARGETS += gst-plugins-ugly-configure
-
--include $(GST_PLUGINS_UGLY_TOP)/ext/mad/Android.mk
--include $(GST_PLUGINS_UGLY_TOP)/ext/x264/Android.mk
--include $(GST_PLUGINS_UGLY_TOP)/gst/realmedia/Android.mk
--include $(GST_PLUGINS_UGLY_TOP)/gst/dvdsub/Android.mk
--include $(GST_PLUGINS_UGLY_TOP)/gst/dvdlpcmdec/Android.mk
--include $(GST_PLUGINS_UGLY_TOP)/gst/asfdemux/Android.mk
diff --git a/ext/mad/Makefile.am b/ext/mad/Makefile.am
index ca796d66d1819fb2cf5431034389ca748d0a1da3..d6b4407fa048f205eb25b6fde57ca8602113708e 100644 (file)
--- a/ext/mad/Makefile.am
+++ b/ext/mad/Makefile.am
@@ -12,18 +12,3 @@ libgstmad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmad_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstmad.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-       androgenizer \
-       -:PROJECT libgstmad -:SHARED libgstmad \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstmad_la_SOURCES) \
-        -:CPPFLAGS $(CPPFLAGS) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmad_la_CFLAGS) \
-        -:LDFLAGS $(libgstmad_la_LDFLAGS) \
-                  $(libgstmad_la_LIBADD) \
-                  -ldl \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-       > $@
diff --git a/ext/x264/Makefile.am b/ext/x264/Makefile.am
index aae96032157aa803429cd122ebb545d23507a20d..4b290abdf52c3d5011905ccd11eee53186ff2579 100644 (file)
--- a/ext/x264/Makefile.am
+++ b/ext/x264/Makefile.am
@@ -20,18 +20,3 @@ presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
 preset_DATA = GstX264Enc.prs
 
 EXTRA_DIST = $(preset_DATA)
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-       androgenizer \
-       -:PROJECT libgstx264 -:SHARED libgstx264 \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstx264_la_SOURCES) \
-        -:CPPFLAGS $(CPPFLAGS) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstx264_la_CFLAGS) -I'$$(GSTREAMER_AGGREGATE_TOP)/x264' \
-        -:LDFLAGS $(libgstx264_la_LDFLAGS) \
-                  $(libgstx264_la_LIBADD) \
-                  -ldl \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-       > $@
diff --git a/gst/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am
index 93fa1e8d2c8d096610abf9e655d1762546663a9b..a9c3eb64c15f94198cb6d90030cca494ed1c6053 100644 (file)
--- a/gst/asfdemux/Makefile.am
+++ b/gst/asfdemux/Makefile.am
@@ -11,17 +11,3 @@ libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstasf_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstasfdemux.h asfheaders.h asfpacket.h gstrtpasfdepay.h gstrtspwms.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-       androgenizer \
-       -:PROJECT libgstasf -:SHARED libgstasf \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstasf_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstasf_la_CFLAGS) \
-        -:LDFLAGS $(libgstasf_la_LDFLAGS) \
-                  $(libgstasf_la_LIBADD) \
-                  -ldl \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-       > $@
diff --git a/gst/dvdlpcmdec/Makefile.am b/gst/dvdlpcmdec/Makefile.am
index fcee1e45839c7a70382981f6a7802bd24f6520ad..2edb1203e93d5be7cd44d436affc78c4535e33c1 100644 (file)
--- a/gst/dvdlpcmdec/Makefile.am
+++ b/gst/dvdlpcmdec/Makefile.am
@@ -8,17 +8,3 @@ libgstdvdlpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdvdlpcmdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstdvdlpcmdec.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-       androgenizer \
-       -:PROJECT libgstdvdlpcmdec -:SHARED libgstdvdlpcmdec \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstdvdlpcmdec_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdvdlpcmdec_la_CFLAGS) \
-        -:LDFLAGS $(libgstdvdlpcmdec_la_LDFLAGS) \
-                  $(libgstdvdlpcmdec_la_LIBADD) \
-                  -ldl \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-       > $@
diff --git a/gst/dvdsub/Makefile.am b/gst/dvdsub/Makefile.am
index 5272ac51320f2c34b0b0de4aeab98d17b6ff4bf1..5f0358707755f7e7743c096c4c301a70ae5009ce 100644 (file)
--- a/gst/dvdsub/Makefile.am
+++ b/gst/dvdsub/Makefile.am
@@ -9,17 +9,3 @@ libgstdvdsub_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdvdsub_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstdvdsubdec.h gstdvdsubparse.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-       androgenizer \
-       -:PROJECT libgstdvdsub -:SHARED libgstdvdsub \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstdvdsub_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdvdsub_la_CFLAGS) \
-        -:LDFLAGS $(libgstdvdsub_la_LDFLAGS) \
-                  $(libgstdvdsub_la_LIBADD) \
-                  -ldl \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-       > $@
diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am
index 46cbbc37b3272336fff6ea0c2c6ca628cac25659..d307a72f094a43b0f238a54967d8c9d13a74b4c6 100644 (file)
--- a/gst/realmedia/Makefile.am
+++ b/gst/realmedia/Makefile.am
@@ -23,17 +23,3 @@ noinst_HEADERS = rademux.h rmdemux.h rmutils.h rdtdepay.h rdtmanager.h \
 noinst_PROGRAMS = asmrules
 asmrules_CFLAGS = $(GST_CFLAGS) -DTEST
 asmrules_LDADD = $(GST_LIBS) $(LIBM)
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-       androgenizer \
-       -:PROJECT libgstrmdemux -:SHARED libgstrmdemux \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstrmdemux_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrmdemux_la_CFLAGS) \
-        -:LDFLAGS $(libgstrmdemux_la_LDFLAGS) \
-                  $(libgstrmdemux_la_LIBADD) \
-                  -ldl \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-       > $@
diff --git a/gst/xingmux/Makefile.am b/gst/xingmux/Makefile.am
index c5d7692f5577cb3069a68a02bff60787d126a0c7..0190890c8a72a10bc737e34cbe4f5620d2c5ec06 100644 (file)
--- a/gst/xingmux/Makefile.am
+++ b/gst/xingmux/Makefile.am
@@ -9,17 +9,3 @@ libgstxingmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstxingmux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstxingmux.h
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-       androgenizer \
-       -:PROJECT libgstxingmux -:SHARED libgstxingmux \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstxingmux_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstxingmux_la_CFLAGS) \
-        -:LDFLAGS $(libgstxingmux_la_LDFLAGS) \
-                  $(libgstxingmux_la_LIBADD) \
-                  -ldl \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-       > $@
Domain: Multimedia / Media Common;