fix FTBFS issues

9 files changed, 49 insertions, 46 deletions

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 @@
 # 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
 
@@ -47,7 +48,7 @@ libgnunetpsycstore_la_SOURCES = \
   psycstore_api.c \
   psycstore.h
 libgnunetpsycstore_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(GN_LIBINTL) $(XLIB)
 libgnunetpsycstore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -61,9 +62,9 @@ libexec_PROGRAMS = \
 gnunet_service_psycstore_SOURCES = \
  gnunet-service-psycstore.c
 gnunet_service_psycstore_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
+  -lgnunetstatistics \
+  -lgnunetutil \
   $(GN_LIBINTL)
 
 plugin_LTLIBRARIES = \
@@ -76,10 +77,11 @@ libgnunet_plugin_psycstore_mysql_la_SOURCES = \
   plugin_psycstore_mysql.c
 libgnunet_plugin_psycstore_mysql_la_LIBADD = \
   libgnunetpsycstore.la  \
-  $(top_builddir)/src/my/libgnunetmy.la \
-  $(top_builddir)/src/mysql/libgnunetmysql.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  -lgnunetmy \
+  -lgnunetmysql \
+  -lgnunetstatistics \
+  -lgnunetutil \
+  $(XLIBS) \
   $(LTLIBINTL)
 libgnunet_plugin_psycstore_mysql_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -88,9 +90,10 @@ libgnunet_plugin_psycstore_postgres_la_SOURCES = \
   plugin_psycstore_postgres.c
 libgnunet_plugin_psycstore_postgres_la_LIBADD = \
   libgnunetpsycstore.la  \
-  $(top_builddir)/src/pq/libgnunetpq.la  \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq \
+  -lgnunetpq \
+  -lgnunetstatistics \
+  -lgnunetutil \
+  $(XLIBS) -lpq \
   $(LTLIBINTL)
 libgnunet_plugin_psycstore_postgres_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
@@ -102,8 +105,9 @@ libgnunet_plugin_psycstore_sqlite_la_SOURCES = \
   plugin_psycstore_sqlite.c
 libgnunet_plugin_psycstore_sqlite_la_LIBADD = \
   libgnunetpsycstore.la  \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  -lgnunetstatistics \
+  -lgnunetutil \
+  $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
@@ -128,8 +132,8 @@ test_psycstore_SOURCES = \
  test_psycstore.c
 test_psycstore_LDADD = \
   libgnunetpsycstore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettesting \
+  -lgnunetutil
 
 EXTRA_DIST = \
   test_psycstore.conf
@@ -138,18 +142,17 @@ EXTRA_DIST = \
 test_plugin_psycstore_sqlite_SOURCES = \
  test_plugin_psycstore.c
 test_plugin_psycstore_sqlite_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettesting \
+  -lgnunetutil
 
 test_plugin_psycstore_mysql_SOURCES = \
  test_plugin_psycstore.c
 test_plugin_psycstore_mysql_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunettesting \
+  -lgnunetutil
 
 test_plugin_psycstore_postgres_SOURCES = \
  test_plugin_psycstore.c
 test_plugin_psycstore_postgres_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-
+ -lgnunettesting \
+ -lgnunetutil
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 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
-#include "gnunet_statistics_service.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_constants.h>
+#include <gnunet/gnunet_protocols.h>
+#include <gnunet/gnunet_statistics_service.h>
 #include "gnunet_psyc_util_lib.h"
 #include "gnunet_psycstore_service.h"
 #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 @@
  * @author Christophe Genevey
  */
 
-#include "platform.h"
+#include <gnunet/platform.h>
 #include "gnunet_psycstore_plugin.h"
 #include "gnunet_psycstore_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 "psycstore.h"
 #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 @@
  * @author Jeffrey Burdges
  */
 
-#include "platform.h"
+#include <gnunet/platform.h>
 #include "gnunet_psycstore_plugin.h"
 #include "gnunet_psycstore_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 "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
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 @@
  *        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_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 "psycstore.h"
 #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 @@
 #ifndef GNUNET_PSYCSTORE_H
 #define GNUNET_PSYCSTORE_H
 
-#include "gnunet_common.h"
+#include <gnunet/gnunet_common.h>
 
 
 GNUNET_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 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_constants.h>
+#include <gnunet/gnunet_protocols.h>
 #include "gnunet_psycstore_service.h"
 #include "gnunet_multicast_service.h"
 #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 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testing_lib.h>
 #include "gnunet_psycstore_plugin.h"
 #include "gnunet_psycstore_service.h"
 #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 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_testing_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_testing_lib.h>
 #include "gnunet_psycstore_service.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)