diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2011-02-20 11:14:04 +0000 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2011-02-20 11:14:04 +0000 |
| commit | 9d1306e5b78a1291e35a24e2200fbb8548f73f19 (patch) | |
| tree | 965b3d7977e31961b5b7b16a23ae82f99e753378 /docs | |
| parent | 8f37599b1d980faddda95f589e028806fc2f431f (diff) | |
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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.am | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index 87191595..6dc3e473 100644 --- 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) \ |