diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-02-11 20:59:34 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-02-11 20:59:34 +0100 |
commit | 5ac774e1b398e4f6efa83664981ba0055addb04f (patch) | |
tree | 1d5c61c9d2f9c34bfca7446421a67168a4641099 /src/multicast | |
parent | f3b5e31a81223c9bbfd76b483d9efaa7d648e9f7 (diff) | |
download | gnunet-secushare-5ac774e1b398e4f6efa83664981ba0055addb04f.tar.gz gnunet-secushare-5ac774e1b398e4f6efa83664981ba0055addb04f.zip |
fix FTBFS issues
Diffstat (limited to 'src/multicast')
-rw-r--r-- | src/multicast/Makefile.am | 26 | ||||
-rw-r--r-- | src/multicast/gnunet-multicast.c | 4 | ||||
-rw-r--r-- | src/multicast/gnunet-service-multicast.c | 12 | ||||
-rw-r--r-- | src/multicast/multicast.h | 2 | ||||
-rw-r--r-- | src/multicast/multicast_api.c | 4 | ||||
-rw-r--r-- | src/multicast/test_multicast.c | 10 | ||||
-rw-r--r-- | src/multicast/test_multicast_2peers.c | 10 | ||||
-rw-r--r-- | src/multicast/test_multicast_multipeer.c | 10 |
8 files changed, 39 insertions, 39 deletions
diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am index 61a9f8b..0650199 100644 --- a/src/multicast/Makefile.am +++ b/src/multicast/Makefile.am | |||
@@ -1,6 +1,6 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | 2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include \ |
3 | 3 | $(GNUNET_CPPFLAGS) | |
4 | pkgcfgdir= $(pkgdatadir)/config.d/ | 4 | pkgcfgdir= $(pkgdatadir)/config.d/ |
5 | 5 | ||
6 | libexecdir= $(pkglibdir)/libexec/ | 6 | libexecdir= $(pkglibdir)/libexec/ |
@@ -21,7 +21,7 @@ lib_LTLIBRARIES = libgnunetmulticast.la | |||
21 | libgnunetmulticast_la_SOURCES = \ | 21 | libgnunetmulticast_la_SOURCES = \ |
22 | multicast_api.c multicast.h | 22 | multicast_api.c multicast.h |
23 | libgnunetmulticast_la_LIBADD = \ | 23 | libgnunetmulticast_la_LIBADD = \ |
24 | $(top_builddir)/src/util/libgnunetutil.la \ | 24 | -lgnunetutil \ |
25 | $(GN_LIBINTL) $(XLIB) | 25 | $(GN_LIBINTL) $(XLIB) |
26 | libgnunetmulticast_la_LDFLAGS = \ | 26 | libgnunetmulticast_la_LDFLAGS = \ |
27 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 27 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
@@ -38,15 +38,15 @@ libexec_PROGRAMS = \ | |||
38 | gnunet_multicast_SOURCES = \ | 38 | gnunet_multicast_SOURCES = \ |
39 | gnunet-multicast.c | 39 | gnunet-multicast.c |
40 | gnunet_multicast_LDADD = \ | 40 | gnunet_multicast_LDADD = \ |
41 | $(top_builddir)/src/util/libgnunetutil.la \ | 41 | -lgnunetutil \ |
42 | $(GN_LIBINTL) | 42 | $(GN_LIBINTL) |
43 | 43 | ||
44 | gnunet_service_multicast_SOURCES = \ | 44 | gnunet_service_multicast_SOURCES = \ |
45 | gnunet-service-multicast.c | 45 | gnunet-service-multicast.c |
46 | gnunet_service_multicast_LDADD = \ | 46 | gnunet_service_multicast_LDADD = \ |
47 | $(top_builddir)/src/util/libgnunetutil.la \ | 47 | -lgnunetutil \ |
48 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 48 | -lgnunetcadet \ |
49 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 49 | -lgnunetstatistics \ |
50 | $(GN_LIBINTL) | 50 | $(GN_LIBINTL) |
51 | 51 | ||
52 | check_PROGRAMS = \ | 52 | check_PROGRAMS = \ |
@@ -63,17 +63,17 @@ test_multicast_SOURCES = \ | |||
63 | test_multicast.c | 63 | test_multicast.c |
64 | test_multicast_LDADD = \ | 64 | test_multicast_LDADD = \ |
65 | libgnunetmulticast.la \ | 65 | libgnunetmulticast.la \ |
66 | $(top_builddir)/src/testing/libgnunettesting.la \ | 66 | -lgnunettesting \ |
67 | $(top_builddir)/src/util/libgnunetutil.la | 67 | -lgnunetutil |
68 | test_multicast_multipeer_star_SOURCES = \ | 68 | test_multicast_multipeer_star_SOURCES = \ |
69 | test_multicast_multipeer.c | 69 | test_multicast_multipeer.c |
70 | test_multicast_multipeer_star_LDADD = \ | 70 | test_multicast_multipeer_star_LDADD = \ |
71 | libgnunetmulticast.la \ | 71 | libgnunetmulticast.la \ |
72 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 72 | -lgnunettestbed \ |
73 | $(top_builddir)/src/util/libgnunetutil.la | 73 | -lgnunetutil |
74 | test_multicast_multipeer_line_SOURCES = \ | 74 | test_multicast_multipeer_line_SOURCES = \ |
75 | test_multicast_multipeer.c | 75 | test_multicast_multipeer.c |
76 | test_multicast_multipeer_line_LDADD = \ | 76 | test_multicast_multipeer_line_LDADD = \ |
77 | libgnunetmulticast.la \ | 77 | libgnunetmulticast.la \ |
78 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 78 | -lgnunettestbed \ |
79 | $(top_builddir)/src/util/libgnunetutil.la | 79 | -lgnunetutil |
diff --git a/src/multicast/gnunet-multicast.c b/src/multicast/gnunet-multicast.c index 63e1d52..ffac36d 100644 --- a/src/multicast/gnunet-multicast.c +++ b/src/multicast/gnunet-multicast.c | |||
@@ -23,8 +23,8 @@ | |||
23 | * @brief multicast for writing a tool | 23 | * @brief multicast for writing a tool |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include <gnunet/platform.h> |
27 | #include "gnunet_util_lib.h" | 27 | #include <gnunet/gnunet_util_lib.h> |
28 | /* #include "gnunet_multicast_service.h" */ | 28 | /* #include "gnunet_multicast_service.h" */ |
29 | 29 | ||
30 | /** | 30 | /** |
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index 18c3661..98e4665 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c | |||
@@ -23,12 +23,12 @@ | |||
23 | * @brief program that does multicast | 23 | * @brief program that does multicast |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include <gnunet/platform.h> |
27 | #include "gnunet_util_lib.h" | 27 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "gnunet_signatures.h" | 28 | #include <gnunet/gnunet_signatures.h> |
29 | #include "gnunet_applications.h" | 29 | #include <gnunet/gnunet_applications.h> |
30 | #include "gnunet_statistics_service.h" | 30 | #include <gnunet/gnunet_statistics_service.h> |
31 | #include "gnunet_cadet_service.h" | 31 | #include <gnunet/gnunet_cadet_service.h> |
32 | #include "gnunet_multicast_service.h" | 32 | #include "gnunet_multicast_service.h" |
33 | #include "multicast.h" | 33 | #include "multicast.h" |
34 | 34 | ||
diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h index 8a3ca14..c4b7ce1 100644 --- a/src/multicast/multicast.h +++ b/src/multicast/multicast.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #ifndef MULTICAST_H | 27 | #ifndef MULTICAST_H |
28 | #define MULTICAST_H | 28 | #define MULTICAST_H |
29 | 29 | ||
30 | #include "platform.h" | 30 | #include <gnunet/platform.h> |
31 | #include "gnunet_multicast_service.h" | 31 | #include "gnunet_multicast_service.h" |
32 | 32 | ||
33 | GNUNET_NETWORK_STRUCT_BEGIN | 33 | GNUNET_NETWORK_STRUCT_BEGIN |
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index e5e8302..31d0a02 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c | |||
@@ -25,8 +25,8 @@ | |||
25 | * @author Gabor X Toth | 25 | * @author Gabor X Toth |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "platform.h" | 28 | #include <gnunet/platform.h> |
29 | #include "gnunet_util_lib.h" | 29 | #include <gnunet/gnunet_util_lib.h> |
30 | #include "gnunet_multicast_service.h" | 30 | #include "gnunet_multicast_service.h" |
31 | #include "multicast.h" | 31 | #include "multicast.h" |
32 | 32 | ||
diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c index 70efdcb..b03c529 100644 --- a/src/multicast/test_multicast.c +++ b/src/multicast/test_multicast.c | |||
@@ -26,11 +26,11 @@ | |||
26 | 26 | ||
27 | #include <inttypes.h> | 27 | #include <inttypes.h> |
28 | 28 | ||
29 | #include "platform.h" | 29 | #include <gnunet/platform.h> |
30 | #include "gnunet_crypto_lib.h" | 30 | #include <gnunet/gnunet_crypto_lib.h> |
31 | #include "gnunet_common.h" | 31 | #include <gnunet/gnunet_common.h> |
32 | #include "gnunet_util_lib.h" | 32 | #include <gnunet/gnunet_util_lib.h> |
33 | #include "gnunet_testing_lib.h" | 33 | #include <gnunet/gnunet_testing_lib.h> |
34 | #include "gnunet_multicast_service.h" | 34 | #include "gnunet_multicast_service.h" |
35 | 35 | ||
36 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) | 36 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) |
diff --git a/src/multicast/test_multicast_2peers.c b/src/multicast/test_multicast_2peers.c index ea99602..009a0a1 100644 --- a/src/multicast/test_multicast_2peers.c +++ b/src/multicast/test_multicast_2peers.c | |||
@@ -27,11 +27,11 @@ | |||
27 | 27 | ||
28 | #include <inttypes.h> | 28 | #include <inttypes.h> |
29 | 29 | ||
30 | #include "platform.h" | 30 | #include <gnunet/platform.h> |
31 | #include "gnunet_crypto_lib.h" | 31 | #include <gnunet/gnunet_crypto_lib.h> |
32 | #include "gnunet_common.h" | 32 | #include <gnunet/gnunet_common.h> |
33 | #include "gnunet_util_lib.h" | 33 | #include <gnunet/gnunet_util_lib.h> |
34 | #include "gnunet_testbed_service.h" | 34 | #include <gnunet/gnunet_testbed_service.h> |
35 | #include "gnunet_multicast_service.h" | 35 | #include "gnunet_multicast_service.h" |
36 | 36 | ||
37 | #define NUM_PEERS 2 | 37 | #define NUM_PEERS 2 |
diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c index 9b44e05..95f42f4 100644 --- a/src/multicast/test_multicast_multipeer.c +++ b/src/multicast/test_multicast_multipeer.c | |||
@@ -26,11 +26,11 @@ | |||
26 | 26 | ||
27 | #include <inttypes.h> | 27 | #include <inttypes.h> |
28 | 28 | ||
29 | #include "platform.h" | 29 | #include <gnunet/platform.h> |
30 | #include "gnunet_crypto_lib.h" | 30 | #include <gnunet/gnunet_crypto_lib.h> |
31 | #include "gnunet_common.h" | 31 | #include <gnunet/gnunet_common.h> |
32 | #include "gnunet_util_lib.h" | 32 | #include <gnunet/gnunet_util_lib.h> |
33 | #include "gnunet_testbed_service.h" | 33 | #include <gnunet/gnunet_testbed_service.h> |
34 | #include "gnunet_multicast_service.h" | 34 | #include "gnunet_multicast_service.h" |
35 | 35 | ||
36 | #define PEERS_REQUESTED 12 | 36 | #define PEERS_REQUESTED 12 |