From 2cc88f1140ffa774371b877d723dfaf9e33a6ce5 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Thu, 15 Oct 2009 19:12:34 +0100
Subject: [PATCH] [build] fix Makefile.am.{enums,marshal} to support out of
 tree builds

Out of tree builds were broken in commit 46b736f42e1165 since we didn't
explicitly use $(srcdir) to find the input files for glib-mkenums and
glib-genmarshal.
---
 build/autotools/Makefile.am.enums   | 4 ++--
 build/autotools/Makefile.am.marshal | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/autotools/Makefile.am.enums b/build/autotools/Makefile.am.enums
index 208dee30c..8851b6b02 100644
--- a/build/autotools/Makefile.am.enums
+++ b/build/autotools/Makefile.am.enums
@@ -25,7 +25,7 @@ EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
 
 stamp-enum-types: $(glib_enum_headers)
 	$(QUIET_GEN)$(GLIB_MKENUMS) \
-		--template $(enum_tmpl_h) \
+		--template $(srcdir)/$(enum_tmpl_h) \
 	$(glib_enum_headers) > xgen-eh \
 	&& (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
 	&& rm -f xgen-eh \
@@ -36,7 +36,7 @@ $(glib_enum_h): stamp-enum-types
 
 $(glib_enum_c): $(glib_enum_h)
 	$(QUIET_GEN)$(GLIB_MKENUMS) \
-		--template $(enum_tmpl_c) \
+		--template $(srcdir)/$(enum_tmpl_c) \
 	$(glib_enum_headers) > xgen-ec \
 	&& cp -f xgen-ec $(glib_enum_c) \
 	&& rm -f xgen-ec
diff --git a/build/autotools/Makefile.am.marshal b/build/autotools/Makefile.am.marshal
index c3f62a150..a1e1070d6 100644
--- a/build/autotools/Makefile.am.marshal
+++ b/build/autotools/Makefile.am.marshal
@@ -26,7 +26,7 @@ stamp-marshal: $(glib_marshal_list)
 	$(QUIET_GEN)$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
 		--header \
-	$(glib_marshal_list) > xgen-mh \
+	$(srcdir)/$(glib_marshal_list) > xgen-mh \
 	&& (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
 	&& rm -f xgen-mh \
 	&& echo timestamp > $(@F)
@@ -39,6 +39,6 @@ $(marshal_c): $(marshal_h)
 	$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
 		--body \
-	$(glib_marshal_list)) > xgen-mc \
+	$(srcdir)/$(glib_marshal_list)) > xgen-mc \
 	&& cp xgen-mc $(marshal_c) \
 	&& rm -f xgen-mc