fix FTBFS issues

This commit is contained in:
Christian Grothoff 2019-02-11 20:59:34 +01:00
parent f3b5e31a81
commit 5ac774e1b3
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
45 changed files with 196 additions and 176 deletions

View File

@ -1 +1,2 @@
Gabor (tgx) Toth
Christian Grothoff Christian Grothoff

5
bin/pogen.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
# This script is in the public domain.
find src -name "*.c" | grep -v \# | grep -v /test_ | grep -v /perf_ | grep -v _old | grep -v chat | grep -v .libs/ | sort > po/POTFILES.in
grep -l _\( `find src -name "*.h"` | grep -v "platform.h" | grep -v _old | grep -v chat | sort >> po/POTFILES.in

View File

@ -1,2 +1,16 @@
# List of source files which contain translatable strings. src/multicast/gnunet-multicast.c
src/ext/gnunet-ext.c src/multicast/gnunet-service-multicast.c
src/multicast/multicast_api.c
src/psyc/gnunet-service-psyc.c
src/psyc/psyc_api.c
src/psycstore/gnunet-service-psycstore.c
src/psycstore/plugin_psycstore_mysql.c
src/psycstore/plugin_psycstore_postgres.c
src/psycstore/plugin_psycstore_sqlite.c
src/psycstore/psycstore_api.c
src/psycutil/psyc_env.c
src/psycutil/psyc_message.c
src/psycutil/psyc_slicer.c
src/social/gnunet-service-social.c
src/social/gnunet-social.c
src/social/social_api.c

View File

@ -41,8 +41,8 @@ extern "C"
#endif #endif
#endif #endif
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_transport_service.h" #include <gnunet/gnunet_transport_service.h>
/** /**
* Version number of GNUnet-multicast API. * Version number of GNUnet-multicast API.

View File

@ -41,7 +41,7 @@ extern "C"
#endif #endif
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"

View File

@ -98,7 +98,7 @@ extern "C"
#endif #endif
#endif #endif
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
//Mingw work around //Mingw work around
#ifdef MINGW #ifdef MINGW

View File

@ -42,7 +42,7 @@ extern "C"
#endif #endif
#endif #endif
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
/** /**

View File

@ -31,7 +31,7 @@
#ifndef GNUNET_PSYCSTORE_PLUGIN_H #ifndef GNUNET_PSYCSTORE_PLUGIN_H
#define GNUNET_PSYCSTORE_PLUGIN_H #define GNUNET_PSYCSTORE_PLUGIN_H
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_psycstore_service.h" #include "gnunet_psycstore_service.h"
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -40,7 +40,7 @@ extern "C"
#endif #endif
#endif #endif
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"

View File

@ -226,10 +226,10 @@ extern "C"
#endif #endif
#include <stdint.h> #include <stdint.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_identity_service.h" #include <gnunet/gnunet_identity_service.h>
#include "gnunet_namestore_service.h" #include <gnunet/gnunet_namestore_service.h>
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"

View File

@ -1,6 +1,6 @@
# This Makefile.am is in the public domain # This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include AM_CPPFLAGS = -I$(top_srcdir)/src/include \
$(GNUNET_CPPFLAGS)
pkgcfgdir= $(pkgdatadir)/config.d/ pkgcfgdir= $(pkgdatadir)/config.d/
libexecdir= $(pkglibdir)/libexec/ libexecdir= $(pkglibdir)/libexec/
@ -21,7 +21,7 @@ lib_LTLIBRARIES = libgnunetmulticast.la
libgnunetmulticast_la_SOURCES = \ libgnunetmulticast_la_SOURCES = \
multicast_api.c multicast.h multicast_api.c multicast.h
libgnunetmulticast_la_LIBADD = \ libgnunetmulticast_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \ -lgnunetutil \
$(GN_LIBINTL) $(XLIB) $(GN_LIBINTL) $(XLIB)
libgnunetmulticast_la_LDFLAGS = \ libgnunetmulticast_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
@ -38,15 +38,15 @@ libexec_PROGRAMS = \
gnunet_multicast_SOURCES = \ gnunet_multicast_SOURCES = \
gnunet-multicast.c gnunet-multicast.c
gnunet_multicast_LDADD = \ gnunet_multicast_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \ -lgnunetutil \
$(GN_LIBINTL) $(GN_LIBINTL)
gnunet_service_multicast_SOURCES = \ gnunet_service_multicast_SOURCES = \
gnunet-service-multicast.c gnunet-service-multicast.c
gnunet_service_multicast_LDADD = \ gnunet_service_multicast_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \ -lgnunetutil \
$(top_builddir)/src/cadet/libgnunetcadet.la \ -lgnunetcadet \
$(top_builddir)/src/statistics/libgnunetstatistics.la \ -lgnunetstatistics \
$(GN_LIBINTL) $(GN_LIBINTL)
check_PROGRAMS = \ check_PROGRAMS = \
@ -63,17 +63,17 @@ test_multicast_SOURCES = \
test_multicast.c test_multicast.c
test_multicast_LDADD = \ test_multicast_LDADD = \
libgnunetmulticast.la \ libgnunetmulticast.la \
$(top_builddir)/src/testing/libgnunettesting.la \ -lgnunettesting \
$(top_builddir)/src/util/libgnunetutil.la -lgnunetutil
test_multicast_multipeer_star_SOURCES = \ test_multicast_multipeer_star_SOURCES = \
test_multicast_multipeer.c test_multicast_multipeer.c
test_multicast_multipeer_star_LDADD = \ test_multicast_multipeer_star_LDADD = \
libgnunetmulticast.la \ libgnunetmulticast.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \ -lgnunettestbed \
$(top_builddir)/src/util/libgnunetutil.la -lgnunetutil
test_multicast_multipeer_line_SOURCES = \ test_multicast_multipeer_line_SOURCES = \
test_multicast_multipeer.c test_multicast_multipeer.c
test_multicast_multipeer_line_LDADD = \ test_multicast_multipeer_line_LDADD = \
libgnunetmulticast.la \ libgnunetmulticast.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \ -lgnunettestbed \
$(top_builddir)/src/util/libgnunetutil.la -lgnunetutil

View File

@ -23,8 +23,8 @@
* @brief multicast for writing a tool * @brief multicast for writing a tool
* @author Christian Grothoff * @author Christian Grothoff
*/ */
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
/* #include "gnunet_multicast_service.h" */ /* #include "gnunet_multicast_service.h" */
/** /**

View File

@ -23,12 +23,12 @@
* @brief program that does multicast * @brief program that does multicast
* @author Christian Grothoff * @author Christian Grothoff
*/ */
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_signatures.h" #include <gnunet/gnunet_signatures.h>
#include "gnunet_applications.h" #include <gnunet/gnunet_applications.h>
#include "gnunet_statistics_service.h" #include <gnunet/gnunet_statistics_service.h>
#include "gnunet_cadet_service.h" #include <gnunet/gnunet_cadet_service.h>
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#include "multicast.h" #include "multicast.h"

View File

@ -27,7 +27,7 @@
#ifndef MULTICAST_H #ifndef MULTICAST_H
#define MULTICAST_H #define MULTICAST_H
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
GNUNET_NETWORK_STRUCT_BEGIN GNUNET_NETWORK_STRUCT_BEGIN

View File

@ -25,8 +25,8 @@
* @author Gabor X Toth * @author Gabor X Toth
*/ */
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#include "multicast.h" #include "multicast.h"

View File

@ -26,11 +26,11 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_crypto_lib.h" #include <gnunet/gnunet_crypto_lib.h>
#include "gnunet_common.h" #include <gnunet/gnunet_common.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_testing_lib.h" #include <gnunet/gnunet_testing_lib.h>
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)

