From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 20 Aug 2017 10:59:53 +0000 (+0200)
Subject: doclets: Explicitly link against libvala-*.la
X-Git-Tag: 0.37.90~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c8e2dd46f609070d4378c7d18e54d5987795110;p=thirdparty%2Fvala.git

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 617708c89..456826ba4 100644
--- 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 153d8b5dd..a1a3852e5 100644
--- 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 38a00052d..43ae56e37 100644
--- 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)