Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / ext / gdk_pixbuf / Makefile.am

diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am
index cf5265c..32a82ef 100644 (file)
--- a/ext/gdk_pixbuf/Makefile.am
+++ b/ext/gdk_pixbuf/Makefile.am
@@ -1,12 +1,15 @@
 plugin_LTLIBRARIES = libgstgdkpixbuf.la
 
-libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c gstgdkpixbufsink.c pixbufscale.c
+libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c gstgdkpixbufsink.c pixbufscale.c \
+       gstgdkpixbufoverlay.c
 libgstgdkpixbuf_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
+       $(GST_CONTROLLER_CFLAGS) \
        $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS) $(GDK_PIXBUF_CFLAGS)
 libgstgdkpixbuf_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+       $(GST_CONTROLLER_LIBS) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) $(GDK_PIXBUF_LIBS)
 libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -14,6 +17,7 @@ libgstgdkpixbuf_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = \
        gstgdkpixbuf.h \
+       gstgdkpixbufoverlay.h \
        gstgdkpixbufsink.h \
        pixbufscale.h \
        gstgdkanimation.h