View File

@ -27,11 +27,11 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_crypto_lib.h" #include <gnunet/gnunet_crypto_lib.h>
#include "gnunet_common.h" #include <gnunet/gnunet_common.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_testbed_service.h" #include <gnunet/gnunet_testbed_service.h>
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#define NUM_PEERS 2 #define NUM_PEERS 2

View File

@ -26,11 +26,11 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_crypto_lib.h" #include <gnunet/gnunet_crypto_lib.h>
#include "gnunet_common.h" #include <gnunet/gnunet_common.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_testbed_service.h" #include <gnunet/gnunet_testbed_service.h>
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#define PEERS_REQUESTED 12 #define PEERS_REQUESTED 12

View File

@ -1,5 +1,6 @@
# This Makefile.am is in the public domain # This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include AM_CPPFLAGS = -I$(top_srcdir)/src/include \
$(GNUNET_CPPFLAGS)
pkgcfgdir= $(pkgdatadir)/config.d/ pkgcfgdir= $(pkgdatadir)/config.d/
@ -23,7 +24,7 @@ lib_LTLIBRARIES = libgnunetpsyc.la
libgnunetpsyc_la_SOURCES = \ libgnunetpsyc_la_SOURCES = \
psyc_api.c psyc.h psyc_api.c psyc.h
libgnunetpsyc_la_LIBADD = \ libgnunetpsyc_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \ -lgnunetutil \
$(top_builddir)/src/psycutil/libgnunetpsycutil.la \ $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
$(GN_LIBINTL) $(XLIB) $(GN_LIBINTL) $(XLIB)
libgnunetpsyc_la_LDFLAGS = \ libgnunetpsyc_la_LDFLAGS = \
@ -38,8 +39,8 @@ libexec_PROGRAMS = \
gnunet_service_psyc_SOURCES = \ gnunet_service_psyc_SOURCES = \
gnunet-service-psyc.c gnunet-service-psyc.c
gnunet_service_psyc_LDADD = \ gnunet_service_psyc_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \ -lgnunetutil \
$(top_builddir)/src/statistics/libgnunetstatistics.la \ -lgnunetstatistics \
$(top_builddir)/src/multicast/libgnunetmulticast.la \ $(top_builddir)/src/multicast/libgnunetmulticast.la \
$(top_builddir)/src/psycstore/libgnunetpsycstore.la \ $(top_builddir)/src/psycstore/libgnunetpsycstore.la \
$(top_builddir)/src/psycutil/libgnunetpsycutil.la \ $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
@ -63,15 +64,9 @@ test_psyc_SOURCES = \
test_psyc_LDADD = \ test_psyc_LDADD = \
libgnunetpsyc.la \ libgnunetpsyc.la \
$(top_builddir)/src/psycutil/libgnunetpsycutil.la \ $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \ -lgnunettesting \
$(top_builddir)/src/util/libgnunetutil.la -lgnunetutil
#test_psyc2_SOURCES = \
# test_psyc2.c
#test_psyc2_LDADD = \
# libgnunetpsyc.la \
# $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
# $(top_builddir)/src/testbed/libgnunettestbed.la \
# $(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \ EXTRA_DIST = \
test_psyc.conf test_psyc.conf

