doclets: Explicitly link against libvala-*.la

https://bugzilla.gnome.org/show_bug.cgi?id=786534

diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am
index 617708c892ea10867dfbcd7f29899327066d8203..456826ba40b39720807a145cb7f3b4c254205c75 100644 (file)
--- a/valadoc/doclets/devhelp/Makefile.am
+++ b/valadoc/doclets/devhelp/Makefile.am
@@ -31,7 +31,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
        $(VALA_V)$(VALAC) \
                $(VALAFLAGS) \
                -C \
-               --vapidir $(top_srcdir)/vala \
+               --vapidir $(top_srcdir)/vala --pkg libvala@PACKAGE_SUFFIX@ \
                --vapidir $(top_srcdir)/vapi \
                --vapidir $(top_srcdir)/libvaladoc --pkg valadoc@PACKAGE_SUFFIX@ \
                $(filter %.vala %.c,$^)
@@ -39,6 +39,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
 
 libdoclet_la_LIBADD = \
        $(top_builddir)/libvaladoc/libvaladoc@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \
        $(GLIB_LIBS) \
        $(NULL)
 

diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am
index 153d8b5ddc0b67fc9467a951b1eecae77506993a..a1a3852e5176d5f9f5281049dd2d3002ebd44cfc 100644 (file)
--- a/valadoc/doclets/gtkdoc/Makefile.am
+++ b/valadoc/doclets/gtkdoc/Makefile.am
@@ -36,7 +36,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
        $(VALA_V)$(VALAC) \
                $(VALAFLAGS) \
                -C \
-               --vapidir $(top_srcdir)/vala \
+               --vapidir $(top_srcdir)/vala --pkg libvala@PACKAGE_SUFFIX@ \
                --vapidir $(top_srcdir)/vapi \
                --vapidir $(top_srcdir)/libvaladoc --pkg valadoc@PACKAGE_SUFFIX@ \
                $(filter %.vala %.c,$^)
@@ -44,6 +44,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
 
 libdoclet_la_LIBADD = \
        $(top_builddir)/libvaladoc/libvaladoc@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \
        $(GLIB_LIBS) \
        $(NULL)
 

diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am
index 38a00052d72fa5458b34efab77145cda7b8ef1bc..43ae56e37f165b10a638981130abb7b0d302b9b4 100644 (file)
--- a/valadoc/doclets/html/Makefile.am
+++ b/valadoc/doclets/html/Makefile.am
@@ -31,7 +31,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
        $(VALA_V)$(VALAC) \
                $(VALAFLAGS) \
                -C \
-               --vapidir $(top_srcdir)/vala \
+               --vapidir $(top_srcdir)/vala --pkg libvala@PACKAGE_SUFFIX@ \
                --vapidir $(top_srcdir)/vapi \
                --vapidir $(top_srcdir)/libvaladoc --pkg valadoc@PACKAGE_SUFFIX@ \
                $(filter %.vala %.c,$^)
@@ -39,6 +39,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
 
 libdoclet_la_LIBADD = \
        $(top_builddir)/libvaladoc/libvaladoc@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \
        $(GLIB_LIBS) \
        $(NULL)