summaryrefslogtreecommitdiff
path: root/valadoc/doclets
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2017-08-20 12:59:53 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2017-08-20 12:59:53 +0200
commit1c8e2dd46f609070d4378c7d18e54d5987795110 (patch)
tree62596f45d5c283cc657df119e5679891df53f084 /valadoc/doclets
parentf1278166d5801f660a495df5ca11246bf68b691f (diff)
downloadvala-1c8e2dd46f609070d4378c7d18e54d5987795110.tar.gz
doclets: Explicitly link against libvala-*.la
https://bugzilla.gnome.org/show_bug.cgi?id=786534
Diffstat (limited to 'valadoc/doclets')
-rw-r--r--valadoc/doclets/devhelp/Makefile.am3
-rw-r--r--valadoc/doclets/gtkdoc/Makefile.am3
-rw-r--r--valadoc/doclets/html/Makefile.am3
3 files changed, 6 insertions, 3 deletions
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)