View File

@ -26,11 +26,11 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_constants.h" #include <gnunet/gnunet_constants.h>
#include "gnunet_protocols.h" #include <gnunet/gnunet_protocols.h>
#include "gnunet_statistics_service.h" #include <gnunet/gnunet_statistics_service.h>
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#include "gnunet_psycstore_service.h" #include "gnunet_psycstore_service.h"
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"

View File

@ -27,7 +27,7 @@
#ifndef PSYC_H #ifndef PSYC_H
#define PSYC_H #define PSYC_H
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"

View File

@ -32,8 +32,8 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"

View File

@ -27,11 +27,11 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_crypto_lib.h" #include <gnunet/gnunet_crypto_lib.h>
#include "gnunet_common.h" #include <gnunet/gnunet_common.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_testing_lib.h" #include <gnunet/gnunet_testing_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"

View File

@ -24,11 +24,11 @@
* @author xrs * @author xrs
*/ */
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_crypto_lib.h" #include <gnunet/gnunet_crypto_lib.h>
#include "gnunet_common.h" #include <gnunet/gnunet_common.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_testbed_service.h" #include <gnunet/gnunet_testbed_service.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"

View File

@ -32,11 +32,11 @@
* - main can not contain GNUNET_log() * - main can not contain GNUNET_log()
*/ */
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_crypto_lib.h" #include <gnunet/gnunet_crypto_lib.h>
#include "gnunet_common.h" #include <gnunet/gnunet_common.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_testbed_service.h" #include <gnunet/gnunet_testbed_service.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"
#include "psyc_test_lib.h" #include "psyc_test_lib.h"

