1 files changed, 25 insertions, 22 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