From 1669abc16f1032fc153308d0d15bbe876771b7c0 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sun, 7 Jan 2018 20:04:07 +0100 Subject: [PATCH] valadoc: Add coverage build-flags --- libvaladoc/Makefile.am | 3 +++ valadoc/Makefile.am | 3 +++ valadoc/doclets/devhelp/Makefile.am | 3 +++ valadoc/doclets/gtkdoc/Makefile.am | 3 +++ valadoc/doclets/html/Makefile.am | 3 +++ valadoc/tests/Makefile.am | 3 +++ 6 files changed, 18 insertions(+) diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am index 89245d86b..2a09d5d07 100644 --- a/libvaladoc/Makefile.am +++ b/libvaladoc/Makefile.am @@ -6,6 +6,7 @@ AM_CFLAGS = \ -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \ -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \ -DPACKAGE_VERSION=\"$(VERSION)\" \ + $(COVERAGE_CFLAGS) \ $(LIBGVC_CFLAGS) \ $(GLIB_CFLAGS) \ $(GMODULE_CFLAGS) \ @@ -173,6 +174,7 @@ libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) $(VALA_V)$(VALAC) \ + $(COVERAGE_VALAFLAGS) \ $(VALAFLAGS) \ --basedir $(srcdir) \ --directory $(builddir) \ @@ -193,6 +195,7 @@ libvaladoc@PACKAGE_SUFFIX@_la_LDFLAGS = \ $(NULL) libvaladoc@PACKAGE_SUFFIX@_la_LIBADD = \ + $(COVERAGE_LIBS) \ $(LIBGVC_LIBS) \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am index a830df857..33f3a9375 100644 --- a/valadoc/Makefile.am +++ b/valadoc/Makefile.am @@ -16,6 +16,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/ccode \ -I$(top_srcdir)/vala \ -I$(top_srcdir)/codegen \ + $(COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(GMODULE_CFLAGS) \ $(LIBGVC_CFLAGS) \ @@ -44,6 +45,7 @@ valadoc_LDADD = \ $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \ $(top_builddir)/ccode/libvalaccode.la \ $(top_builddir)/codegen/libvalaccodegen.la \ + $(COVERAGE_LIBS) \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ $(LIBGVC_LIBS) \ @@ -51,6 +53,7 @@ valadoc_LDADD = \ valadoc.vala.stamp: $(valadoc_VALASOURCES) $(top_srcdir)/vala/libvala@PACKAGE_SUFFIX@.vapi $(top_srcdir)/libvaladoc/valadoc@PACKAGE_SUFFIX@.vapi $(VALA_V)$(VALAC) \ + $(COVERAGE_VALAFLAGS) \ $(VALAFLAGS) \ -C \ --vapidir $(top_srcdir)/vala \ diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am index 21820786c..5783c0b5a 100644 --- a/valadoc/doclets/devhelp/Makefile.am +++ b/valadoc/doclets/devhelp/Makefile.am @@ -7,6 +7,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/gee/ \ -I$(top_srcdir)/vala/ \ -I$(top_srcdir)/libvaladoc/ \ + $(COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(LIBGVC_CFLAGS) \ $(NULL) @@ -30,6 +31,7 @@ libdoclet_la_SOURCES = \ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) $(VALA_V)$(VALAC) \ + $(COVERAGE_VALAFLAGS) \ $(VALAFLAGS) \ -C \ --vapidir $(top_srcdir)/vala --pkg libvala@PACKAGE_SUFFIX@ \ @@ -41,6 +43,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) libdoclet_la_LIBADD = \ $(top_builddir)/libvaladoc/libvaladoc@PACKAGE_SUFFIX@.la \ $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \ + $(COVERAGE_LIBS) \ $(GLIB_LIBS) \ $(NULL) diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am index 7cf7c1a97..763e46932 100644 --- a/valadoc/doclets/gtkdoc/Makefile.am +++ b/valadoc/doclets/gtkdoc/Makefile.am @@ -7,6 +7,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/gee/ \ -I$(top_srcdir)/vala/ \ -I$(top_srcdir)/libvaladoc/ \ + $(COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(LIBGVC_CFLAGS) \ $(NULL) @@ -35,6 +36,7 @@ libdoclet_la_SOURCES = \ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) $(VALA_V)$(VALAC) \ + $(COVERAGE_VALAFLAGS) \ $(VALAFLAGS) \ -C \ --vapidir $(top_srcdir)/vala --pkg libvala@PACKAGE_SUFFIX@ \ @@ -46,6 +48,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) libdoclet_la_LIBADD = \ $(top_builddir)/libvaladoc/libvaladoc@PACKAGE_SUFFIX@.la \ $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \ + $(COVERAGE_LIBS) \ $(GLIB_LIBS) \ $(NULL) diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am index 2fe2a87c9..885fbfbab 100644 --- a/valadoc/doclets/html/Makefile.am +++ b/valadoc/doclets/html/Makefile.am @@ -7,6 +7,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/gee/ \ -I$(top_srcdir)/vala/ \ -I$(top_srcdir)/libvaladoc/ \ + $(COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(LIBGVC_CFLAGS) \ $(NULL) @@ -30,6 +31,7 @@ libdoclet_la_SOURCES = \ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) $(VALA_V)$(VALAC) \ + $(COVERAGE_VALAFLAGS) \ $(VALAFLAGS) \ -C \ --vapidir $(top_srcdir)/vala --pkg libvala@PACKAGE_SUFFIX@ \ @@ -41,6 +43,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES) libdoclet_la_LIBADD = \ $(top_builddir)/libvaladoc/libvaladoc@PACKAGE_SUFFIX@.la \ $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \ + $(COVERAGE_LIBS) \ $(GLIB_LIBS) \ $(NULL) diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am index e18e15856..1c111295f 100644 --- a/valadoc/tests/Makefile.am +++ b/valadoc/tests/Makefile.am @@ -28,6 +28,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/ccode \ -I$(top_srcdir)/vala \ -I$(top_srcdir)/codegen \ + $(COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(GMODULE_CFLAGS) \ $(LIBGVC_CFLAGS) \ @@ -63,6 +64,7 @@ driver_LDADD = \ $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \ $(top_builddir)/ccode/libvalaccode.la \ $(top_builddir)/codegen/libvalaccodegen.la \ + $(COVERAGE_LIBS) \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ $(LIBGVC_LIBS) \ @@ -70,6 +72,7 @@ driver_LDADD = \ driver.vala.stamp: $(driver_VALASOURCES) $(top_srcdir)/vala/libvala@PACKAGE_SUFFIX@.vapi $(top_srcdir)/libvaladoc/valadoc@PACKAGE_SUFFIX@.vapi $(VALA_V)$(VALAC) \ + $(COVERAGE_VALAFLAGS) \ $(VALAFLAGS) \ -C \ --vapidir $(top_srcdir)/vapi \ -- 2.47.2