View File

@ -1,5 +1,6 @@
# This Makefile.am is in the public domain # This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include AM_CPPFLAGS = -I$(top_srcdir)/src/include \
$(GNUNET_CPPFLAGS)
plugindir = $(libdir)/gnunet plugindir = $(libdir)/gnunet
@ -47,7 +48,7 @@ libgnunetpsycstore_la_SOURCES = \
psycstore_api.c \ psycstore_api.c \
psycstore.h psycstore.h
libgnunetpsycstore_la_LIBADD = \ libgnunetpsycstore_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \ -lgnunetutil \
$(GN_LIBINTL) $(XLIB) $(GN_LIBINTL) $(XLIB)
libgnunetpsycstore_la_LDFLAGS = \ libgnunetpsycstore_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
@ -61,9 +62,9 @@ libexec_PROGRAMS = \
gnunet_service_psycstore_SOURCES = \ gnunet_service_psycstore_SOURCES = \
gnunet-service-psycstore.c gnunet-service-psycstore.c
gnunet_service_psycstore_LDADD = \ gnunet_service_psycstore_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/psycutil/libgnunetpsycutil.la \ $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
-lgnunetstatistics \
-lgnunetutil \
$(GN_LIBINTL) $(GN_LIBINTL)
plugin_LTLIBRARIES = \ plugin_LTLIBRARIES = \
@ -76,10 +77,11 @@ libgnunet_plugin_psycstore_mysql_la_SOURCES = \
plugin_psycstore_mysql.c plugin_psycstore_mysql.c
libgnunet_plugin_psycstore_mysql_la_LIBADD = \ libgnunet_plugin_psycstore_mysql_la_LIBADD = \
libgnunetpsycstore.la \ libgnunetpsycstore.la \
$(top_builddir)/src/my/libgnunetmy.la \ -lgnunetmy \
$(top_builddir)/src/mysql/libgnunetmysql.la \ -lgnunetmysql \
$(top_builddir)/src/statistics/libgnunetstatistics.la \ -lgnunetstatistics \
$(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ -lgnunetutil \
$(XLIBS) \
$(LTLIBINTL) $(LTLIBINTL)
libgnunet_plugin_psycstore_mysql_la_LDFLAGS = \ libgnunet_plugin_psycstore_mysql_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS) $(GN_PLUGIN_LDFLAGS)
@ -88,9 +90,10 @@ libgnunet_plugin_psycstore_postgres_la_SOURCES = \
plugin_psycstore_postgres.c plugin_psycstore_postgres.c
libgnunet_plugin_psycstore_postgres_la_LIBADD = \ libgnunet_plugin_psycstore_postgres_la_LIBADD = \
libgnunetpsycstore.la \ libgnunetpsycstore.la \
$(top_builddir)/src/pq/libgnunetpq.la \ -lgnunetpq \
$(top_builddir)/src/statistics/libgnunetstatistics.la \ -lgnunetstatistics \
$(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq \ -lgnunetutil \
$(XLIBS) -lpq \
$(LTLIBINTL) $(LTLIBINTL)
libgnunet_plugin_psycstore_postgres_la_LDFLAGS = \ libgnunet_plugin_psycstore_postgres_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
@ -102,8 +105,9 @@ libgnunet_plugin_psycstore_sqlite_la_SOURCES = \
plugin_psycstore_sqlite.c plugin_psycstore_sqlite.c
libgnunet_plugin_psycstore_sqlite_la_LIBADD = \ libgnunet_plugin_psycstore_sqlite_la_LIBADD = \
libgnunetpsycstore.la \ libgnunetpsycstore.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \ -lgnunetstatistics \
$(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ -lgnunetutil \
$(XLIBS) -lsqlite3 \
$(LTLIBINTL) $(LTLIBINTL)
libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \ libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS) $(GN_PLUGIN_LDFLAGS)
@ -128,8 +132,8 @@ test_psycstore_SOURCES = \
test_psycstore.c test_psycstore.c
test_psycstore_LDADD = \ test_psycstore_LDADD = \
libgnunetpsycstore.la \ libgnunetpsycstore.la \
$(top_builddir)/src/testing/libgnunettesting.la \ -lgnunettesting \
$(top_builddir)/src/util/libgnunetutil.la -lgnunetutil
EXTRA_DIST = \ EXTRA_DIST = \
test_psycstore.conf test_psycstore.conf
@ -138,18 +142,17 @@ EXTRA_DIST = \
test_plugin_psycstore_sqlite_SOURCES = \ test_plugin_psycstore_sqlite_SOURCES = \
test_plugin_psycstore.c test_plugin_psycstore.c
test_plugin_psycstore_sqlite_LDADD = \ test_plugin_psycstore_sqlite_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \ -lgnunettesting \
$(top_builddir)/src/util/libgnunetutil.la -lgnunetutil
test_plugin_psycstore_mysql_SOURCES = \ test_plugin_psycstore_mysql_SOURCES = \
test_plugin_psycstore.c test_plugin_psycstore.c
test_plugin_psycstore_mysql_LDADD = \ test_plugin_psycstore_mysql_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \ -lgnunettesting \
$(top_builddir)/src/util/libgnunetutil.la -lgnunetutil
test_plugin_psycstore_postgres_SOURCES = \ test_plugin_psycstore_postgres_SOURCES = \
test_plugin_psycstore.c test_plugin_psycstore.c
test_plugin_psycstore_postgres_LDADD = \ test_plugin_psycstore_postgres_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \ -lgnunettesting \
$(top_builddir)/src/util/libgnunetutil.la -lgnunetutil

View File

@ -27,11 +27,11 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_constants.h" #include <gnunet/gnunet_constants.h>
#include "gnunet_protocols.h" #include <gnunet/gnunet_protocols.h>
#include "gnunet_statistics_service.h" #include <gnunet/gnunet_statistics_service.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_psycstore_service.h" #include "gnunet_psycstore_service.h"
#include "gnunet_psycstore_plugin.h" #include "gnunet_psycstore_plugin.h"

View File

@ -26,11 +26,11 @@
* @author Christophe Genevey * @author Christophe Genevey
*/ */
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_psycstore_plugin.h" #include "gnunet_psycstore_plugin.h"
#include "gnunet_psycstore_service.h" #include "gnunet_psycstore_service.h"
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#include "gnunet_crypto_lib.h" #include <gnunet/gnunet_crypto_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "psycstore.h" #include "psycstore.h"
#include "gnunet_my_lib.h" #include "gnunet_my_lib.h"

View File

@ -28,14 +28,14 @@
* @author Jeffrey Burdges * @author Jeffrey Burdges
*/ */
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_psycstore_plugin.h" #include "gnunet_psycstore_plugin.h"
#include "gnunet_psycstore_service.h" #include "gnunet_psycstore_service.h"
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#include "gnunet_crypto_lib.h" #include <gnunet/gnunet_crypto_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "psycstore.h" #include "psycstore.h"
#include "gnunet_pq_lib.h" #include <gnunet/gnunet_pq_lib.h>
/** /**
* After how many ms "busy" should a DB operation fail for good? A * After how many ms "busy" should a DB operation fail for good? A

View File

@ -30,11 +30,11 @@
* thus it can only store 63 bits of the uint64_t's. * thus it can only store 63 bits of the uint64_t's.
*/ */
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_psycstore_plugin.h" #include "gnunet_psycstore_plugin.h"
#include "gnunet_psycstore_service.h" #include "gnunet_psycstore_service.h"
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#include "gnunet_crypto_lib.h" #include <gnunet/gnunet_crypto_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "psycstore.h" #include "psycstore.h"
#include <sqlite3.h> #include <sqlite3.h>

View File

@ -27,7 +27,7 @@
#ifndef GNUNET_PSYCSTORE_H #ifndef GNUNET_PSYCSTORE_H
#define GNUNET_PSYCSTORE_H #define GNUNET_PSYCSTORE_H
#include "gnunet_common.h" #include <gnunet/gnunet_common.h>
GNUNET_NETWORK_STRUCT_BEGIN GNUNET_NETWORK_STRUCT_BEGIN

View File

@ -27,10 +27,10 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_constants.h" #include <gnunet/gnunet_constants.h>
#include "gnunet_protocols.h" #include <gnunet/gnunet_protocols.h>
#include "gnunet_psycstore_service.h" #include "gnunet_psycstore_service.h"
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"
#include "psycstore.h" #include "psycstore.h"

View File

@ -28,9 +28,9 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_testing_lib.h" #include <gnunet/gnunet_testing_lib.h>
#include "gnunet_psycstore_plugin.h" #include "gnunet_psycstore_plugin.h"
#include "gnunet_psycstore_service.h" #include "gnunet_psycstore_service.h"
#include "gnunet_multicast_service.h" #include "gnunet_multicast_service.h"

View File

@ -27,10 +27,10 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_common.h" #include <gnunet/gnunet_common.h>
#include "gnunet_testing_lib.h" #include <gnunet/gnunet_testing_lib.h>
#include "gnunet_psycstore_service.h" #include "gnunet_psycstore_service.h"
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)

