[vala] doclets: Explicitly link against libvala-*.la
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] doclets: Explicitly link against libvala-*.la
- Date: Sun, 20 Aug 2017 11:16:36 +0000 (UTC)
commit 1c8e2dd46f609070d4378c7d18e54d5987795110
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sun Aug 20 12:59:53 2017 +0200
doclets: Explicitly link against libvala-*.la
https://bugzilla.gnome.org/show_bug.cgi?id=786534
valadoc/doclets/devhelp/Makefile.am | 3 ++-
valadoc/doclets/gtkdoc/Makefile.am | 3 ++-
valadoc/doclets/html/Makefile.am | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am
index 617708c..456826b 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 153d8b5..a1a3852 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 38a0005..43ae56e 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]