From 5f8633b6f3f40c6c84f3f87cd72ea4e5b1b02c75 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Wed, 22 Jul 2015 08:05:04 +0200
Subject: [PATCH] qt: Tidy up makefile a bit more

Separate generated files, from disted files
---
 ext/qt/Makefile.am | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/ext/qt/Makefile.am b/ext/qt/Makefile.am
index 5dc38dc085..f80fd6c6d8 100644
--- a/ext/qt/Makefile.am
+++ b/ext/qt/Makefile.am
@@ -1,29 +1,24 @@
-# preamble
-NULL =
+plugin_LTLIBRARIES = libqtsink.la
 
-moc_headers = \
-	qtitem.h \
+noinst_HEADERS = \
 	gstqsgtexture.h \
-	$(NULL)
+	gstqtsink.h \
+	qtitem.h
 
 moc_generated = \
 	moc_qtitem.cc \
-	moc_gstqsgtexture.cc \
-	$(NULL)
+	moc_gstqsgtexture.cc
 
 #anything generated by the Qt tools...
 BUILT_SOURCES = $(moc_generated)
 CLEANFILES = $(moc_generated)
 
-sources = \
+libqtsink_la_SOURCES = \
 	gstqsgtexture.cc \
 	qtitem.cc \
 	gstqtsink.cc \
 	gstqtsink.h \
-	gstplugin.cc \
-	$(moc_headers) \
-	$(moc_generated) \
-	$(NULL)
+	gstplugin.cc
 
 libqtsink_la_CXXFLAGS = \
 	-I$(top_srcdir)/gst-libs \
@@ -32,6 +27,7 @@ libqtsink_la_CXXFLAGS = \
 	$(GST_BASE_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(QT_CFLAGS)
+
 libqtsink_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
@@ -39,17 +35,15 @@ libqtsink_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \
 	-lgstvideo-$(GST_API_VERSION)
 
-libqtsink_la_SOURCES = $(sources)
 libqtsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libqtsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
-plugin_LTLIBRARIES = libqtsink.la
 
 $(moc_generated): moc_%.cc: %.h
-	@@MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $<
+	@MOC@ -o $@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $<
 
 ui-%.h: %.ui
-	@@UIC@ -o $@ $<
+	@UIC@ -o $@ $<
 
 qrc-%.cc: %.qrc
-	@@RCC@ -o $@ $<
+	@RCC@ -o $@ $<