1 files changed, 10 insertions, 9 deletions

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 062aa0266..7a9046c57 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -29,7 +29,7 @@ libgnunetcore_la_SOURCES = \
   core_api.c core.h \
   core_api_monitor_peers.c
 libgnunetcore_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetcore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  \
@@ -38,15 +38,15 @@ libgnunetcore_la_LDFLAGS = \
 libgnunet_test_core_plugin_cmd_just_run_la_SOURCES = \
  test_core_plugin_cmd_just_run.c
 libgnunet_test_core_plugin_cmd_just_run_la_LIBADD = \
+  libgnunetcoretesting.la \
   $(top_builddir)/src/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/transport/libgnunettransportcore.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/core/libgnunetcoretesting.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/lib/hello/libgnunethello.la \
   $(top_builddir)/src/arm/libgnunetarm.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_test_core_plugin_cmd_just_run_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
@@ -55,9 +55,10 @@ libgnunetcoretesting_la_SOURCES = \
   core_api_cmd_connecting_peers.c 
 libgnunetcoretesting_la_LIBADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/transport/libgnunettransportcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/lib/util/libgnunetutil.la
 libgnunetcoretesting_la_LDFLAGS = \
   $(GN_LIBINTL) \
   $(GN_LIB_LDFLAGS) \
@@ -79,7 +80,7 @@ gnunet_service_core_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/transport/libgnunettransportcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL) $(Z_LIBS)
 
 
@@ -87,7 +88,7 @@ gnunet_core_SOURCES = \
  gnunet-core.c
 gnunet_core_LDADD = \
   libgnunetcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/lib/util/libgnunetutil.la
 gnunet_core_LDFLAGS = \
   $(GN_LIBINTL)
 
@@ -113,14 +114,14 @@ test_core_api_send_to_self_SOURCES = \
 test_core_api_send_to_self_LDADD = \
  libgnunetcore.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_core_api_start_only_SOURCES = \
  test_core_api_start_only.c
 test_core_api_start_only_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la
+ $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
   test_core_start_testcase.sh \