From 536ef750a7c2e884f4b2377d19ee6b293787be54 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 15 Jun 2009 02:32:01 +0000 Subject: bld fixes --- src/arm/Makefile.am | 5 +++-- src/core/Makefile.am | 5 +++-- src/hello/Makefile.am | 5 +++-- src/hostlist/Makefile.am | 2 +- src/peerinfo/Makefile.am | 6 ++++-- src/resolver/Makefile.am | 5 +++-- src/statistics/Makefile.am | 5 +++-- src/topology/Makefile.am | 2 +- src/transport/Makefile.am | 2 +- src/util/Makefile.am | 5 +++-- 10 files changed, 25 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am index 65fa145ee..18ec95d90 100644 --- a/src/arm/Makefile.am +++ b/src/arm/Makefile.am @@ -5,7 +5,8 @@ if MINGW endif if USE_COVERAGE - AM_CFLAGS = -fprofile-arcs -ftest-coverage + AM_CFLAGS = --coverage -O0 + XLIB = -lgcov endif lib_LTLIBRARIES = libgnunetarm.la @@ -14,7 +15,7 @@ libgnunetarm_la_SOURCES = \ arm_api.c arm.h libgnunetarm_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBINTL) + $(GN_LIBINTL) $(XLIB) libgnunetarm_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 0:0:0 diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 4dba41b69..4c600c4fe 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -5,7 +5,8 @@ if MINGW endif if USE_COVERAGE - AM_CFLAGS = -fprofile-arcs -ftest-coverage + AM_CFLAGS = --coverage -O0 + XLIB = -lgcov endif @@ -17,7 +18,7 @@ libgnunetcore_la_SOURCES = \ libgnunetcore_la_LIBADD = \ $(top_builddir)/src/arm/libgnunetarm.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBINTL) + $(GN_LIBINTL) $(XLIB) libgnunetcore_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 0:0:0 diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am index cffb7201c..c831ecbbc 100644 --- a/src/hello/Makefile.am +++ b/src/hello/Makefile.am @@ -5,7 +5,8 @@ if MINGW endif if USE_COVERAGE - AM_CFLAGS = --coverage + AM_CFLAGS = --coverage -O0 + XLIB = -lgcov endif lib_LTLIBRARIES = libgnunethello.la @@ -13,7 +14,7 @@ lib_LTLIBRARIES = libgnunethello.la libgnunethello_la_SOURCES = \ hello.c libgnunethello_la_LIBADD = \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la $(XLIB) check_PROGRAMS = \ test_hello diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index 911c086ac..c1398891c 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/src/include if USE_COVERAGE - AM_CFLAGS = -fprofile-arcs -ftest-coverage + AM_CFLAGS = --coverage -O0 endif diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 294ff5cca..7512552d0 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am @@ -5,7 +5,8 @@ if MINGW endif if USE_COVERAGE - AM_CFLAGS = -fprofile-arcs -ftest-coverage + AM_CFLAGS = --coverage -O0 + XLIB = -lgcov endif lib_LTLIBRARIES = libgnunetpeerinfo.la @@ -14,7 +15,8 @@ libgnunetpeerinfo_la_SOURCES = \ peerinfo_api.c peerinfo.h libgnunetpeerinfo_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/util/libgnunetutil.la + $(top_builddir)/src/util/libgnunetutil.la \ + $(XLIB) libgnunetpeerinfo_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 0:0:0 diff --git a/src/resolver/Makefile.am b/src/resolver/Makefile.am index 20c07f4da..72f188011 100644 --- a/src/resolver/Makefile.am +++ b/src/resolver/Makefile.am @@ -5,7 +5,8 @@ if MINGW endif if USE_COVERAGE - AM_CFLAGS = -fprofile-arcs -ftest-coverage + AM_CFLAGS = --coverage -O0 + XLIB = -lgcov endif @@ -15,7 +16,7 @@ libgnunetresolver_la_SOURCES = \ resolver_api.c resolver.h libgnunetresolver_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBINTL) + $(GN_LIBINTL) $(XLIB) libgnunetresolver_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 0:0:0 diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am index 2ae254cbf..9bc4327af 100644 --- a/src/statistics/Makefile.am +++ b/src/statistics/Makefile.am @@ -5,7 +5,8 @@ if MINGW endif if USE_COVERAGE - AM_CFLAGS = -fprofile-arcs -ftest-coverage + AM_CFLAGS = --coverage -O0 + XLIB = -lgcov endif @@ -15,7 +16,7 @@ libgnunetstatistics_la_SOURCES = \ statistics_api.c statistics.h libgnunetstatistics_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBINTL) + $(GN_LIBINTL) $(XLIB) libgnunetstatistics_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 0:0:0 diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index fad32ed79..0ac513839 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/src/include if USE_COVERAGE - AM_CFLAGS = -fprofile-arcs -ftest-coverage + AM_CFLAGS = --coverage -O0 endif diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 4d682c60d..88d43e279 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -7,7 +7,7 @@ if MINGW endif if USE_COVERAGE - AM_CFLAGS = -fprofile-arcs -ftest-coverage + AM_CFLAGS = --coverage -O0 endif diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 9ecb3e469..64178e538 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -8,7 +8,8 @@ if MINGW endif if USE_COVERAGE - AM_CFLAGS = --coverage + AM_CFLAGS = --coverage -O0 + XLIB = -lgcov endif lib_LTLIBRARIES = libgnunetutil.la @@ -53,7 +54,7 @@ libgnunetutil_la_SOURCES = \ libgnunetutil_la_LIBADD = \ $(GCLIBADD) \ $(LIBGCRYPT_LIBS) \ - -lgmp -lltdl -lz -lextractor + -lgmp -lltdl -lz -lextractor $(XLIB) libgnunetutil_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -- cgit v1.2.3