6 files changed, 31 insertions, 30 deletions

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 @@
 # 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/
 
@@ -23,7 +24,7 @@ lib_LTLIBRARIES = libgnunetsocial.la
 libgnunetsocial_la_SOURCES = \
   social_api.c social.h
 libgnunetsocial_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetsocial_la_LDFLAGS = \
@@ -41,18 +42,18 @@ gnunet_social_SOURCES = \
 gnunet_social_LDADD = \
   libgnunetsocial.la \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  -lgnunetutil
 
 gnunet_service_social_SOURCES = \
  gnunet-service-social.c
 gnunet_service_social_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  -lgnunetutil \
+  -lgnunetstatistics \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
   $(top_builddir)/src/psyc/libgnunetpsyc.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  -lgnunetidentity \
+  -lgnunetgns \
+  -lgnunetnamestore \
   $(GN_LIBINTL)
 
 
@@ -70,10 +71,10 @@ test_social_SOURCES = \
  test_social.c
 test_social_LDADD = \
   libgnunetsocial.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunettesting \
+  -lgnunetutil \
   $(top_builddir)/src/psycutil/libgnunetpsycutil.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la
+  -lgnunetidentity
 
 EXTRA_DIST = \
   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 @@
 #include <inttypes.h>
 #include <strings.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_namestore_service.h"
-#include "gnunet_gns_service.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_identity_service.h>
+#include <gnunet/gnunet_namestore_service.h>
+#include <gnunet/gnunet_gns_service.h>
+#include <gnunet/gnunet_statistics_service.h>
 #include "gnunet_psyc_service.h"
 #include "gnunet_psyc_util_lib.h"
 #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 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_social_service.h"
 
 #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 @@
 #ifndef SOCIAL_H
 #define SOCIAL_H
 
-#include "platform.h"
+#include <gnunet/platform.h>
 #include "gnunet_social_service.h"
 
 enum 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 @@
 #include <inttypes.h>
 #include <string.h>
 
-#include "platform.h"
-#include "gnunet_util_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_psyc_service.h"
 #include "gnunet_psyc_util_lib.h"
 #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 @@
 
 #include <inttypes.h>
 
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testing_lib.h>
 #include "gnunet_psyc_util_lib.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)