View File

@ -1,5 +1,6 @@
# This Makefile.am is in the public domain # This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include AM_CPPFLAGS = -I$(top_srcdir)/src/include \
$(GNUNET_CPPFLAGS)
pkgcfgdir= $(pkgdatadir)/config.d/ pkgcfgdir= $(pkgdatadir)/config.d/
@ -21,7 +22,7 @@ libgnunetpsycutil_la_SOURCES = \
psyc_message.c \ psyc_message.c \
psyc_slicer.c psyc_slicer.c
libgnunetpsycutil_la_LIBADD = \ libgnunetpsycutil_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \ -lgnunetutil \
$(GN_LIBINTL) $(XLIB) $(GN_LIBINTL) $(XLIB)
libgnunetpsycutil_la_LDFLAGS = \ libgnunetpsycutil_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) $(WINFLAGS) \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \
@ -41,5 +42,5 @@ test_psyc_env_SOURCES = \
test_psyc_env.c test_psyc_env.c
test_psyc_env_LDADD = \ test_psyc_env_LDADD = \
libgnunetpsycutil.la \ libgnunetpsycutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \ -lgnunettesting \
$(top_builddir)/src/util/libgnunetutil.la -lgnunetutil

View File

@ -26,8 +26,8 @@
* PSYC and Social messages. * PSYC and Social messages.
*/ */
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_psyc_env.h" #include "gnunet_psyc_env.h"
/** /**

View File

@ -26,8 +26,8 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"

View File

@ -27,8 +27,8 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#define LOG(kind,...) GNUNET_log_from (kind, "psyc-util-slicer",__VA_ARGS__) #define LOG(kind,...) GNUNET_log_from (kind, "psyc-util-slicer",__VA_ARGS__)

View File

@ -25,9 +25,9 @@
* Tests for the environment library. * Tests for the environment library.
*/ */
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_testing_lib.h" #include <gnunet/gnunet_testing_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
struct GNUNET_PSYC_Modifier mods[] = { struct GNUNET_PSYC_Modifier mods[] = {

View File

@ -1,5 +1,6 @@
# This Makefile.am is in the public domain # This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include AM_CPPFLAGS = -I$(top_srcdir)/src/include \
$(GNUNET_CPPFLAGS)
pkgcfgdir= $(pkgdatadir)/config.d/ pkgcfgdir= $(pkgdatadir)/config.d/
@ -23,7 +24,7 @@ lib_LTLIBRARIES = libgnunetsocial.la
libgnunetsocial_la_SOURCES = \ libgnunetsocial_la_SOURCES = \
social_api.c social.h social_api.c social.h
libgnunetsocial_la_LIBADD = \ libgnunetsocial_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \ -lgnunetutil \
$(top_builddir)/src/psycutil/libgnunetpsycutil.la \ $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
$(GN_LIBINTL) $(XLIB) $(GN_LIBINTL) $(XLIB)
libgnunetsocial_la_LDFLAGS = \ libgnunetsocial_la_LDFLAGS = \
@ -41,18 +42,18 @@ gnunet_social_SOURCES = \
gnunet_social_LDADD = \ gnunet_social_LDADD = \
libgnunetsocial.la \ libgnunetsocial.la \
$(top_builddir)/src/psycutil/libgnunetpsycutil.la \ $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
$(top_builddir)/src/util/libgnunetutil.la -lgnunetutil
gnunet_service_social_SOURCES = \ gnunet_service_social_SOURCES = \
gnunet-service-social.c gnunet-service-social.c
gnunet_service_social_LDADD = \ gnunet_service_social_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \ -lgnunetutil \
$(top_builddir)/src/statistics/libgnunetstatistics.la \ -lgnunetstatistics \
$(top_builddir)/src/psycutil/libgnunetpsycutil.la \ $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
$(top_builddir)/src/psyc/libgnunetpsyc.la \ $(top_builddir)/src/psyc/libgnunetpsyc.la \
$(top_builddir)/src/identity/libgnunetidentity.la \ -lgnunetidentity \
$(top_builddir)/src/gns/libgnunetgns.la \ -lgnunetgns \
$(top_builddir)/src/namestore/libgnunetnamestore.la \ -lgnunetnamestore \
$(GN_LIBINTL) $(GN_LIBINTL)
@ -70,10 +71,10 @@ test_social_SOURCES = \
test_social.c test_social.c
test_social_LDADD = \ test_social_LDADD = \
libgnunetsocial.la \ libgnunetsocial.la \
$(top_builddir)/src/testing/libgnunettesting.la \ -lgnunettesting \
$(top_builddir)/src/util/libgnunetutil.la \ -lgnunetutil \
$(top_builddir)/src/psycutil/libgnunetpsycutil.la \ $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
$(top_builddir)/src/identity/libgnunetidentity.la -lgnunetidentity
EXTRA_DIST = \ EXTRA_DIST = \
test_social.conf test_social.conf

View File

@ -27,14 +27,14 @@
#include <inttypes.h> #include <inttypes.h>
#include <strings.h> #include <strings.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_constants.h" #include <gnunet/gnunet_constants.h>
#include "gnunet_protocols.h" #include <gnunet/gnunet_protocols.h>
#include "gnunet_identity_service.h" #include <gnunet/gnunet_identity_service.h>
#include "gnunet_namestore_service.h" #include <gnunet/gnunet_namestore_service.h>
#include "gnunet_gns_service.h" #include <gnunet/gnunet_gns_service.h>
#include "gnunet_statistics_service.h" #include <gnunet/gnunet_statistics_service.h>
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_social_service.h" #include "gnunet_social_service.h"

View File

@ -26,8 +26,8 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_social_service.h" #include "gnunet_social_service.h"
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)

View File

@ -27,7 +27,7 @@
#ifndef SOCIAL_H #ifndef SOCIAL_H
#define SOCIAL_H #define SOCIAL_H
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_social_service.h" #include "gnunet_social_service.h"
enum MessageState enum MessageState

View File

@ -28,8 +28,8 @@
#include <inttypes.h> #include <inttypes.h>
#include <string.h> #include <string.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_psyc_service.h" #include "gnunet_psyc_service.h"
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_social_service.h" #include "gnunet_social_service.h"

View File

@ -25,14 +25,14 @@
#include <inttypes.h> #include <inttypes.h>
#include "platform.h" #include <gnunet/platform.h>
#include "gnunet_crypto_lib.h" #include <gnunet/gnunet_crypto_lib.h>
#include "gnunet_common.h" #include <gnunet/gnunet_common.h>
#include "gnunet_util_lib.h" #include <gnunet/gnunet_util_lib.h>
#include "gnunet_testing_lib.h" #include <gnunet/gnunet_testing_lib.h>
#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_util_lib.h"
#include "gnunet_social_service.h" #include "gnunet_social_service.h"
#include "gnunet_identity_service.h" #include <gnunet/gnunet_identity_service.h>
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)