|
From: Kouhei S. <nul...@cl...> - 2014-01-23 15:42:55
|
Kouhei Sutou 2014-01-24 00:42:35 +0900 (Fri, 24 Jan 2014) New Revision: 3102fc572863817725a4650e4ce59f5ed48074b3 https://github.com/clear-code/cutter/commit/3102fc572863817725a4650e4ce59f5ed48074b3 Message: Add missing -lgcov to linker flags for coverage It is required for C++ programs. Modified files: cppcutter/Makefile.am cutter/Makefile.am m4macros/cutter.m4 soupcutter/Makefile.am test/cppcutter/Makefile.am test/fixtures/loader/cpp-fixture/Makefile.am test/fixtures/loader/cpp/Makefile.am Modified: cppcutter/Makefile.am (+2 -1) =================================================================== --- cppcutter/Makefile.am 2014-01-24 00:42:03 +0900 (3842a25) +++ cppcutter/Makefile.am 2014-01-24 00:42:35 +0900 (8af4b32) @@ -50,7 +50,8 @@ libcppcutter_la_LDFLAGS = \ libcppcutter_la_LIBADD = \ $(top_builddir)/cutter/libcutter.la \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(COVERAGE_LIBS) echo-public-headers: @for header in $(cppcutter_include_HEADERS); do \ Modified: cutter/Makefile.am (+2 -1) =================================================================== --- cutter/Makefile.am 2014-01-24 00:42:03 +0900 (c4d0745) +++ cutter/Makefile.am 2014-01-24 00:42:35 +0900 (659828a) @@ -194,7 +194,8 @@ libcutter_la_LIBADD = \ $(top_builddir)/gcutter/libgcutter.la \ $(GLIB_LIBS) \ $(BFD_LIBS) \ - $(WINDOWS_LIBS) + $(WINDOWS_LIBS) \ + $(COVERAGE_LIBS) if GLIB_2_12 libcutter_la_LIBADD += \ Modified: m4macros/cutter.m4 (+3 -0) =================================================================== --- m4macros/cutter.m4 2014-01-24 00:42:03 +0900 (6b1324b) +++ m4macros/cutter.m4 2014-01-24 00:42:35 +0900 (1642289) @@ -48,10 +48,13 @@ AC_DEFUN([AC_CHECK_COVERAGE], AC_CHECK_ENABLE_COVERAGE COVERAGE_CFLAGS= + COVERAGE_LIBS= if test "$cutter_enable_coverage" = "yes"; then COVERAGE_CFLAGS="--coverage" + COVERAGE_LIBS="-lgcov" fi AC_SUBST(COVERAGE_CFLAGS) + AC_SUBST(COVERAGE_LIBS) AM_CONDITIONAL([ENABLE_COVERAGE], [test "$cutter_enable_coverage" = "yes"]) COVERAGE_INFO_FILE="coverage.info" Modified: soupcutter/Makefile.am (+2 -1) =================================================================== --- soupcutter/Makefile.am 2014-01-24 00:42:03 +0900 (2e5371b) +++ soupcutter/Makefile.am 2014-01-24 00:42:35 +0900 (2bb6f38) @@ -40,7 +40,8 @@ libsoupcutter_la_LDFLAGS = \ libsoupcutter_la_LIBADD = \ $(top_builddir)/cutter/libcutter.la \ - $(LIBSOUP_LIBS) + $(LIBSOUP_LIBS) \ + $(COVERAGE_LIBS) echo-public-headers: @for header in $(soupcutter_include_HEADERS); do \ Modified: test/cppcutter/Makefile.am (+2 -1) =================================================================== --- test/cppcutter/Makefile.am 2014-01-24 00:42:03 +0900 (7182eaa) +++ test/cppcutter/Makefile.am 2014-01-24 00:42:35 +0900 (14eb84f) @@ -25,7 +25,8 @@ LIBS = \ $(top_builddir)/cutter/libcutter.la \ $(top_builddir)/cppcutter/libcppcutter.la \ $(top_builddir)/test/lib/libcuttest-utils.la \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(COVERAGE_LIBS) test_cppcut_la_SOURCES = \ test-cppcut-assertions.cpp \ Modified: test/fixtures/loader/cpp-fixture/Makefile.am (+2 -1) =================================================================== --- test/fixtures/loader/cpp-fixture/Makefile.am 2014-01-24 00:42:03 +0900 (3d8751d) +++ test/fixtures/loader/cpp-fixture/Makefile.am 2014-01-24 00:42:35 +0900 (6a8c5b9) @@ -25,7 +25,8 @@ LIBS = \ $(top_builddir)/gcutter/libgcutter.la \ $(top_builddir)/cppcutter/libcppcutter.la \ $(GLIB_LIBS) \ - $(GIO_LIBS) + $(GIO_LIBS) \ + $(COVERAGE_LIBS) with_prefix_la_SOURCES = with-prefix.cpp without_prefix_la_SOURCES = without-prefix.cpp Modified: test/fixtures/loader/cpp/Makefile.am (+2 -1) =================================================================== --- test/fixtures/loader/cpp/Makefile.am 2014-01-24 00:42:03 +0900 (6660168) +++ test/fixtures/loader/cpp/Makefile.am 2014-01-24 00:42:35 +0900 (8a11ad2) @@ -26,7 +26,8 @@ LIBS = \ $(top_builddir)/gcutter/libgcutter.la \ $(top_builddir)/cppcutter/libcppcutter.la \ $(GLIB_LIBS) \ - $(GIO_LIBS) + $(GIO_LIBS) \ + $(COVERAGE_LIBS) stub_namespace_la_SOURCES = stub-namespace.cpp stub_multi_namespace_la_SOURCES = stub-multi-namespace.cpp |