[grilo] build: Various srcdir != builddir fixes

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit 0fdf4ae361bdc55b2314e9191f3e5fa3ca3d15ea
Author: Colin Walters <walters verbum org>
Date:   Fri Aug 16 09:08:02 2013 -0400

    build: Various srcdir != builddir fixes
    
    gnome-ostree does it by default.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=706132

 src/Makefile.am |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 90e9667..c277f93 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,22 +8,22 @@
 # autogenerated files
 grl-marshal.h: grl-marshal.list
        $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix grl_marshal     \
-       --header grl-marshal.list > $@
+       --header $< > $@
 
-grl-marshal.c: grl-marshal.h grl-marshal.list
-       @echo "#include \"grl-marshal.h\"" > $@
+grl-marshal.c: grl-marshal.list grl-marshal.h
+       @echo "#include \"grl-marshal.h\"" > $  tmp
        $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix grl_marshal     \
-       --body grl-marshal.list >> $@
+       --body $< >> $  tmp && mv $  tmp $@
 
 enum_headers = grl-source.h grl-caps.h grl-operation-options.h data/grl-media.h
 
 grl-type-builtins.h: $(enum_headers) grl-type-builtins.h.template
-       $(AM_V_GEN) $(GLIB_MKENUMS) --template grl-type-builtins.h.template     \
-       $(enum_headers) > $@
+       $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/grl-type-builtins.h.template   \
+       $(addprefix $(srcdir)/,$(enum_headers)) > $@
 
 grl-type-builtins.c: grl-type-builtins.h $(enum_headers) grl-type-builtins.c.template
-       $(AM_V_GEN) $(GLIB_MKENUMS) --template grl-type-builtins.c.template     \
-       $(enum_headers) > $@
+       $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/grl-type-builtins.c.template   \
+       $(addprefix $(srcdir)/,$(enum_headers)) > $@
 
 lib_LTLIBRARIES = lib GRL_NAME@.la
 
@@ -142,7 +142,7 @@ Grl- GRL_MAJORMINOR@.gir: lib GRL_NAME@.la
 Grl_ GRL_MAJORMINOR_NORM@_gir_INCLUDES = GObject-2.0 GModule-2.0
 Grl_ GRL_MAJORMINOR_NORM@_gir_CFLAGS = $(lib GRL_NAME@_la_CFLAGS)
 Grl_ GRL_MAJORMINOR_NORM@_gir_LIBS = lib GRL_NAME@.la
-Grl_ GRL_MAJORMINOR_NORM@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+Grl_ GRL_MAJORMINOR_NORM@_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += Grl- GRL_MAJORMINOR@.gir
 
 girdir = @INTROSPECTION_GIRDIR@