Correctly pass linking flags to valadoc when building the folks-tp docs

It turns out that bgo#637090 was just us not passing the flags correctly
(one has to pass two flags to valadoc to get it to pass a single flag to
the doclet). See: bgo#637090

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 8719159..6dc3e47 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -41,17 +41,6 @@ valadoc_flags = \
        --package-version $(PACKAGE_VERSION) \
        $(NULL)
 
-# We need to modify LDFLAGS so that gtkdoc-scangobj can find the symbols when
-# it comes to link its scanning program. This is what gtk-doc.make does for
-# normal gtk-doc-enabled projects.
-# FIXME: An enhancement request has been filed against valadoc for it to do this
-# automatically for us: https://bugzilla.gnome.org/show_bug.cgi?id=637090
-LDFLAGS = \
-       $(abs_top_builddir)/folks/libfolks.la \
-       $(abs_top_builddir)/backends/telepathy/lib/libfolks-telepathy.la \
-       @LDFLAGS@ \
-       $(NULL)
-
 # folks documentation
 folks_doc_files = $(top_srcdir)/folks/*.vala
 folks_doc_deps = \
@@ -113,9 +102,8 @@ folks-telepathy-doc: $(folks_telepathy_doc_files)
 
 folks-telepathy-gtk-doc: $(folks_telepathy_doc_files)
        $(AM_V_GEN)$(VALADOC) \
-               -X -l \
-               -X $(top_builddir)/folks/.libs/libfolks.so \
-               -X $(top_builddir)/backends/telepathy/lib/.libs/libfolks-telepathy.so \
+               -X -l -X $(top_builddir)/folks/.libs/libfolks.so \
+               -X -l -X $(top_builddir)/backends/telepathy/lib/.libs/libfolks-telepathy.so \
                -o gtk-doc/folks-telepathy \
                --doclet=gtkdoc \
                $(valadoc_flags_folks_telepathy) \