From 19fd6f240d5a0e3434a22a94d0671cc271c194c3 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Sun, 26 Apr 2015 17:56:22 +0100 Subject: Remove obsolete Android build cruft This is not needed any longer. --- Android.mk | 44 -------------------------------------------- ext/mad/Makefile.am | 15 --------------- ext/x264/Makefile.am | 15 --------------- gst/asfdemux/Makefile.am | 14 -------------- gst/dvdlpcmdec/Makefile.am | 14 -------------- gst/dvdsub/Makefile.am | 14 -------------- gst/realmedia/Makefile.am | 14 -------------- gst/xingmux/Makefile.am | 14 -------------- 8 files changed, 144 deletions(-) delete mode 100644 Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index bb821172..00000000 --- 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 ca796d66..d6b4407f 100644 --- 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 aae96032..4b290abd 100644 --- 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 93fa1e8d..a9c3eb64 100644 --- 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 fcee1e45..2edb1203 100644 --- 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 5272ac51..5f035870 100644 --- 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 46cbbc37..d307a72f 100644 --- 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 c5d7692f..0190890c 100644 --- 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' \ - > $@ -- cgit v1.2.3