diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-06-15 16:06:36 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-06-15 16:06:36 +0200 |
| commit | a2b7a672b8826d9fb75f0889741c05ca76ce085f (patch) | |
| tree | ef634796155235ab30dced5bc687f90bb6e272d3 /gst/jp2kdecimator | |
| parent | 6acbe1894374a51954b6cebd31d74c515d23ea17 (diff) | |
| parent | a6c4f3ed4ef8a2ebc4f184a796e8230838bd99a4 (diff) | |
| download | gstreamer-plugins-bad-a2b7a672b8826d9fb75f0889741c05ca76ce085f.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
android/aacparse.mk
android/amrparse.mk
android/h264parse.mk
android/metadata.mk
android/qtmux.mk
android/sdpelem.mk
configure.ac
gst/qtmux/gstqtmux.c
win32/common/config.h
Diffstat (limited to 'gst/jp2kdecimator')
| -rw-r--r-- | gst/jp2kdecimator/Makefile.am | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gst/jp2kdecimator/Makefile.am b/gst/jp2kdecimator/Makefile.am index f967a657f..ad971b819 100644 --- a/gst/jp2kdecimator/Makefile.am +++ b/gst/jp2kdecimator/Makefile.am @@ -12,3 +12,17 @@ libgstjp2kdecimator_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstjp2kdecimator_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstjp2kdecimator.h jp2kcodestream.h + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstjp2kdecimator -:SHARED libgstjp2kdecimator \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstjp2kdecimator_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstjp2kdecimator_la_CFLAGS) \ + -:LDFLAGS $(libgstjp2kdecimator_la_LDFLAGS) \ + $(libgstjp2kdecimator_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ |