diff --git a/Android.mk b/Android.mk deleted file mode 100644 index ae72d8b813..0000000000 --- a/Android.mk +++ /dev/null @@ -1,34 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -GES_TOP := $(LOCAL_PATH) - -GES_BUILT_SOURCES := \ - ges/Android.mk \ - tools/Android.mk -GES_BUILT_SOURCES := $(patsubst %, $(abspath $(GES_TOP))/%, $(GES_BUILT_SOURCES)) - -.PHONY: ges-configure ges-configure-real -ges-configure-real: - cd $(GES_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 $(GES_TOP))/$(CONFIGURE) --prefix=/system --host=arm-linux-androideabi \ - --disable-gtk-doc --disable-valgrind && \ - for file in $(GES_BUILT_SOURCES); do \ - rm -f $$file && \ - make -C $$(dirname $$file) $$(basename $$file) ; \ - done - -ges-configure: ges-configure-real - -CONFIGURE_TARGETS += ges-configure - --include $(GES_TOP)/ges/Android.mk --include $(GES_TOP)/tools/Android.mk diff --git a/ges/Makefile.am b/ges/Makefile.am index 20b3b6d3d8..0c3008326c 100644 --- a/ges/Makefile.am +++ b/ges/Makefile.am @@ -260,21 +260,5 @@ endif gcov: $(libges_@GST_API_VERSION@_la_SOURCES:=.gcov) -Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT libges -:SHARED libges-@GST_API_VERSION@ \ - -:TAGS eng debug \ - -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libges_@GST_API_VERSION@_la_SOURCES) \ - $(nodist_libges_@GST_API_VERSION@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(libges_@GST_API_VERSION@_la_CFLAGS) \ - -:LDFLAGS $(libges_@GST_API_VERSION@_la_LDFLAGS) \ - $(libges_@GST_API_VERSION@_la_LIBADD) \ - -ldl \ - -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/interfaces \ - -:HEADERS $(libges_@GST_API_VERSION@include_HEADERS) \ - $(nodist_libges_@GST_API_VERSION@include_HEADERS) \ - -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ - > $@ - lex.priv_ges_parse_yy.c parse_lex.h: parse.l $(AM_V_GEN)$(FLEX_PATH) --header-file=parse_lex.h -Ppriv_ges_parse_yy $^ diff --git a/tools/Makefile.am b/tools/Makefile.am index 2d6b1cb167..d534a2a1a3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -6,16 +6,3 @@ LDADD = $(top_builddir)/ges/libges-@GST_API_VERSION@.la $(GST_PBUTILS_LIBS) $(GS noinst_HEADERS = ges-validate.h ges-launcher.h utils.h ges_launch_@GST_API_VERSION@_SOURCES = ges-validate.c ges-launch.c ges-launcher.c utils.c - - - -Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer \ - -:PROJECT ges_launch -:EXECUTABLE ges-launch \ - -:TAGS eng \ - -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(ges_launch_@GST_API_VERSION@_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(AM_CFLAGS) \ - -:LDFLAGS -lges-@GST_API_VERSION@ $(GST_PBUTILS_LIBS) $(GST_LIBS) \ - -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ - > $@