[latexila] build: port from GNOME_CODE_COVERAGE to AX_CODE_COVERAGE
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [latexila] build: port from GNOME_CODE_COVERAGE to AX_CODE_COVERAGE
- Date: Tue, 20 Dec 2016 12:13:32 +0000 (UTC)
commit 801bbfac02037c42ddaa61ae6b201958affe783a
Author: Sébastien Wilmet <swilmet gnome org>
Date: Tue Dec 20 12:42:22 2016 +0100
build: port from GNOME_CODE_COVERAGE to AX_CODE_COVERAGE
https://wiki.gnome.org/Projects/GnomeCommon/Migration
Makefile.am | 5 ++---
configure.ac | 4 ++--
src/liblatexila/Makefile.am | 11 +++++++----
tests/Makefile.am | 2 +-
4 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 48a5d5b..00a9016 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
SUBDIRS = data man po help src tests docs
+@CODE_COVERAGE_RULES@
+
AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
--enable-introspection \
@@ -50,7 +52,6 @@ MAINTAINERCLEANFILES = \
m4/gettext.m4 \
m4/glibc21.m4 \
m4/glibc2.m4 \
- m4/gnome-code-coverage.m4 \
m4/gsettings.m4 \
m4/gtk-doc.m4 \
m4/iconv.m4 \
@@ -100,6 +101,4 @@ MAINTAINERCLEANFILES = \
test-driver \
`find "$(srcdir)" -type f -name Makefile.in -print`
-@GNOME_CODE_COVERAGE_RULES@
-
-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 36cd2f8..09748a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,8 +134,8 @@ VAPIGEN_CHECK
AX_REQUIRE_DEFINED([GTK_DOC_CHECK])
GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
-AX_REQUIRE_DEFINED([GNOME_CODE_COVERAGE])
-GNOME_CODE_COVERAGE
+AX_REQUIRE_DEFINED([AX_CODE_COVERAGE])
+AX_CODE_COVERAGE
AX_REQUIRE_DEFINED([APPSTREAM_XML])
APPSTREAM_XML
diff --git a/src/liblatexila/Makefile.am b/src/liblatexila/Makefile.am
index 3f77db7..81b9d51 100644
--- a/src/liblatexila/Makefile.am
+++ b/src/liblatexila/Makefile.am
@@ -1,19 +1,22 @@
-@GNOME_CODE_COVERAGE_RULES@
+@CODE_COVERAGE_RULES@
noinst_LTLIBRARIES = liblatexila.la
+liblatexila_la_CPPFLAGS = \
+ $(CODE_COVERAGE_CPPFLAGS)
+
liblatexila_la_CFLAGS = \
$(LATEXILA_CFLAGS) \
$(WARN_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-I$(top_builddir)/src/evince
-liblatexila_la_LDFLAGS = \
- $(WARN_LDFLAGS) \
- $(CODE_COVERAGE_LDFLAGS)
+liblatexila_la_LDFLAGS = \
+ $(WARN_LDFLAGS)
liblatexila_la_LIBADD = \
$(LATEXILA_LIBS) \
+ $(CODE_COVERAGE_LIBS) \
../evince/libevince.la
liblatexila_headers = \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 564332d..fb2226f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-@GNOME_CODE_COVERAGE_RULES@
+@CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
-I$(top_srcdir) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]