1 files changed, 18 insertions, 18 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 573063301..b6083ea06 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -107,7 +107,7 @@ gnunet_download_LDADD =  \
 gnunet_publish_SOURCES =  \
  gnunet-publish.c
 gnunet_publish_LDADD =  \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
  libgnunetfs.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(GN_LIBINTL)
@@ -178,7 +178,7 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/datastore/libgnunetdatastore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/cadet/libgnunetcadet.la \
- $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/service/core/libgnunetcore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
  $(GN_LIBINTL) -lm
@@ -278,28 +278,28 @@ endif
 test_fs_download_SOURCES = \
  test_fs_download.c
 test_fs_download_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la  \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la  \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_download_indexed_SOURCES = \
  test_fs_download.c
 test_fs_download_indexed_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la  \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la  \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_download_cadet_SOURCES = \
  test_fs_download.c
 test_fs_download_cadet_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la  \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la  \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_download_persistence_SOURCES = \
  test_fs_download_persistence.c
 test_fs_download_persistence_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la  \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la  \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -324,84 +324,84 @@ test_fs_getopt_LDADD = \
 test_fs_list_indexed_SOURCES = \
  test_fs_list_indexed.c
 test_fs_list_indexed_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_namespace_SOURCES = \
  test_fs_namespace.c
 test_fs_namespace_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_namespace_list_updateable_SOURCES = \
  test_fs_namespace_list_updateable.c
 test_fs_namespace_list_updateable_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_publish_SOURCES = \
  test_fs_publish.c
 test_fs_publish_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_publish_persistence_SOURCES = \
  test_fs_publish_persistence.c
 test_fs_publish_persistence_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_search_SOURCES = \
  test_fs_search.c
 test_fs_search_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la        \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_search_with_and_SOURCES = \
  test_fs_search_with_and.c
 test_fs_search_with_and_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la        \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_search_probes_SOURCES = \
  test_fs_search_probes.c
 test_fs_search_probes_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la        \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_search_persistence_SOURCES = \
  test_fs_search_persistence.c
 test_fs_search_persistence_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la        \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_start_stop_SOURCES = \
  test_fs_start_stop.c
 test_fs_start_stop_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_unindex_SOURCES = \
  test_fs_unindex.c
 test_fs_unindex_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_fs_unindex_persistence_SOURCES = \
  test_fs_unindex_persistence.c
 test_fs_unindex_persistence_LDADD = \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   libgnunetfs.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la