diff options
Diffstat (limited to 'src/psyc')
-rw-r--r-- | src/psyc/Makefile.am | 21 | ||||
-rw-r--r-- | src/psyc/gnunet-service-psyc.c | 10 | ||||
-rw-r--r-- | src/psyc/psyc.h | 2 | ||||
-rw-r--r-- | src/psyc/psyc_api.c | 4 | ||||
-rw-r--r-- | src/psyc/test_psyc.c | 10 | ||||
-rw-r--r-- | src/psyc/test_psyc2.c | 10 | ||||
-rw-r--r-- | src/psyc/test_psyc_api_join.c | 10 |
7 files changed, 31 insertions, 36 deletions
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 |
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | 2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include \ |
3 | $(GNUNET_CPPFLAGS) | ||
3 | 4 | ||
4 | pkgcfgdir= $(pkgdatadir)/config.d/ | 5 | pkgcfgdir= $(pkgdatadir)/config.d/ |
5 | 6 | ||
@@ -23,7 +24,7 @@ lib_LTLIBRARIES = libgnunetpsyc.la | |||
23 | libgnunetpsyc_la_SOURCES = \ | 24 | libgnunetpsyc_la_SOURCES = \ |
24 | psyc_api.c psyc.h | 25 | psyc_api.c psyc.h |
25 | libgnunetpsyc_la_LIBADD = \ | 26 | libgnunetpsyc_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) |
29 | libgnunetpsyc_la_LDFLAGS = \ | 30 | libgnunetpsyc_la_LDFLAGS = \ |
@@ -38,8 +39,8 @@ libexec_PROGRAMS = \ | |||
38 | gnunet_service_psyc_SOURCES = \ | 39 | gnunet_service_psyc_SOURCES = \ |
39 | gnunet-service-psyc.c | 40 | gnunet-service-psyc.c |
40 | gnunet_service_psyc_LDADD = \ | 41 | gnunet_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 = \ | |||
63 | test_psyc_LDADD = \ | 64 | test_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 | ||
76 | EXTRA_DIST = \ | 71 | EXTRA_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" |