Trying to make coverage work with coveralls

Sebastiano Merlino · Sebastiano Merlino · commit 57a23a103544 · 2015-01-13T01:01:15.000Z
diff --git a/configure.ac b/configure.ac
@@ -33,7 +33,7 @@ AC_CONFIG_MACRO_DIR([m4])
 OLD_CXXFLAGS=$CXXFLAGS
 LT_INIT
 AC_PROG_CC
-AC_PROG_CXX([clang])
+AC_PROG_CXX([clang++])
 AC_PROG_LN_S
 CXXFLAGS=$OLD_CXXFLAGS
 AC_LANG([C++])
@@ -122,18 +122,25 @@ AC_MSG_RESULT([$debugit])
 
 AM_CONDITIONAL([COND_GCOV],[test x"$debugit" = x"yes"])
 
+AM_LDFLAGS="-lstdc++"
+
 if test x"$debugit" = x"yes"; then
+    AC_CHECK_PROG(GCOV, gcov, gcov)
+
     AC_DEFINE([DEBUG],[],[Debug Mode])
     AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG -g -Wall -Wno-uninitialized -O0"
-#    LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
-#    LIBS="-lgcov"
+    AM_CFLAGS="$AM_CXXFLAGS -DDEBUG -g -Wall -Wno-uninitialized -O0"
+
+    AC_SUBST(GCOV)
 else
     AC_DEFINE([NDEBUG],[],[No-debug Mode])
     AM_CXXFLAGS="$AM_CXXFLAGS -O3"
+    AM_CFLAGS="$AM_CXXFLAGS -O3"
 fi
 
 if test x"have_gnutls" = x"yes"; then
     AM_CXXFLAGS="$AM_CXXFLAGS -DHAVE_GNUTLS"
+    AM_CFLAGS="$AM_CXXFLAGS -DHAVE_GNUTLS"
 fi
 
 AC_MSG_CHECKING([whether to use c++0x std classes])
@@ -147,6 +154,7 @@ AC_MSG_RESULT([$cpp11])
 if test x"$cpp11" = x"yes"; then
     AC_DEFINE([CPP11],[],[c++11 Mode])
     AM_CXXFLAGS="$AM_CXXFLAGS -DUSE_CPP_11 --std=c++11"
+    AM_CFLAGS="$AM_CXXFLAGS -DUSE_CPP_11 --std=c++11"
 else
     AC_DEFINE([NCPP11],[],[standard Mode])
 fi
@@ -165,6 +173,8 @@ LDFLAGS="$LDFLAGS -version-number libhttpserver_LDF_VERSION"
 
 AC_SUBST(LHT_LIBDEPS)
 AC_SUBST(AM_CXXFLAGS)
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_LDFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LIBS)
 AC_SUBST(LDFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -22,9 +22,19 @@ lib_LTLIBRARIES = libhttpserver.la
 libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp http_request.cpp http_response.cpp http_resource.cpp details/comet_manager.cpp details/http_endpoint.cpp
 noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp httpserver/details/cache_entry.hpp httpserver/details/comet_manager.hpp gettext.h
 nobase_include_HEADERS = httpserver.hpp httpserver/create_webserver.hpp httpserver/webserver.hpp httpserver/http_utils.hpp httpserver/details/http_endpoint.hpp httpserver/http_request.hpp httpserver/http_response.hpp httpserver/http_resource.hpp httpserver/binders.hpp httpserver/event_supplier.hpp httpserver/details/event_tuple.hpp httpserver/details/http_resource_mirror.hpp httpserver/http_response_builder.hpp
+
 AM_CXXFLAGS += -fPIC -Wall
+
+if COND_GCOV
+AM_CFLAGS += -O0 --coverage
+AM_CXXFLAGS += -O0 --coverage
+AM_LDFLAGS += -O0 --coverage -lgcov
+endif
+
 libhttpserver_la_LIBADD = -lmicrohttpd
-libhttpserver_la_LDFLAGS =
+libhttpserver_la_CFLAGS = $(AM_CFLAGS)
+libhttpserver_la_CXXFLAGS = $(AM_CXXFLAGS)
+libhttpserver_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
 
 install-data-hook:
 	(mkdir -p $(DESTDIR)$(includedir) && cd $(DESTDIR)$(includedir) && $(LN_S) -f httpserver.hpp httpserverpp)
