matroska: use math-compat.h for NAN define

[platform/upstream/gst-plugins-good.git] / gst / matroska / Makefile.am

diff --git a/gst/matroska/Makefile.am b/gst/matroska/Makefile.am
index 195c680..960a831 100644 (file)
--- a/gst/matroska/Makefile.am
+++ b/gst/matroska/Makefile.am
@@ -8,6 +8,7 @@ libgstmatroska_la_SOURCES = \
        matroska-parse.c \
        matroska-ids.c \
        matroska-mux.c \
+       matroska-read-common.c \
        webm-mux.c \
        lzo.c
 
@@ -19,6 +20,7 @@ noinst_HEADERS = \
        matroska-parse.h \
        matroska-ids.h \
        matroska-mux.h \
+       matroska-read-common.h \
        webm-mux.h \
        lzo.h
 
@@ -28,29 +30,15 @@ libgstmatroska_la_CFLAGS = \
        $(GST_CFLAGS)
 libgstmatroska_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
-       -lgstriff-@GST_MAJORMINOR@ \
-       -lgstaudio-@GST_MAJORMINOR@ \
-       -lgsttag-@GST_MAJORMINOR@ \
-       -lgstpbutils-@GST_MAJORMINOR@ \
+       -lgstriff-@GST_API_VERSION@ \
+       -lgstaudio-@GST_API_VERSION@ \
+       -lgstvideo-@GST_API_VERSION@ \
+       -lgsttag-@GST_API_VERSION@ \
+       -lgstpbutils-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(ZLIB_LIBS) \
        $(BZ2_LIBS) \
        $(LIBM)
 libgstmatroska_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmatroska_la_LIBTOOLFLAGS = --tag=disable-static
-
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
-       androgenizer \
-       -:PROJECT libgstmatroska -:SHARED libgstmatroska \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstmatroska_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(libgstmatroska_la_CFLAGS) \
-        -:LDFLAGS $(libgstmatroska_la_LDFLAGS) \
-                  $(libgstmatroska_la_LIBADD) \
-                  -ldl \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
-       > $@
+libgstmatroska_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)