1 files changed, 12 insertions, 11 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