Merge branch 'master' into 0.11

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

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 3407e39..dcb8c93 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -56,7 +56,6 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstcaps.c               \
        gstchildproxy.c         \
        gstclock.c              \
-       gstcontext.c            \
        gstdatetime.c           \
        gstdebugutils.c         \
        gstelement.c            \
@@ -69,7 +68,6 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
        gstindex.c              \
        gstindexfactory.c       \
        gstinfo.c               \
-       gstinterface.c          \
        gstiterator.c           \
        gstatomicqueue.c        \
        gstmessage.c            \
@@ -131,7 +129,6 @@ libgstreamer_@GST_MAJORMINOR@_la_LIBADD =           \
        $(GST_PARSE_LA)                                 \
        $(GST_ALL_LIBS)                                 \
        $(WIN32_LIBS)                                   \
-       $(XML_LIBS)                                     \
        $(LIBM)
 
 libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS =             \
@@ -152,7 +149,6 @@ gst_headers =                       \
        gstchildproxy.h         \
        gstclock.h              \
        gstcompat.h             \
-       gstcontext.h            \
        gstdatetime.h           \
        gstdebugutils.h         \
        gstelement.h            \
@@ -166,7 +162,6 @@ gst_headers =                       \
        gstindex.h              \
        gstindexfactory.h       \
        gstinfo.h               \
-       gstinterface.h          \
        gstiterator.h           \
        gstatomicqueue.h        \
        gstmacros.h             \
@@ -279,6 +274,7 @@ Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@
                -I$(top_srcdir) \
                -I$(top_builddir) \
                -DIN_GOBJECT_INTROSPECTION=1 \
+               -DGST_USE_UNSTABLE_API \
                --c-include='gst/gst.h' \
                --library=libgstreamer-0.11.la \
                --include=GLib-2.0 \