[rygel] doc: Headers are always in srcdir

[Jens Georg <jensgeorg src gnome org>]

commit cde4b3a9a83cd749221e0d65038e9075599526dd
Author: Jens Georg <mail jensge org>
Date:   Tue Sep 18 00:17:56 2012 +0200

    doc: Headers are always in srcdir
    
    We can't build vala out-of-tree, so rygel-*.h is always in $(srcdir)
    
    Conflicts:
    	doc/reference/librygel-renderer/Makefile.am

 doc/reference/librygel-core/Makefile.am     |    6 +++---
 doc/reference/librygel-renderer/Makefile.am |    6 +++---
 doc/reference/librygel-server/Makefile.am   |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/doc/reference/librygel-core/Makefile.am b/doc/reference/librygel-core/Makefile.am
index f0656bf..e28c711 100644
--- a/doc/reference/librygel-core/Makefile.am
+++ b/doc/reference/librygel-core/Makefile.am
@@ -29,16 +29,16 @@ VALADOC_FLAGS = --force \
 valadoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	$(AM_V_GEN)$(VALADOC) \
 		-o valadoc \
-		$(VALADOC_FLAGS) 2>/dev/null
+		$(VALADOC_FLAGS)
 
 gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	@rm -rf gtkdoc
 	$(AM_V_GEN)$(VALADOC) \
-		-X $(top_builddir)/src/librygel-core/rygel-core.h \
+		-X $(top_srcdir)/src/librygel-core/rygel-core.h \
 		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-1.0.so \
 		-o gtkdoc \
 		--doclet gtkdoc \
-		$(VALADOC_FLAGS) 2>/dev/null
+		$(VALADOC_FLAGS)
 
 clean-local:
 	rm -rf valadoc gtkdoc
diff --git a/doc/reference/librygel-renderer/Makefile.am b/doc/reference/librygel-renderer/Makefile.am
index bbcb5de..2e16640 100644
--- a/doc/reference/librygel-renderer/Makefile.am
+++ b/doc/reference/librygel-renderer/Makefile.am
@@ -33,17 +33,17 @@ VALADOC_FLAGS = --force \
 valadoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	$(AM_V_GEN)$(VALADOC) \
 		-o valadoc \
-		$(VALADOC_FLAGS) 2>/dev/null
+		$(VALADOC_FLAGS)
 
 gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	@rm -rf gtkdoc
 	$(AM_V_GEN)$(VALADOC) \
-		-X $(top_builddir)/src/librygel-renderer/rygel-renderer.h \
+		-X $(top_srcdir)/src/librygel-renderer/rygel-renderer.h \
 		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-1.0.so \
 		-X -l -X $(top_builddir)/src/librygel-renderer/.libs/librygel-renderer-1.0.so \
 		-o gtkdoc \
 		--doclet gtkdoc \
-		$(VALADOC_FLAGS) 2>/dev/null
+		$(VALADOC_FLAGS)
 
 clean-local:
 	rm -rf valadoc gtkdoc
diff --git a/doc/reference/librygel-server/Makefile.am b/doc/reference/librygel-server/Makefile.am
index 4e8b1fb..949ef8a 100644
--- a/doc/reference/librygel-server/Makefile.am
+++ b/doc/reference/librygel-server/Makefile.am
@@ -33,17 +33,17 @@ VALADOC_FLAGS = --force \
 valadoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	$(AM_V_GEN)$(VALADOC) \
 		-o valadoc \
-		$(VALADOC_FLAGS) 2>/dev/null
+		$(VALADOC_FLAGS)
 
 gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	@rm -rf gtkdoc
 	$(AM_V_GEN)$(VALADOC) \
-		-X $(top_builddir)/src/librygel-server/rygel-server.h \
+		-X $(top_srcdir)/src/librygel-server/rygel-server.h \
 		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-1.0.so \
 		-X -l -X $(top_builddir)/src/librygel-server/.libs/librygel-server-1.0.so \
 		-o gtkdoc \
 		--doclet gtkdoc \
-		$(VALADOC_FLAGS) 2>/dev/null
+		$(VALADOC_FLAGS)
 
 clean-local:
 	rm -rf valadoc gtkdoc