Update for g_type_class_add_private() deprecation in recent GLib

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

diff --git a/ext/qt/Makefile.am b/ext/qt/Makefile.am
index eb0b79d..cf2f761 100644 (file)
--- a/ext/qt/Makefile.am
+++ b/ext/qt/Makefile.am
@@ -1,48 +1,57 @@
-plugin_LTLIBRARIES = libgstqtsink.la
+plugin_LTLIBRARIES = libgstqmlgl.la
 
 noinst_HEADERS = \
        gstqsgtexture.h \
+       gstqtglutility.h \
        gstqtsink.h \
-       qtitem.h
+       gstqtsrc.h \
+       qtitem.h \
+       qtwindow.h
 
 moc_generated = \
        moc_qtitem.cc \
+       moc_qtwindow.cc \
        moc_gstqsgtexture.cc
 
 #anything generated by the Qt tools...
 BUILT_SOURCES = $(moc_generated)
 CLEANFILES = $(moc_generated)
 
-nodist_libgstqtsink_la_SOURCES = $(BUILT_SOURCES)
+nodist_libgstqmlgl_la_SOURCES = $(BUILT_SOURCES)
 
-libgstqtsink_la_SOURCES = \
+libgstqmlgl_la_SOURCES = \
        gstqsgtexture.cc \
+       gstqtglutility.cc \
        qtitem.cc \
+       qtwindow.cc \
        gstqtsink.cc \
        gstqtsink.h \
+       gstqtsrc.cc \
+       gstqtsrc.h \
+       gstqtgl.h \
        gstplugin.cc
 
-libgstqtsink_la_CXXFLAGS = \
-       -I$(top_srcdir)/gst-libs \
-       -I$(top_builddir)/gst-libs \
-       $(GST_CXXFLAGS) \
-       $(GST_BASE_CFLAGS) \
+libgstqmlgl_la_CXXFLAGS = \
+       $(GST_PLUGINS_BAD_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) \
-       $(QT_CFLAGS)
+       $(GST_GL_CFLAGS) \
+       $(GST_BASE_CFLAGS) \
+       $(GST_CXXFLAGS) \
+       $(QT_CFLAGS) \
+       $(GL_CFLAGS) -std=c++11
 
-libgstqtsink_la_LIBADD = \
-       $(GST_BASE_LIBS) \
+libgstqmlgl_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
-       $(QT_LIBS) \
-       $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \
-       -lgstvideo-$(GST_API_VERSION)
+       $(GST_GL_LIBS) \
+       -lgstvideo-$(GST_API_VERSION) \
+       $(GST_BASE_LIBS) \
+       $(QT_LIBS)
 
-libgstqtsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstqtsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstqmlgl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 
 $(moc_generated): moc_%.cc: %.h
-       @MOC@ -o $@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $<
+       @MOC@ -o $@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MOC_CPPFLAGS) $<
 
 ui-%.h: %.ui
        @UIC@ -o $@ $<