diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-06-15 02:32:01 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-06-15 02:32:01 +0000 |
commit | 536ef750a7c2e884f4b2377d19ee6b293787be54 (patch) | |
tree | d0095d985845a645a10c62c73745c8b731903cb4 /src | |
parent | c72852ac6e78c7849af544731b4e79b774c9371a (diff) | |
download | gnunet-536ef750a7c2e884f4b2377d19ee6b293787be54.tar.gz gnunet-536ef750a7c2e884f4b2377d19ee6b293787be54.zip |
bld fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/arm/Makefile.am | 5 | ||||
-rw-r--r-- | src/core/Makefile.am | 5 | ||||
-rw-r--r-- | src/hello/Makefile.am | 5 | ||||
-rw-r--r-- | src/hostlist/Makefile.am | 2 | ||||
-rw-r--r-- | src/peerinfo/Makefile.am | 6 | ||||
-rw-r--r-- | src/resolver/Makefile.am | 5 | ||||
-rw-r--r-- | src/statistics/Makefile.am | 5 | ||||
-rw-r--r-- | src/topology/Makefile.am | 2 | ||||
-rw-r--r-- | src/transport/Makefile.am | 2 | ||||
-rw-r--r-- | src/util/Makefile.am | 5 |
10 files changed, 25 insertions, 17 deletions
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 | |||
5 | endif | 5 | endif |
6 | 6 | ||
7 | if USE_COVERAGE | 7 | if USE_COVERAGE |
8 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 8 | AM_CFLAGS = --coverage -O0 |
9 | XLIB = -lgcov | ||
9 | endif | 10 | endif |
10 | 11 | ||
11 | lib_LTLIBRARIES = libgnunetarm.la | 12 | lib_LTLIBRARIES = libgnunetarm.la |
@@ -14,7 +15,7 @@ libgnunetarm_la_SOURCES = \ | |||
14 | arm_api.c arm.h | 15 | arm_api.c arm.h |
15 | libgnunetarm_la_LIBADD = \ | 16 | libgnunetarm_la_LIBADD = \ |
16 | $(top_builddir)/src/util/libgnunetutil.la \ | 17 | $(top_builddir)/src/util/libgnunetutil.la \ |
17 | $(GN_LIBINTL) | 18 | $(GN_LIBINTL) $(XLIB) |
18 | libgnunetarm_la_LDFLAGS = \ | 19 | libgnunetarm_la_LDFLAGS = \ |
19 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 20 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
20 | -version-info 0:0:0 | 21 | -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 | |||
5 | endif | 5 | endif |
6 | 6 | ||
7 | if USE_COVERAGE | 7 | if USE_COVERAGE |
8 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 8 | AM_CFLAGS = --coverage -O0 |
9 | XLIB = -lgcov | ||
9 | endif | 10 | endif |
10 | 11 | ||
11 | 12 | ||
@@ -17,7 +18,7 @@ libgnunetcore_la_SOURCES = \ | |||
17 | libgnunetcore_la_LIBADD = \ | 18 | libgnunetcore_la_LIBADD = \ |
18 | $(top_builddir)/src/arm/libgnunetarm.la \ | 19 | $(top_builddir)/src/arm/libgnunetarm.la \ |
19 | $(top_builddir)/src/util/libgnunetutil.la \ | 20 | $(top_builddir)/src/util/libgnunetutil.la \ |
20 | $(GN_LIBINTL) | 21 | $(GN_LIBINTL) $(XLIB) |
21 | libgnunetcore_la_LDFLAGS = \ | 22 | libgnunetcore_la_LDFLAGS = \ |
22 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 23 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
23 | -version-info 0:0:0 | 24 | -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 | |||
5 | endif | 5 | endif |
6 | 6 | ||
7 | if USE_COVERAGE | 7 | if USE_COVERAGE |
8 | AM_CFLAGS = --coverage | 8 | AM_CFLAGS = --coverage -O0 |
9 | XLIB = -lgcov | ||
9 | endif | 10 | endif |
10 | 11 | ||
11 | lib_LTLIBRARIES = libgnunethello.la | 12 | lib_LTLIBRARIES = libgnunethello.la |
@@ -13,7 +14,7 @@ lib_LTLIBRARIES = libgnunethello.la | |||
13 | libgnunethello_la_SOURCES = \ | 14 | libgnunethello_la_SOURCES = \ |
14 | hello.c | 15 | hello.c |
15 | libgnunethello_la_LIBADD = \ | 16 | libgnunethello_la_LIBADD = \ |
16 | $(top_builddir)/src/util/libgnunetutil.la | 17 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) |
17 | 18 | ||
18 | check_PROGRAMS = \ | 19 | check_PROGRAMS = \ |
19 | test_hello | 20 | 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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | 1 | INCLUDES = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | if USE_COVERAGE | 3 | if USE_COVERAGE |
4 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 4 | AM_CFLAGS = --coverage -O0 |
5 | endif | 5 | endif |
6 | 6 | ||
7 | 7 | ||
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 | |||
5 | endif | 5 | endif |
6 | 6 | ||
7 | if USE_COVERAGE | 7 | if USE_COVERAGE |
8 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 8 | AM_CFLAGS = --coverage -O0 |
9 | XLIB = -lgcov | ||
9 | endif | 10 | endif |
10 | 11 | ||
11 | lib_LTLIBRARIES = libgnunetpeerinfo.la | 12 | lib_LTLIBRARIES = libgnunetpeerinfo.la |
@@ -14,7 +15,8 @@ libgnunetpeerinfo_la_SOURCES = \ | |||
14 | peerinfo_api.c peerinfo.h | 15 | peerinfo_api.c peerinfo.h |
15 | libgnunetpeerinfo_la_LIBADD = \ | 16 | libgnunetpeerinfo_la_LIBADD = \ |
16 | $(top_builddir)/src/hello/libgnunethello.la \ | 17 | $(top_builddir)/src/hello/libgnunethello.la \ |
17 | $(top_builddir)/src/util/libgnunetutil.la | 18 | $(top_builddir)/src/util/libgnunetutil.la \ |
19 | $(XLIB) | ||
18 | libgnunetpeerinfo_la_LDFLAGS = \ | 20 | libgnunetpeerinfo_la_LDFLAGS = \ |
19 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 21 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
20 | -version-info 0:0:0 | 22 | -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 | |||
5 | endif | 5 | endif |
6 | 6 | ||
7 | if USE_COVERAGE | 7 | if USE_COVERAGE |
8 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 8 | AM_CFLAGS = --coverage -O0 |
9 | XLIB = -lgcov | ||
9 | endif | 10 | endif |
10 | 11 | ||
11 | 12 | ||
@@ -15,7 +16,7 @@ libgnunetresolver_la_SOURCES = \ | |||
15 | resolver_api.c resolver.h | 16 | resolver_api.c resolver.h |
16 | libgnunetresolver_la_LIBADD = \ | 17 | libgnunetresolver_la_LIBADD = \ |
17 | $(top_builddir)/src/util/libgnunetutil.la \ | 18 | $(top_builddir)/src/util/libgnunetutil.la \ |
18 | $(GN_LIBINTL) | 19 | $(GN_LIBINTL) $(XLIB) |
19 | libgnunetresolver_la_LDFLAGS = \ | 20 | libgnunetresolver_la_LDFLAGS = \ |
20 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 21 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
21 | -version-info 0:0:0 | 22 | -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 | |||
5 | endif | 5 | endif |
6 | 6 | ||
7 | if USE_COVERAGE | 7 | if USE_COVERAGE |
8 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 8 | AM_CFLAGS = --coverage -O0 |
9 | XLIB = -lgcov | ||
9 | endif | 10 | endif |
10 | 11 | ||
11 | 12 | ||
@@ -15,7 +16,7 @@ libgnunetstatistics_la_SOURCES = \ | |||
15 | statistics_api.c statistics.h | 16 | statistics_api.c statistics.h |
16 | libgnunetstatistics_la_LIBADD = \ | 17 | libgnunetstatistics_la_LIBADD = \ |
17 | $(top_builddir)/src/util/libgnunetutil.la \ | 18 | $(top_builddir)/src/util/libgnunetutil.la \ |
18 | $(GN_LIBINTL) | 19 | $(GN_LIBINTL) $(XLIB) |
19 | libgnunetstatistics_la_LDFLAGS = \ | 20 | libgnunetstatistics_la_LDFLAGS = \ |
20 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 21 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
21 | -version-info 0:0:0 | 22 | -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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | 1 | INCLUDES = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | if USE_COVERAGE | 3 | if USE_COVERAGE |
4 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 4 | AM_CFLAGS = --coverage -O0 |
5 | endif | 5 | endif |
6 | 6 | ||
7 | 7 | ||
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 | |||
7 | endif | 7 | endif |
8 | 8 | ||
9 | if USE_COVERAGE | 9 | if USE_COVERAGE |
10 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 10 | AM_CFLAGS = --coverage -O0 |
11 | endif | 11 | endif |
12 | 12 | ||
13 | 13 | ||
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 | |||
8 | endif | 8 | endif |
9 | 9 | ||
10 | if USE_COVERAGE | 10 | if USE_COVERAGE |
11 | AM_CFLAGS = --coverage | 11 | AM_CFLAGS = --coverage -O0 |
12 | XLIB = -lgcov | ||
12 | endif | 13 | endif |
13 | 14 | ||
14 | lib_LTLIBRARIES = libgnunetutil.la | 15 | lib_LTLIBRARIES = libgnunetutil.la |
@@ -53,7 +54,7 @@ libgnunetutil_la_SOURCES = \ | |||
53 | libgnunetutil_la_LIBADD = \ | 54 | libgnunetutil_la_LIBADD = \ |
54 | $(GCLIBADD) \ | 55 | $(GCLIBADD) \ |
55 | $(LIBGCRYPT_LIBS) \ | 56 | $(LIBGCRYPT_LIBS) \ |
56 | -lgmp -lltdl -lz -lextractor | 57 | -lgmp -lltdl -lz -lextractor $(XLIB) |
57 | 58 | ||
58 | libgnunetutil_la_LDFLAGS = \ | 59 | libgnunetutil_la_LDFLAGS = \ |
59 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 60 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |