aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-02-11 20:59:34 +0100
committerChristian Grothoff <christian@grothoff.org>2019-02-11 20:59:34 +0100
commit5ac774e1b398e4f6efa83664981ba0055addb04f (patch)
tree1d5c61c9d2f9c34bfca7446421a67168a4641099
parentf3b5e31a81223c9bbfd76b483d9efaa7d648e9f7 (diff)
downloadgnunet-secushare-5ac774e1b398e4f6efa83664981ba0055addb04f.tar.gz
gnunet-secushare-5ac774e1b398e4f6efa83664981ba0055addb04f.zip
fix FTBFS issues
Diffstat
-rw-r--r--AUTHORS1
-rwxr-xr-xbin/pogen.sh5
-rw-r--r--po/POTFILES.in18
-rw-r--r--src/include/gnunet_multicast_service.h4
-rw-r--r--src/include/gnunet_psyc_message.h2
-rw-r--r--src/include/gnunet_psyc_service.h2
-rw-r--r--src/include/gnunet_psyc_slicer.h2
-rw-r--r--src/include/gnunet_psycstore_plugin.h2
-rw-r--r--src/include/gnunet_psycstore_service.h2
-rw-r--r--src/include/gnunet_social_service.h6
-rw-r--r--src/multicast/Makefile.am26
-rw-r--r--src/multicast/gnunet-multicast.c4
-rw-r--r--src/multicast/gnunet-service-multicast.c12
-rw-r--r--src/multicast/multicast.h2
-rw-r--r--src/multicast/multicast_api.c4
-rw-r--r--src/multicast/test_multicast.c10
-rw-r--r--src/multicast/test_multicast_2peers.c10
-rw-r--r--src/multicast/test_multicast_multipeer.c10
-rw-r--r--src/psyc/Makefile.am21
-rw-r--r--src/psyc/gnunet-service-psyc.c10
-rw-r--r--src/psyc/psyc.h2
-rw-r--r--src/psyc/psyc_api.c4
-rw-r--r--src/psyc/test_psyc.c10
-rw-r--r--src/psyc/test_psyc2.c10
-rw-r--r--src/psyc/test_psyc_api_join.c10
-rw-r--r--src/psycstore/Makefile.am47
-rw-r--r--src/psycstore/gnunet-service-psycstore.c10
-rw-r--r--src/psycstore/plugin_psycstore_mysql.c4
-rw-r--r--src/psycstore/plugin_psycstore_postgres.c6
-rw-r--r--src/psycstore/plugin_psycstore_sqlite.c4
-rw-r--r--src/psycstore/psycstore.h2
-rw-r--r--src/psycstore/psycstore_api.c8
-rw-r--r--src/psycstore/test_plugin_psycstore.c6
-rw-r--r--src/psycstore/test_psycstore.c8
-rw-r--r--src/psycutil/Makefile.am9
-rw-r--r--src/psycutil/psyc_env.c4
-rw-r--r--src/psycutil/psyc_message.c4
-rw-r--r--src/psycutil/psyc_slicer.c4
-rw-r--r--src/psycutil/test_psyc_env.c6
-rw-r--r--src/social/Makefile.am23
-rw-r--r--src/social/gnunet-service-social.c16
-rw-r--r--src/social/gnunet-social.c4
-rw-r--r--src/social/social.h2
-rw-r--r--src/social/social_api.c4
-rw-r--r--src/social/test_social.c12
45 files changed, 196 insertions, 176 deletions
diff --git a/AUTHORS b/AUTHORS
index eb41b69..61acf7c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
1Gabor (tgx) Toth
1Christian Grothoff 2Christian Grothoff
diff --git a/bin/pogen.sh b/bin/pogen.sh
new file mode 100755
index 0000000..453e0b1
--- /dev/null
+++ b/bin/pogen.sh
@@ -0,0 +1,5 @@
1#!/bin/sh
2# This script is in the public domain.
3find src -name "*.c" | grep -v \# | grep -v /test_ | grep -v /perf_ | grep -v _old | grep -v chat | grep -v .libs/ | sort > po/POTFILES.in
4grep -l _\( `find src -name "*.h"` | grep -v "platform.h" | grep -v _old | grep -v chat | sort >> po/POTFILES.in
5
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6fb7e2c..125afcb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1,16 @@
1# List of source files which contain translatable strings. 1src/multicast/gnunet-multicast.c
2src/ext/gnunet-ext.c 2src/multicast/gnunet-service-multicast.c
3src/multicast/multicast_api.c
4src/psyc/gnunet-service-psyc.c
5src/psyc/psyc_api.c
6src/psycstore/gnunet-service-psycstore.c
7src/psycstore/plugin_psycstore_mysql.c
8src/psycstore/plugin_psycstore_postgres.c
9src/psycstore/plugin_psycstore_sqlite.c
10src/psycstore/psycstore_api.c
11src/psycutil/psyc_env.c
12src/psycutil/psyc_message.c
13src/psycutil/psyc_slicer.c
14src/social/gnunet-service-social.c
15src/social/gnunet-social.c
16src/social/social_api.c
diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h
index 58fca0b..2932514 100644
--- a/src/include/gnunet_multicast_service.h
+++ b/src/include/gnunet_multicast_service.h
@@ -41,8 +41,8 @@ extern "C"
41#endif 41#endif
42#endif 42#endif
43 43
44#include "gnunet_util_lib.h" 44#include <gnunet/gnunet_util_lib.h>
45#include "gnunet_transport_service.h" 45#include <gnunet/gnunet_transport_service.h>
46 46
47/** 47/**
48 * Version number of GNUnet-multicast API. 48 * Version number of GNUnet-multicast API.
diff --git a/src/include/gnunet_psyc_message.h b/src/include/gnunet_psyc_message.h
index d0cf9cc..7718055 100644
--- a/src/include/gnunet_psyc_message.h
+++ b/src/include/gnunet_psyc_message.h
@@ -41,7 +41,7 @@ extern "C"
41#endif 41#endif
42 42
43 43
44#include "gnunet_util_lib.h" 44#include <gnunet/gnunet_util_lib.h>
45#include "gnunet_psyc_util_lib.h" 45#include "gnunet_psyc_util_lib.h"
46#include "gnunet_psyc_service.h" 46#include "gnunet_psyc_service.h"
47 47
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index 3a3131e..6d4a971 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -98,7 +98,7 @@ extern "C"
98#endif 98#endif
99#endif 99#endif
100 100
101#include "gnunet_util_lib.h" 101#include <gnunet/gnunet_util_lib.h>
102#include "gnunet_multicast_service.h" 102#include "gnunet_multicast_service.h"
103//Mingw work around 103//Mingw work around
104#ifdef MINGW 104#ifdef MINGW
diff --git a/src/include/gnunet_psyc_slicer.h b/src/include/gnunet_psyc_slicer.h
index 87f66d7..f8efd4b 100644
--- a/src/include/gnunet_psyc_slicer.h
+++ b/src/include/gnunet_psyc_slicer.h
@@ -42,7 +42,7 @@ extern "C"
42#endif 42#endif
43#endif 43#endif
44 44
45#include "gnunet_util_lib.h" 45#include <gnunet/gnunet_util_lib.h>
46 46
47 47
48/** 48/**
diff --git a/src/include/gnunet_psycstore_plugin.h b/src/include/gnunet_psycstore_plugin.h
index fac549f..d253825 100644
--- a/src/include/gnunet_psycstore_plugin.h
+++ b/src/include/gnunet_psycstore_plugin.h
@@ -31,7 +31,7 @@
31#ifndef GNUNET_PSYCSTORE_PLUGIN_H 31#ifndef GNUNET_PSYCSTORE_PLUGIN_H
32#define GNUNET_PSYCSTORE_PLUGIN_H 32#define GNUNET_PSYCSTORE_PLUGIN_H
33 33
34#include "gnunet_util_lib.h" 34#include <gnunet/gnunet_util_lib.h>
35#include "gnunet_psycstore_service.h" 35#include "gnunet_psycstore_service.h"
36 36
37#ifdef __cplusplus 37#ifdef __cplusplus
diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h
index 92516f4..ea77f76 100644
--- a/src/include/gnunet_psycstore_service.h
+++ b/src/include/gnunet_psycstore_service.h
@@ -40,7 +40,7 @@ extern "C"
40#endif 40#endif
41#endif 41#endif
42 42
43#include "gnunet_util_lib.h" 43#include <gnunet/gnunet_util_lib.h>
44#include "gnunet_psyc_util_lib.h" 44#include "gnunet_psyc_util_lib.h"
45#include "gnunet_multicast_service.h" 45#include "gnunet_multicast_service.h"
46#include "gnunet_psyc_service.h" 46#include "gnunet_psyc_service.h"
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index 7faa336..068d827 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -226,10 +226,10 @@ extern "C"
226#endif 226#endif
227 227
228#include <stdint.h> 228#include <stdint.h>
229#include "gnunet_util_lib.h" 229#include <gnunet/gnunet_util_lib.h>
230#include "gnunet_psyc_util_lib.h" 230#include "gnunet_psyc_util_lib.h"
231#include "gnunet_identity_service.h" 231#include <gnunet/gnunet_identity_service.h>
232#include "gnunet_namestore_service.h" 232#include <gnunet/gnunet_namestore_service.h>
233#include "gnunet_psyc_service.h" 233#include "gnunet_psyc_service.h"
234 234
235 235
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
2AM_CPPFLAGS = -I$(top_srcdir)/src/include 2AM_CPPFLAGS = -I$(top_srcdir)/src/include \
3 3 $(GNUNET_CPPFLAGS)
4pkgcfgdir= $(pkgdatadir)/config.d/ 4pkgcfgdir= $(pkgdatadir)/config.d/
5 5
6libexecdir= $(pkglibdir)/libexec/ 6libexecdir= $(pkglibdir)/libexec/
@@ -21,7 +21,7 @@ lib_LTLIBRARIES = libgnunetmulticast.la
21libgnunetmulticast_la_SOURCES = \ 21libgnunetmulticast_la_SOURCES = \
22 multicast_api.c multicast.h 22 multicast_api.c multicast.h
23libgnunetmulticast_la_LIBADD = \ 23libgnunetmulticast_la_LIBADD = \
24 $(top_builddir)/src/util/libgnunetutil.la \ 24 -lgnunetutil \
25 $(GN_LIBINTL) $(XLIB) 25 $(GN_LIBINTL) $(XLIB)
26libgnunetmulticast_la_LDFLAGS = \ 26libgnunetmulticast_la_LDFLAGS = \
27 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 27 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
@@ -38,15 +38,15 @@ libexec_PROGRAMS = \
38gnunet_multicast_SOURCES = \ 38gnunet_multicast_SOURCES = \
39 gnunet-multicast.c 39 gnunet-multicast.c
40gnunet_multicast_LDADD = \ 40gnunet_multicast_LDADD = \
41 $(top_builddir)/src/util/libgnunetutil.la \ 41 -lgnunetutil \
42 $(GN_LIBINTL) 42 $(GN_LIBINTL)
43 43
44gnunet_service_multicast_SOURCES = \ 44gnunet_service_multicast_SOURCES = \
45 gnunet-service-multicast.c 45 gnunet-service-multicast.c
46gnunet_service_multicast_LDADD = \ 46gnunet_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
52check_PROGRAMS = \ 52check_PROGRAMS = \
@@ -63,17 +63,17 @@ test_multicast_SOURCES = \
63 test_multicast.c 63 test_multicast.c
64test_multicast_LDADD = \ 64test_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
68test_multicast_multipeer_star_SOURCES = \ 68test_multicast_multipeer_star_SOURCES = \
69 test_multicast_multipeer.c 69 test_multicast_multipeer.c
70test_multicast_multipeer_star_LDADD = \ 70test_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
74test_multicast_multipeer_line_SOURCES = \ 74test_multicast_multipeer_line_SOURCES = \
75 test_multicast_multipeer.c 75 test_multicast_multipeer.c
76test_multicast_multipeer_line_LDADD = \ 76test_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
33GNUNET_NETWORK_STRUCT_BEGIN 33GNUNET_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
diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index 511e3e3..61094f1 100644
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -1,5 +1,6 @@
1# This Makefile.am is in the public domain 1# This Makefile.am is in the public domain
2AM_CPPFLAGS = -I$(top_srcdir)/src/include 2AM_CPPFLAGS = -I$(top_srcdir)/src/include \
3 $(GNUNET_CPPFLAGS)
3 4
4pkgcfgdir= $(pkgdatadir)/config.d/ 5pkgcfgdir= $(pkgdatadir)/config.d/
5 6
@@ -23,7 +24,7 @@ lib_LTLIBRARIES = libgnunetpsyc.la
23libgnunetpsyc_la_SOURCES = \ 24libgnunetpsyc_la_SOURCES = \
24 psyc_api.c psyc.h 25 psyc_api.c psyc.h
25libgnunetpsyc_la_LIBADD = \ 26libgnunetpsyc_la_LIBADD = \
26 $(top_builddir)/src/util/libgnunetutil.la \ 27 -lgnunetutil \
27 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \ 28 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
28 $(GN_LIBINTL) $(XLIB) 29 $(GN_LIBINTL) $(XLIB)
29libgnunetpsyc_la_LDFLAGS = \ 30libgnunetpsyc_la_LDFLAGS = \
@@ -38,8 +39,8 @@ libexec_PROGRAMS = \
38gnunet_service_psyc_SOURCES = \ 39gnunet_service_psyc_SOURCES = \
39 gnunet-service-psyc.c 40 gnunet-service-psyc.c
40gnunet_service_psyc_LDADD = \ 41gnunet_service_psyc_LDADD = \
41 $(top_builddir)/src/util/libgnunetutil.la \ 42 -lgnunetutil \
42 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 43 -lgnunetstatistics \
43 $(top_builddir)/src/multicast/libgnunetmulticast.la \ 44 $(top_builddir)/src/multicast/libgnunetmulticast.la \
44 $(top_builddir)/src/psycstore/libgnunetpsycstore.la \ 45 $(top_builddir)/src/psycstore/libgnunetpsycstore.la \
45 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \ 46 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
@@ -63,15 +64,9 @@ test_psyc_SOURCES = \
63test_psyc_LDADD = \ 64test_psyc_LDADD = \
64 libgnunetpsyc.la \ 65 libgnunetpsyc.la \
65 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \ 66 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
66 $(top_builddir)/src/testing/libgnunettesting.la \ 67 -lgnunettesting \
67 $(top_builddir)/src/util/libgnunetutil.la 68 -lgnunetutil
68#test_psyc2_SOURCES = \ 69
69# test_psyc2.c
70#test_psyc2_LDADD = \
71# libgnunetpsyc.la \
72# $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
73# $(top_builddir)/src/testbed/libgnunettestbed.la \
74# $(top_builddir)/src/util/libgnunetutil.la
75 70
76EXTRA_DIST = \ 71EXTRA_DIST = \
77 test_psyc.conf 72 test_psyc.conf
diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c
index 6f2f7a9..6934b31 100644
--- a/src/psyc/gnunet-service-psyc.c
+++ b/src/psyc/gnunet-service-psyc.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_util_lib.h" 30#include <gnunet/gnunet_util_lib.h>
31#include "gnunet_constants.h" 31#include <gnunet/gnunet_constants.h>
32#include "gnunet_protocols.h" 32#include <gnunet/gnunet_protocols.h>
33#include "gnunet_statistics_service.h" 33#include <gnunet/gnunet_statistics_service.h>
34#include "gnunet_multicast_service.h" 34#include "gnunet_multicast_service.h"
35#include "gnunet_psycstore_service.h" 35#include "gnunet_psycstore_service.h"
36#include "gnunet_psyc_service.h" 36#include "gnunet_psyc_service.h"
diff --git a/src/psyc/psyc.h b/src/psyc/psyc.h
index 74bbf3e..c901db0 100644
--- a/src/psyc/psyc.h
+++ b/src/psyc/psyc.h
@@ -27,7 +27,7 @@
27#ifndef PSYC_H 27#ifndef PSYC_H
28#define PSYC_H 28#define PSYC_H
29 29
30#include "platform.h" 30#include <gnunet/platform.h>
31#include "gnunet_psyc_service.h" 31#include "gnunet_psyc_service.h"
32 32
33 33
diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c
index 37ea112..3ee3fc7 100644
--- a/src/psyc/psyc_api.c
+++ b/src/psyc/psyc_api.c
@@ -32,8 +32,8 @@
32 32
33#include <inttypes.h> 33#include <inttypes.h>
34 34
35#include "platform.h" 35#include <gnunet/platform.h>
36#include "gnunet_util_lib.h" 36#include <gnunet/gnunet_util_lib.h>
37#include "gnunet_multicast_service.h" 37#include "gnunet_multicast_service.h"
38#include "gnunet_psyc_service.h" 38#include "gnunet_psyc_service.h"
39#include "gnunet_psyc_util_lib.h" 39#include "gnunet_psyc_util_lib.h"
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c
index b6e27bb..bd5a3b4 100644
--- a/src/psyc/test_psyc.c
+++ b/src/psyc/test_psyc.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_testing_lib.h" 34#include <gnunet/gnunet_testing_lib.h>
35#include "gnunet_psyc_util_lib.h" 35#include "gnunet_psyc_util_lib.h"
36#include "gnunet_psyc_service.h" 36#include "gnunet_psyc_service.h"
37 37
diff --git a/src/psyc/test_psyc2.c b/src/psyc/test_psyc2.c
index c6e7237..2b141e3 100644
--- a/src/psyc/test_psyc2.c
+++ b/src/psyc/test_psyc2.c
@@ -24,11 +24,11 @@
24 * @author xrs 24 * @author xrs
25 */ 25 */
26 26
27#include "platform.h" 27#include <gnunet/platform.h>
28#include "gnunet_crypto_lib.h" 28#include <gnunet/gnunet_crypto_lib.h>
29#include "gnunet_common.h" 29#include <gnunet/gnunet_common.h>
30#include "gnunet_util_lib.h" 30#include <gnunet/gnunet_util_lib.h>
31#include "gnunet_testbed_service.h" 31#include <gnunet/gnunet_testbed_service.h>
32#include "gnunet_psyc_util_lib.h" 32#include "gnunet_psyc_util_lib.h"
33#include "gnunet_psyc_service.h" 33#include "gnunet_psyc_service.h"
34 34
diff --git a/src/psyc/test_psyc_api_join.c b/src/psyc/test_psyc_api_join.c
index 419fa11..ffa1e16 100644
--- a/src/psyc/test_psyc_api_join.c
+++ b/src/psyc/test_psyc_api_join.c
@@ -32,11 +32,11 @@
32 * - main can not contain GNUNET_log() 32 * - main can not contain GNUNET_log()
33 */ 33 */
34 34
35#include "platform.h" 35#include <gnunet/platform.h>
36#include "gnunet_crypto_lib.h" 36#include <gnunet/gnunet_crypto_lib.h>
37#include "gnunet_common.h" 37#include <gnunet/gnunet_common.h>
38#include "gnunet_util_lib.h" 38#include <gnunet/gnunet_util_lib.h>
39#include "gnunet_testbed_service.h" 39#include <gnunet/gnunet_testbed_service.h>
40#include "gnunet_psyc_util_lib.h" 40#include "gnunet_psyc_util_lib.h"
41#include "gnunet_psyc_service.h" 41#include "gnunet_psyc_service.h"
42#include "psyc_test_lib.h" 42#include "psyc_test_lib.h"
diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am
index 557bb42..f3b4545 100644
--- a/src/psycstore/Makefile.am
+++ b/src/psycstore/Makefile.am
@@ -1,5 +1,6 @@
1# This Makefile.am is in the public domain 1# This Makefile.am is in the public domain
2AM_CPPFLAGS = -I$(top_srcdir)/src/include 2AM_CPPFLAGS = -I$(top_srcdir)/src/include \
3 $(GNUNET_CPPFLAGS)
3 4
4plugindir = $(libdir)/gnunet 5plugindir = $(libdir)/gnunet
5 6
@@ -47,7 +48,7 @@ libgnunetpsycstore_la_SOURCES = \
47 psycstore_api.c \ 48 psycstore_api.c \
48 psycstore.h 49 psycstore.h
49libgnunetpsycstore_la_LIBADD = \ 50libgnunetpsycstore_la_LIBADD = \
50 $(top_builddir)/src/util/libgnunetutil.la \ 51 -lgnunetutil \
51 $(GN_LIBINTL) $(XLIB) 52 $(GN_LIBINTL) $(XLIB)
52libgnunetpsycstore_la_LDFLAGS = \ 53libgnunetpsycstore_la_LDFLAGS = \
53 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 54 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
@@ -61,9 +62,9 @@ libexec_PROGRAMS = \
61gnunet_service_psycstore_SOURCES = \ 62gnunet_service_psycstore_SOURCES = \
62 gnunet-service-psycstore.c 63 gnunet-service-psycstore.c
63gnunet_service_psycstore_LDADD = \ 64gnunet_service_psycstore_LDADD = \
64 $(top_builddir)/src/statistics/libgnunetstatistics.la \
65 $(top_builddir)/src/util/libgnunetutil.la \
66 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \ 65 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
66 -lgnunetstatistics \
67 -lgnunetutil \
67 $(GN_LIBINTL) 68 $(GN_LIBINTL)
68 69
69plugin_LTLIBRARIES = \ 70plugin_LTLIBRARIES = \
@@ -76,10 +77,11 @@ libgnunet_plugin_psycstore_mysql_la_SOURCES = \
76 plugin_psycstore_mysql.c 77 plugin_psycstore_mysql.c
77libgnunet_plugin_psycstore_mysql_la_LIBADD = \ 78libgnunet_plugin_psycstore_mysql_la_LIBADD = \
78 libgnunetpsycstore.la \ 79 libgnunetpsycstore.la \
79 $(top_builddir)/src/my/libgnunetmy.la \ 80 -lgnunetmy \
80 $(top_builddir)/src/mysql/libgnunetmysql.la \ 81 -lgnunetmysql \
81 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 82 -lgnunetstatistics \
82 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ 83 -lgnunetutil \
84 $(XLIBS) \
83 $(LTLIBINTL) 85 $(LTLIBINTL)
84libgnunet_plugin_psycstore_mysql_la_LDFLAGS = \ 86libgnunet_plugin_psycstore_mysql_la_LDFLAGS = \
85 $(GN_PLUGIN_LDFLAGS) 87 $(GN_PLUGIN_LDFLAGS)
@@ -88,9 +90,10 @@ libgnunet_plugin_psycstore_postgres_la_SOURCES = \
88 plugin_psycstore_postgres.c 90 plugin_psycstore_postgres.c
89libgnunet_plugin_psycstore_postgres_la_LIBADD = \ 91libgnunet_plugin_psycstore_postgres_la_LIBADD = \
90 libgnunetpsycstore.la \ 92 libgnunetpsycstore.la \
91 $(top_builddir)/src/pq/libgnunetpq.la \ 93 -lgnunetpq \
92 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 94 -lgnunetstatistics \
93 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq \ 95 -lgnunetutil \
96 $(XLIBS) -lpq \
94 $(LTLIBINTL) 97 $(LTLIBINTL)
95libgnunet_plugin_psycstore_postgres_la_LDFLAGS = \ 98libgnunet_plugin_psycstore_postgres_la_LDFLAGS = \
96 $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) 99 $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
@@ -102,8 +105,9 @@ libgnunet_plugin_psycstore_sqlite_la_SOURCES = \
102 plugin_psycstore_sqlite.c 105 plugin_psycstore_sqlite.c
103libgnunet_plugin_psycstore_sqlite_la_LIBADD = \ 106libgnunet_plugin_psycstore_sqlite_la_LIBADD = \
104 libgnunetpsycstore.la \ 107 libgnunetpsycstore.la \
105 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 108 -lgnunetstatistics \
106 $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ 109 -lgnunetutil \
110 $(XLIBS) -lsqlite3 \
107 $(LTLIBINTL) 111 $(LTLIBINTL)
108libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \ 112libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \
109 $(GN_PLUGIN_LDFLAGS) 113 $(GN_PLUGIN_LDFLAGS)
@@ -128,8 +132,8 @@ test_psycstore_SOURCES = \
128 test_psycstore.c 132 test_psycstore.c
129test_psycstore_LDADD = \ 133test_psycstore_LDADD = \
130 libgnunetpsycstore.la \ 134 libgnunetpsycstore.la \
131 $(top_builddir)/src/testing/libgnunettesting.la \ 135 -lgnunettesting \
132 $(top_builddir)/src/util/libgnunetutil.la 136 -lgnunetutil
133 137
134EXTRA_DIST = \ 138EXTRA_DIST = \
135 test_psycstore.conf 139 test_psycstore.conf
@@ -138,18 +142,17 @@ EXTRA_DIST = \
138test_plugin_psycstore_sqlite_SOURCES = \ 142test_plugin_psycstore_sqlite_SOURCES = \
139 test_plugin_psycstore.c 143 test_plugin_psycstore.c
140test_plugin_psycstore_sqlite_LDADD = \ 144test_plugin_psycstore_sqlite_LDADD = \
141 $(top_builddir)/src/testing/libgnunettesting.la \ 145 -lgnunettesting \
142 $(top_builddir)/src/util/libgnunetutil.la 146 -lgnunetutil
143 147
144test_plugin_psycstore_mysql_SOURCES = \ 148test_plugin_psycstore_mysql_SOURCES = \
145 test_plugin_psycstore.c 149 test_plugin_psycstore.c
146test_plugin_psycstore_mysql_LDADD = \ 150test_plugin_psycstore_mysql_LDADD = \
147 $(top_builddir)/src/testing/libgnunettesting.la \ 151 -lgnunettesting \
148 $(top_builddir)/src/util/libgnunetutil.la 152 -lgnunetutil
149 153
150test_plugin_psycstore_postgres_SOURCES = \ 154test_plugin_psycstore_postgres_SOURCES = \
151 test_plugin_psycstore.c 155 test_plugin_psycstore.c
152test_plugin_psycstore_postgres_LDADD = \ 156test_plugin_psycstore_postgres_LDADD = \
153 $(top_builddir)/src/testing/libgnunettesting.la \ 157 -lgnunettesting \
154 $(top_builddir)/src/util/libgnunetutil.la 158 -lgnunetutil
155
diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c
index 9aebd3e..2852fda 100644
--- a/src/psycstore/gnunet-service-psycstore.c
+++ b/src/psycstore/gnunet-service-psycstore.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_util_lib.h" 31#include <gnunet/gnunet_util_lib.h>
32#include "gnunet_constants.h" 32#include <gnunet/gnunet_constants.h>
33#include "gnunet_protocols.h" 33#include <gnunet/gnunet_protocols.h>
34#include "gnunet_statistics_service.h" 34#include <gnunet/gnunet_statistics_service.h>
35#include "gnunet_psyc_util_lib.h" 35#include "gnunet_psyc_util_lib.h"
36#include "gnunet_psycstore_service.h" 36#include "gnunet_psycstore_service.h"
37#include "gnunet_psycstore_plugin.h" 37#include "gnunet_psycstore_plugin.h"
diff --git a/src/psycstore/plugin_psycstore_mysql.c b/src/psycstore/plugin_psycstore_mysql.c
index c36b6f7..598a367 100644
--- a/src/psycstore/plugin_psycstore_mysql.c
+++ b/src/psycstore/plugin_psycstore_mysql.c
@@ -26,11 +26,11 @@
26 * @author Christophe Genevey 26 * @author Christophe Genevey
27 */ 27 */
28 28
29#include "platform.h" 29#include <gnunet/platform.h>
30#include "gnunet_psycstore_plugin.h" 30#include "gnunet_psycstore_plugin.h"
31#include "gnunet_psycstore_service.h" 31#include "gnunet_psycstore_service.h"
32#include "gnunet_multicast_service.h" 32#include "gnunet_multicast_service.h"
33#include "gnunet_crypto_lib.h" 33#include <gnunet/gnunet_crypto_lib.h>
34#include "gnunet_psyc_util_lib.h" 34#include "gnunet_psyc_util_lib.h"
35#include "psycstore.h" 35#include "psycstore.h"
36#include "gnunet_my_lib.h" 36#include "gnunet_my_lib.h"
diff --git a/src/psycstore/plugin_psycstore_postgres.c b/src/psycstore/plugin_psycstore_postgres.c
index 33c9960..2dcafd4 100644
--- a/src/psycstore/plugin_psycstore_postgres.c
+++ b/src/psycstore/plugin_psycstore_postgres.c
@@ -28,14 +28,14 @@
28 * @author Jeffrey Burdges 28 * @author Jeffrey Burdges
29 */ 29 */
30 30
31#include "platform.h" 31#include <gnunet/platform.h>
32#include "gnunet_psycstore_plugin.h" 32#include "gnunet_psycstore_plugin.h"
33#include "gnunet_psycstore_service.h" 33#include "gnunet_psycstore_service.h"
34#include "gnunet_multicast_service.h" 34#include "gnunet_multicast_service.h"
35#include "gnunet_crypto_lib.h" 35#include <gnunet/gnunet_crypto_lib.h>
36#include "gnunet_psyc_util_lib.h" 36#include "gnunet_psyc_util_lib.h"
37#include "psycstore.h" 37#include "psycstore.h"
38#include "gnunet_pq_lib.h" 38#include <gnunet/gnunet_pq_lib.h>
39 39
40/** 40/**
41 * After how many ms "busy" should a DB operation fail for good? A 41 * After how many ms "busy" should a DB operation fail for good? A
diff --git a/src/psycstore/plugin_psycstore_sqlite.c b/src/psycstore/plugin_psycstore_sqlite.c
index 24de383..982f2ec 100644
--- a/src/psycstore/plugin_psycstore_sqlite.c
+++ b/src/psycstore/plugin_psycstore_sqlite.c
@@ -30,11 +30,11 @@
30 * thus it can only store 63 bits of the uint64_t's. 30 * thus it can only store 63 bits of the uint64_t's.
31 */ 31 */
32 32
33#include "platform.h" 33#include <gnunet/platform.h>
34#include "gnunet_psycstore_plugin.h" 34#include "gnunet_psycstore_plugin.h"
35#include "gnunet_psycstore_service.h" 35#include "gnunet_psycstore_service.h"
36#include "gnunet_multicast_service.h" 36#include "gnunet_multicast_service.h"
37#include "gnunet_crypto_lib.h" 37#include <gnunet/gnunet_crypto_lib.h>
38#include "gnunet_psyc_util_lib.h" 38#include "gnunet_psyc_util_lib.h"
39#include "psycstore.h" 39#include "psycstore.h"
40#include <sqlite3.h> 40#include <sqlite3.h>
diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h
index 9a1c06a..dde714e 100644
--- a/src/psycstore/psycstore.h
+++ b/src/psycstore/psycstore.h
@@ -27,7 +27,7 @@
27#ifndef GNUNET_PSYCSTORE_H 27#ifndef GNUNET_PSYCSTORE_H
28#define GNUNET_PSYCSTORE_H 28#define GNUNET_PSYCSTORE_H
29 29
30#include "gnunet_common.h" 30#include <gnunet/gnunet_common.h>
31 31
32 32
33GNUNET_NETWORK_STRUCT_BEGIN 33GNUNET_NETWORK_STRUCT_BEGIN
diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c
index ab4cd0f..6fe3af1 100644
--- a/src/psycstore/psycstore_api.c
+++ b/src/psycstore/psycstore_api.c
@@ -27,10 +27,10 @@
27 27
28#include <inttypes.h> 28#include <inttypes.h>
29 29
30#include "platform.h" 30#include <gnunet/platform.h>
31#include "gnunet_util_lib.h" 31#include <gnunet/gnunet_util_lib.h>
32#include "gnunet_constants.h" 32#include <gnunet/gnunet_constants.h>
33#include "gnunet_protocols.h" 33#include <gnunet/gnunet_protocols.h>
34#include "gnunet_psycstore_service.h" 34#include "gnunet_psycstore_service.h"
35#include "gnunet_multicast_service.h" 35#include "gnunet_multicast_service.h"
36#include "psycstore.h" 36#include "psycstore.h"
diff --git a/src/psycstore/test_plugin_psycstore.c b/src/psycstore/test_plugin_psycstore.c
index ff4eac8..b074ec1 100644
--- a/src/psycstore/test_plugin_psycstore.c
+++ b/src/psycstore/test_plugin_psycstore.c
@@ -28,9 +28,9 @@
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30 30
31#include "platform.h" 31#include <gnunet/platform.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_psycstore_plugin.h" 34#include "gnunet_psycstore_plugin.h"
35#include "gnunet_psycstore_service.h" 35#include "gnunet_psycstore_service.h"
36#include "gnunet_multicast_service.h" 36#include "gnunet_multicast_service.h"
diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c
index ca50904..76494a8 100644
--- a/src/psycstore/test_psycstore.c
+++ b/src/psycstore/test_psycstore.c
@@ -27,10 +27,10 @@
27 27
28#include <inttypes.h> 28#include <inttypes.h>
29 29
30#include "platform.h" 30#include <gnunet/platform.h>
31#include "gnunet_util_lib.h" 31#include <gnunet/gnunet_util_lib.h>
32#include "gnunet_common.h" 32#include <gnunet/gnunet_common.h>
33#include "gnunet_testing_lib.h" 33#include <gnunet/gnunet_testing_lib.h>
34#include "gnunet_psycstore_service.h" 34#include "gnunet_psycstore_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/psycutil/Makefile.am b/src/psycutil/Makefile.am
index 2732c3a..75f9f4e 100644
--- a/src/psycutil/Makefile.am
+++ b/src/psycutil/Makefile.am
@@ -1,5 +1,6 @@
1# This Makefile.am is in the public domain 1# This Makefile.am is in the public domain
2AM_CPPFLAGS = -I$(top_srcdir)/src/include 2AM_CPPFLAGS = -I$(top_srcdir)/src/include \
3 $(GNUNET_CPPFLAGS)
3 4
4pkgcfgdir= $(pkgdatadir)/config.d/ 5pkgcfgdir= $(pkgdatadir)/config.d/
5 6
@@ -21,7 +22,7 @@ libgnunetpsycutil_la_SOURCES = \
21 psyc_message.c \ 22 psyc_message.c \
22 psyc_slicer.c 23 psyc_slicer.c
23libgnunetpsycutil_la_LIBADD = \ 24libgnunetpsycutil_la_LIBADD = \
24 $(top_builddir)/src/util/libgnunetutil.la \ 25 -lgnunetutil \
25 $(GN_LIBINTL) $(XLIB) 26 $(GN_LIBINTL) $(XLIB)
26libgnunetpsycutil_la_LDFLAGS = \ 27libgnunetpsycutil_la_LDFLAGS = \
27 $(GN_LIB_LDFLAGS) $(WINFLAGS) \ 28 $(GN_LIB_LDFLAGS) $(WINFLAGS) \
@@ -41,5 +42,5 @@ test_psyc_env_SOURCES = \
41 test_psyc_env.c 42 test_psyc_env.c
42test_psyc_env_LDADD = \ 43test_psyc_env_LDADD = \
43 libgnunetpsycutil.la \ 44 libgnunetpsycutil.la \
44 $(top_builddir)/src/testing/libgnunettesting.la \ 45 -lgnunettesting \
45 $(top_builddir)/src/util/libgnunetutil.la 46 -lgnunetutil
diff --git a/src/psycutil/psyc_env.c b/src/psycutil/psyc_env.c
index fc4b8eb..0e550ac 100644
--- a/src/psycutil/psyc_env.c
+++ b/src/psycutil/psyc_env.c
@@ -26,8 +26,8 @@
26 * PSYC and Social messages. 26 * PSYC and Social messages.
27 */ 27 */
28 28
29#include "platform.h" 29#include <gnunet/platform.h>
30#include "gnunet_util_lib.h" 30#include <gnunet/gnunet_util_lib.h>
31#include "gnunet_psyc_env.h" 31#include "gnunet_psyc_env.h"
32 32
33/** 33/**
diff --git a/src/psycutil/psyc_message.c b/src/psycutil/psyc_message.c
index a03eff4..50ee8a9 100644
--- a/src/psycutil/psyc_message.c
+++ b/src/psycutil/psyc_message.c
@@ -26,8 +26,8 @@
26 26
27#include <inttypes.h> 27#include <inttypes.h>
28 28
29#include "platform.h" 29#include <gnunet/platform.h>
30#include "gnunet_util_lib.h" 30#include <gnunet/gnunet_util_lib.h>
31#include "gnunet_psyc_util_lib.h" 31#include "gnunet_psyc_util_lib.h"
32#include "gnunet_psyc_service.h" 32#include "gnunet_psyc_service.h"
33 33
diff --git a/src/psycutil/psyc_slicer.c b/src/psycutil/psyc_slicer.c
index 9b25d8a..05639e2 100644
--- a/src/psycutil/psyc_slicer.c
+++ b/src/psycutil/psyc_slicer.c
@@ -27,8 +27,8 @@
27 27
28#include <inttypes.h> 28#include <inttypes.h>
29 29
30#include "platform.h" 30#include <gnunet/platform.h>
31#include "gnunet_util_lib.h" 31#include <gnunet/gnunet_util_lib.h>
32#include "gnunet_psyc_util_lib.h" 32#include "gnunet_psyc_util_lib.h"
33 33
34#define LOG(kind,...) GNUNET_log_from (kind, "psyc-util-slicer",__VA_ARGS__) 34#define LOG(kind,...) GNUNET_log_from (kind, "psyc-util-slicer",__VA_ARGS__)
diff --git a/src/psycutil/test_psyc_env.c b/src/psycutil/test_psyc_env.c
index 432e155..186f5ac 100644
--- a/src/psycutil/test_psyc_env.c
+++ b/src/psycutil/test_psyc_env.c
@@ -25,9 +25,9 @@
25 * Tests for the environment library. 25 * Tests for the environment library.
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_testing_lib.h" 30#include <gnunet/gnunet_testing_lib.h>
31#include "gnunet_psyc_util_lib.h" 31#include "gnunet_psyc_util_lib.h"
32 32
33struct GNUNET_PSYC_Modifier mods[] = { 33struct GNUNET_PSYC_Modifier mods[] = {
diff --git a/src/social/Makefile.am b/src/social/Makefile.am
index 94a9ba1..bb125a8 100644
--- a/src/social/Makefile.am
+++ b/src/social/Makefile.am
@@ -1,5 +1,6 @@
1# This Makefile.am is in the public domain 1# This Makefile.am is in the public domain
2AM_CPPFLAGS = -I$(top_srcdir)/src/include 2AM_CPPFLAGS = -I$(top_srcdir)/src/include \
3 $(GNUNET_CPPFLAGS)
3 4
4pkgcfgdir= $(pkgdatadir)/config.d/ 5pkgcfgdir= $(pkgdatadir)/config.d/
5 6
@@ -23,7 +24,7 @@ lib_LTLIBRARIES = libgnunetsocial.la
23libgnunetsocial_la_SOURCES = \ 24libgnunetsocial_la_SOURCES = \
24 social_api.c social.h 25 social_api.c social.h
25libgnunetsocial_la_LIBADD = \ 26libgnunetsocial_la_LIBADD = \
26 $(top_builddir)/src/util/libgnunetutil.la \ 27 -lgnunetutil \
27 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \ 28 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
28 $(GN_LIBINTL) $(XLIB) 29 $(GN_LIBINTL) $(XLIB)
29libgnunetsocial_la_LDFLAGS = \ 30libgnunetsocial_la_LDFLAGS = \
@@ -41,18 +42,18 @@ gnunet_social_SOURCES = \
41gnunet_social_LDADD = \ 42gnunet_social_LDADD = \
42 libgnunetsocial.la \ 43 libgnunetsocial.la \
43 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \ 44 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
44 $(top_builddir)/src/util/libgnunetutil.la 45 -lgnunetutil
45 46
46gnunet_service_social_SOURCES = \ 47gnunet_service_social_SOURCES = \
47 gnunet-service-social.c 48 gnunet-service-social.c
48gnunet_service_social_LDADD = \ 49gnunet_service_social_LDADD = \
49 $(top_builddir)/src/util/libgnunetutil.la \ 50 -lgnunetutil \
50 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 51 -lgnunetstatistics \
51 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \ 52 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
52 $(top_builddir)/src/psyc/libgnunetpsyc.la \ 53 $(top_builddir)/src/psyc/libgnunetpsyc.la \
53 $(top_builddir)/src/identity/libgnunetidentity.la \ 54 -lgnunetidentity \
54 $(top_builddir)/src/gns/libgnunetgns.la \ 55 -lgnunetgns \
55 $(top_builddir)/src/namestore/libgnunetnamestore.la \ 56 -lgnunetnamestore \
56 $(GN_LIBINTL) 57 $(GN_LIBINTL)
57 58
58 59
@@ -70,10 +71,10 @@ test_social_SOURCES = \
70 test_social.c 71 test_social.c
71test_social_LDADD = \ 72test_social_LDADD = \
72 libgnunetsocial.la \ 73 libgnunetsocial.la \
73 $(top_builddir)/src/testing/libgnunettesting.la \ 74 -lgnunettesting \
74 $(top_builddir)/src/util/libgnunetutil.la \ 75 -lgnunetutil \
75 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \ 76 $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
76 $(top_builddir)/src/identity/libgnunetidentity.la 77 -lgnunetidentity
77 78
78EXTRA_DIST = \ 79EXTRA_DIST = \
79 test_social.conf 80 test_social.conf
diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c
index 33fabae..cda96e5 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -27,14 +27,14 @@
27#include <inttypes.h> 27#include <inttypes.h>
28#include <strings.h> 28#include <strings.h>
29 29
30#include "platform.h" 30#include <gnunet/platform.h>
31#include "gnunet_util_lib.h" 31#include <gnunet/gnunet_util_lib.h>
32#include "gnunet_constants.h" 32#include <gnunet/gnunet_constants.h>
33#include "gnunet_protocols.h" 33#include <gnunet/gnunet_protocols.h>
34#include "gnunet_identity_service.h" 34#include <gnunet/gnunet_identity_service.h>
35#include "gnunet_namestore_service.h" 35#include <gnunet/gnunet_namestore_service.h>
36#include "gnunet_gns_service.h" 36#include <gnunet/gnunet_gns_service.h>
37#include "gnunet_statistics_service.h" 37#include <gnunet/gnunet_statistics_service.h>
38#include "gnunet_psyc_service.h" 38#include "gnunet_psyc_service.h"
39#include "gnunet_psyc_util_lib.h" 39#include "gnunet_psyc_util_lib.h"
40#include "gnunet_social_service.h" 40#include "gnunet_social_service.h"
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c
index 14701bf..d89b3d8 100644
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@ -26,8 +26,8 @@
26 26
27#include <inttypes.h> 27#include <inttypes.h>
28 28
29#include "platform.h" 29#include <gnunet/platform.h>
30#include "gnunet_util_lib.h" 30#include <gnunet/gnunet_util_lib.h>
31#include "gnunet_social_service.h" 31#include "gnunet_social_service.h"
32 32
33#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) 33#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
diff --git a/src/social/social.h b/src/social/social.h
index 73f73f6..a6d325e 100644
--- a/src/social/social.h
+++ b/src/social/social.h
@@ -27,7 +27,7 @@
27#ifndef SOCIAL_H 27#ifndef SOCIAL_H
28#define SOCIAL_H 28#define SOCIAL_H
29 29
30#include "platform.h" 30#include <gnunet/platform.h>
31#include "gnunet_social_service.h" 31#include "gnunet_social_service.h"
32 32
33enum MessageState 33enum MessageState
diff --git a/src/social/social_api.c b/src/social/social_api.c
index 9b96580..11f1eab 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -28,8 +28,8 @@
28#include <inttypes.h> 28#include <inttypes.h>
29#include <string.h> 29#include <string.h>
30 30
31#include "platform.h" 31#include <gnunet/platform.h>
32#include "gnunet_util_lib.h" 32#include <gnunet/gnunet_util_lib.h>
33#include "gnunet_psyc_service.h" 33#include "gnunet_psyc_service.h"
34#include "gnunet_psyc_util_lib.h" 34#include "gnunet_psyc_util_lib.h"
35#include "gnunet_social_service.h" 35#include "gnunet_social_service.h"
diff --git a/src/social/test_social.c b/src/social/test_social.c
index feac3c5..3538ac8 100644
--- a/src/social/test_social.c
+++ b/src/social/test_social.c
@@ -25,14 +25,14 @@
25 25
26#include <inttypes.h> 26#include <inttypes.h>
27 27
28#include "platform.h" 28#include <gnunet/platform.h>
29#include "gnunet_crypto_lib.h" 29#include <gnunet/gnunet_crypto_lib.h>
30#include "gnunet_common.h" 30#include <gnunet/gnunet_common.h>
31#include "gnunet_util_lib.h" 31#include <gnunet/gnunet_util_lib.h>
32#include "gnunet_testing_lib.h" 32#include <gnunet/gnunet_testing_lib.h>
33#include "gnunet_psyc_util_lib.h" 33#include "gnunet_psyc_util_lib.h"
34#include "gnunet_social_service.h" 34#include "gnunet_social_service.h"
35#include "gnunet_identity_service.h" 35#include <gnunet/gnunet_identity_service.h>
36 36
37#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) 37#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
38 38
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 20:44:45 +0000