From fc8a0d121c157720ae25b684f28e909e79d56e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <victorx.jaquez@intel.com>
Date: Thu, 24 Sep 2015 10:35:44 +0000
Subject: [PATCH] build: declare real built files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When runnig the `make dist` target from a clean tree, it fails because
if could not find the copied files from codecparsers submodule.

They weren't copied because they weren't declared as built sources.

This patch removes the stamp mechanism and use the actual file list to copy
as the built sources. Also it fixes the duplication of the parser files.

Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com>

https://bugzilla.gnome.org/show_bug.cgi?id=755525
---
 gst/vaapi/Makefile.am | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am
index 95001bd377..7a5f31a0f6 100644
--- a/gst/vaapi/Makefile.am
+++ b/gst/vaapi/Makefile.am
@@ -185,13 +185,12 @@ libgstvaapi_1_4p_parse_gen_source_h = \
 	$(NULL)
 
 libgstvaapi_parse_gen_sources = \
-	$(libgstvaapi_parse_gen_source_c) \
-	$(libgstvaapi_parse_gen_source_h) \
+	$(libgstvaapi_parse_gen_source_c) 	\
+	$(libgstvaapi_parse_gen_source_h) 	\
+	$(libgstvaapi_1_4p_parse_gen_source_c)	\
+	$(libgstvaapi_1_4p_parse_gen_source_h)	\
 	$(NUL)
 
-libgstvaapi_parse_gen_sources += $(libgstvaapi_1_4p_parse_gen_source_c)
-libgstvaapi_parse_gen_sources += $(libgstvaapi_1_4p_parse_gen_source_h)
-
 libgstvaapi_parse_source_c = gstvaapiparse.c $(libgstvaapi_parse_gen_source_c)
 libgstvaapi_parse_source_h = gstvaapiparse.h $(libgstvaapi_parse_gen_source_h)
 
@@ -233,17 +232,21 @@ videoparsers_patches_dir = \
 include $(videoparsers_patches_dir)/series.frag
 videoparsers_patches = \
 	$(videoparsers_patches_base:%=$(top_srcdir)/patches/videoparsers/%)
+videoparsers_orig_sources = \
+	$(libgstvaapi_parse_gen_sources:%=$(videoparsers_sources_dir)/%)
 
-videoparsers.prepare.stamp: $(videoparsers_patches)
-	@for f in $(libgstvaapi_parse_gen_sources); do	\
-	  cp -f $(videoparsers_sources_dir)/$$f $$f;	\
-	done
-	@for f in $(videoparsers_patches); do		\
-	  patch -p3 < $$f;				\
+$(libgstvaapi_parse_gen_sources): $(videoparsers_orig_sources)
+	cp -f $(videoparsers_sources_dir)/$@ $@
+
+videoparsers.prepare.stamp: $(videoparsers_patches) $(libgstvaapi_parse_gen_sources)
+	@for f in $(videoparsers_patches); do	\
+	   patch -p3 < $$f;			\
 	done
 	@touch $@
 
-BUILT_SOURCES += videoparsers.prepare.stamp
+BUILT_SOURCES += \
+	$(libgstvaapi_parse_gen_sources) \
+	videoparsers.prepare.stamp
 endif
 
 CLEANFILES = \