Move libgnunetpsycutil.la to psycstore

This solves a circular dependency between psyc and psycstore.

4 files changed, 19 insertions, 19 deletions

diff --git a/src/psyc/Makefile.am b/src/psyc/Makefile.am
index 497f1f0c5..4bb28ce0a 100644
--- a/src/psyc/Makefile.am
+++ b/src/psyc/Makefile.am
@@ -18,24 +18,14 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-lib_LTLIBRARIES = libgnunetpsycutil.la libgnunetpsyc.la
-
-libgnunetpsycutil_la_SOURCES = \
-  psyc_util_lib.c
-libgnunetpsycutil_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/env/libgnunetenv.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetpsycutil_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 0:0:0
+lib_LTLIBRARIES = libgnunetpsyc.la
 
 libgnunetpsyc_la_SOURCES = \
   psyc_api.c psyc.h
 libgnunetpsyc_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/env/libgnunetenv.la \
-  libgnunetpsycutil.la \
+  $(top_builddir)/src/psycstore/libgnunetpsycutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetpsyc_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -53,7 +43,7 @@ gnunet_service_psyc_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/multicast/libgnunetmulticast.la \
   $(top_builddir)/src/psycstore/libgnunetpsycstore.la \
-  libgnunetpsycutil.la \
+  $(top_builddir)/src/psycstore/libgnunetpsycutil.la \
   $(GN_LIBINTL)
 gnunet_service_psyc_CFLAGS = $(AM_CFLAGS)
 
@@ -72,7 +62,7 @@ test_psyc_SOURCES = \
  test_psyc.c
 test_psyc_LDADD = \
   libgnunetpsyc.la \
-  libgnunetpsycutil.la \
+  $(top_builddir)/src/psycstore/libgnunetpsycutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/env/libgnunetenv.la \
diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am
index 7dac87084..f011710d0 100644
--- a/src/psycstore/Makefile.am
+++ b/src/psycstore/Makefile.am
@@ -27,7 +27,17 @@ SQLITE_TESTS = test_plugin_psycstore_sqlite
 endif
 endif
 
-lib_LTLIBRARIES = libgnunetpsycstore.la
+lib_LTLIBRARIES = libgnunetpsycutil.la libgnunetpsycstore.la
+
+libgnunetpsycutil_la_SOURCES = \
+  psyc_util_lib.c
+libgnunetpsycutil_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/env/libgnunetenv.la \
+  $(GN_LIBINTL) $(XLIB)
+libgnunetpsycutil_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
+  -version-info 0:0:0
 
 libgnunetpsycstore_la_SOURCES = \
   psycstore_api.c \
@@ -49,7 +59,7 @@ gnunet_service_psycstore_SOURCES = \
 gnunet_service_psycstore_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/psyc/libgnunetpsycutil.la \
+  libgnunetpsycutil.la \
   $(GN_LIBINTL)
 
 plugin_LTLIBRARIES = \
diff --git a/src/psyc/psyc_util_lib.c b/src/psycstore/psyc_util_lib.c
index 4ad7a914b..4ad7a914b 100644
--- a/src/psyc/psyc_util_lib.c
+++ b/src/psycstore/psyc_util_lib.c
diff --git a/src/social/Makefile.am b/src/social/Makefile.am
index cb9e4d7eb..2c8d5707d 100644
--- a/src/social/Makefile.am
+++ b/src/social/Makefile.am
@@ -25,7 +25,7 @@ libgnunetsocial_la_SOURCES = \
 libgnunetsocial_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/env/libgnunetenv.la \
-  $(top_builddir)/src/psyc/libgnunetpsycutil.la \
+  $(top_builddir)/src/psycstore/libgnunetpsycutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
@@ -46,7 +46,7 @@ gnunet_service_social_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/psyc/libgnunetpsyc.la \
-  $(top_builddir)/src/psyc/libgnunetpsycutil.la \
+  $(top_builddir)/src/psycstore/libgnunetpsycutil.la \
   $(GN_LIBINTL)
 
 
@@ -67,7 +67,7 @@ test_social_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/env/libgnunetenv.la \
-  $(top_builddir)/src/psyc/libgnunetpsycutil.la \
+  $(top_builddir)/src/psycstore/libgnunetpsycutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/identity/libgnunetidentity.la