Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / tools / Makefile.am

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 406d64e..647b634 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,19 +5,19 @@ man_MANS = \
         gst-visualise-@GST_MAJORMINOR@.1
 
 bin_PROGRAMS = \
-       gst-discoverer
+       gst-discoverer-@GST_MAJORMINOR@
+
+gst_discoverer_@GST_MAJORMINOR@_SOURCES = gst-discoverer.c
 
 CLEANFILES = $(man_MANS) $(bin_SCRIPTS) $(bin_PROGRAMS)
 
 EXTRA_DIST = \
-       gst-visualise-m.m gst-visualise.1.in \
-       gst-discoverer.c
+       gst-visualise-m.m gst-visualise.1.in
+
 
 LDADD = $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la\
-       -lgstpbutils-@GST_MAJORMINOR@ \
        $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la\
-       -lgstvideo-@GST_MAJORMINOR@ \
-       $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
+       $(GST_BASE_LIBS) $(GST_LIBS)
 
 AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 
@@ -36,3 +36,14 @@ all: all-am chmod
 
 chmod: $(bin_SCRIPTS)
        @chmod +x $^
+
+Android.mk: Makefile.am
+       androgenizer -:PROJECT gst-discoverer \
+        -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+        -:EXECUTABLE gst-discoverer -:TAGS eng debug \
+        -:SOURCES $(gst_discoverer_@GST_MAJORMINOR@_SOURCES) \
+        -:CFLAGS $(DEFS) $(AM_CFLAGS) \
+        -:LDFLAGS -lgstpbutils-@GST_MAJORMINOR@ -lgstvideo-@GST_MAJORMINOR@ \
+                  $(GST_BASE_LIBS) $(GST_LIBS) \
+        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+       > $@