projects / profile / ivi / rygel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bbfd9b6)
doc: Headers are always in srcdir
authorJens Georg <mail@jensge.org>
Mon, 17 Sep 2012 22:17:56 +0000 (00:17 +0200)
committerJens Georg <mail@jensge.org>
Tue, 18 Sep 2012 14:41:31 +0000 (16:41 +0200)
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 patch | blob | history
doc/reference/librygel-renderer/Makefile.am patch | blob | history
doc/reference/librygel-server/Makefile.am patch | blob | history

diff --git a/doc/reference/librygel-core/Makefile.am b/doc/reference/librygel-core/Makefile.am
index f0656bf..e28c711 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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
Domain: Network & Connectivity / Uncategorized;