BUILD: Move seti/setu to service

35 files changed, 9 insertions, 9 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 31abebcb8..2bae1947e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,6 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  seti \
-  setu \
   revocation \
   vpn \
   gns \
diff --git a/src/contrib/service/scalarproduct/Makefile.am b/src/contrib/service/scalarproduct/Makefile.am
index 77a17ec20..4de1f5032 100644
--- a/src/contrib/service/scalarproduct/Makefile.am
+++ b/src/contrib/service/scalarproduct/Makefile.am
@@ -39,7 +39,7 @@ gnunet_service_scalarproduct_alice_SOURCES = \
 gnunet_service_scalarproduct_alice_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/seti/libgnunetseti.la \
+  $(top_builddir)/src/service/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(GN_LIBINTL)
@@ -50,7 +50,7 @@ gnunet_service_scalarproduct_bob_SOURCES = \
 gnunet_service_scalarproduct_bob_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/seti/libgnunetseti.la \
+  $(top_builddir)/src/service/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(GN_LIBINTL)
@@ -61,7 +61,7 @@ gnunet_service_scalarproduct_ecc_alice_SOURCES = \
 gnunet_service_scalarproduct_ecc_alice_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/seti/libgnunetseti.la \
+  $(top_builddir)/src/service/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lsodium \
   -lgcrypt \
@@ -73,7 +73,7 @@ gnunet_service_scalarproduct_ecc_bob_SOURCES = \
 gnunet_service_scalarproduct_ecc_bob_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/seti/libgnunetseti.la \
+  $(top_builddir)/src/service/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lsodium \
   -lgcrypt \
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index 0684dd8f2..3ab6887dd 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -82,7 +82,7 @@ gnunet_service_revocation_SOURCES = \
 gnunet_service_revocation_LDADD = \
   libgnunetrevocation.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/setu/libgnunetsetu.la \
+  $(top_builddir)/src/service/setu/libgnunetsetu.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 636caa985..e39b28ae9 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -19,5 +19,7 @@ SUBDIRS = \
         dht \
   namecache \
   namestore \
-  regex \
-        cadet
+        cadet \
+  seti \
+  setu \
+  regex
diff --git a/src/seti/.gitignore b/src/service/seti/.gitignore
index 5f234a4c2..5f234a4c2 100644
--- a/src/seti/.gitignore
+++ b/src/service/seti/.gitignore
diff --git a/src/seti/Makefile.am b/src/service/seti/Makefile.am
index c2d31df9c..c2d31df9c 100644
--- a/src/seti/Makefile.am
+++ b/src/service/seti/Makefile.am
diff --git a/src/seti/gnunet-service-seti.c b/src/service/seti/gnunet-service-seti.c
index 6db24a5b6..6db24a5b6 100644
--- a/src/seti/gnunet-service-seti.c
+++ b/src/service/seti/gnunet-service-seti.c
diff --git a/src/seti/gnunet-service-seti_protocol.h b/src/service/seti/gnunet-service-seti_protocol.h
index 51968376e..51968376e 100644
--- a/src/seti/gnunet-service-seti_protocol.h
+++ b/src/service/seti/gnunet-service-seti_protocol.h
diff --git a/src/seti/gnunet-seti-profiler.c b/src/service/seti/gnunet-seti-profiler.c
index b8230bcfc..b8230bcfc 100644
--- a/src/seti/gnunet-seti-profiler.c
+++ b/src/service/seti/gnunet-seti-profiler.c
diff --git a/src/seti/meson.build b/src/service/seti/meson.build
index e5d3812ce..e5d3812ce 100644
--- a/src/seti/meson.build
+++ b/src/service/seti/meson.build
diff --git a/src/seti/plugin_block_seti_test.c b/src/service/seti/plugin_block_seti_test.c
index 5b9196cef..5b9196cef 100644
--- a/src/seti/plugin_block_seti_test.c
+++ b/src/service/seti/plugin_block_seti_test.c
diff --git a/src/seti/seti.conf.in b/src/service/seti/seti.conf.in
index e4f7b60b5..e4f7b60b5 100644
--- a/src/seti/seti.conf.in
+++ b/src/service/seti/seti.conf.in
diff --git a/src/seti/seti.h b/src/service/seti/seti.h
index e780b1061..e780b1061 100644
--- a/src/seti/seti.h
+++ b/src/service/seti/seti.h
diff --git a/src/seti/seti_api.c b/src/service/seti/seti_api.c
index 6522236c6..6522236c6 100644
--- a/src/seti/seti_api.c
+++ b/src/service/seti/seti_api.c
diff --git a/src/seti/test_seti.conf b/src/service/seti/test_seti.conf
index aa4678b49..aa4678b49 100644
--- a/src/seti/test_seti.conf
+++ b/src/service/seti/test_seti.conf
diff --git a/src/seti/test_seti_api.c b/src/service/seti/test_seti_api.c
index 9074fab41..9074fab41 100644
--- a/src/seti/test_seti_api.c
+++ b/src/service/seti/test_seti_api.c
diff --git a/src/setu/.gitignore b/src/service/setu/.gitignore
index 0ac10295e..0ac10295e 100644
--- a/src/setu/.gitignore
+++ b/src/service/setu/.gitignore
diff --git a/src/setu/Makefile.am b/src/service/setu/Makefile.am
index f7f8ed394..f7f8ed394 100644
--- a/src/setu/Makefile.am
+++ b/src/service/setu/Makefile.am
diff --git a/src/setu/gnunet-service-setu.c b/src/service/setu/gnunet-service-setu.c
index 46d027cca..46d027cca 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/service/setu/gnunet-service-setu.c
diff --git a/src/setu/gnunet-service-setu_protocol.h b/src/service/setu/gnunet-service-setu_protocol.h
index c896166ce..c896166ce 100644
--- a/src/setu/gnunet-service-setu_protocol.h
+++ b/src/service/setu/gnunet-service-setu_protocol.h
diff --git a/src/setu/gnunet-service-setu_strata_estimator.c b/src/service/setu/gnunet-service-setu_strata_estimator.c
index 43ccf3afd..43ccf3afd 100644
--- a/src/setu/gnunet-service-setu_strata_estimator.c
+++ b/src/service/setu/gnunet-service-setu_strata_estimator.c
diff --git a/src/setu/gnunet-service-setu_strata_estimator.h b/src/service/setu/gnunet-service-setu_strata_estimator.h
index 4871a7fcd..4871a7fcd 100644
--- a/src/setu/gnunet-service-setu_strata_estimator.h
+++ b/src/service/setu/gnunet-service-setu_strata_estimator.h
diff --git a/src/setu/gnunet-setu-ibf-profiler.c b/src/service/setu/gnunet-setu-ibf-profiler.c
index 6465b15b8..6465b15b8 100644
--- a/src/setu/gnunet-setu-ibf-profiler.c
+++ b/src/service/setu/gnunet-setu-ibf-profiler.c
diff --git a/src/setu/gnunet-setu-profiler.c b/src/service/setu/gnunet-setu-profiler.c
index 8d6a2dc8c..8d6a2dc8c 100644
--- a/src/setu/gnunet-setu-profiler.c
+++ b/src/service/setu/gnunet-setu-profiler.c
diff --git a/src/setu/ibf.c b/src/service/setu/ibf.c
index a55e21764..a55e21764 100644
--- a/src/setu/ibf.c
+++ b/src/service/setu/ibf.c
diff --git a/src/setu/ibf.h b/src/service/setu/ibf.h
index 5628405dc..5628405dc 100644
--- a/src/setu/ibf.h
+++ b/src/service/setu/ibf.h
diff --git a/src/setu/ibf_sim.c b/src/service/setu/ibf_sim.c
index 563ed0fb8..563ed0fb8 100644
--- a/src/setu/ibf_sim.c
+++ b/src/service/setu/ibf_sim.c
diff --git a/src/setu/meson.build b/src/service/setu/meson.build
index fe5611fd2..fe5611fd2 100644
--- a/src/setu/meson.build
+++ b/src/service/setu/meson.build
diff --git a/src/setu/perf_setu_api.c b/src/service/setu/perf_setu_api.c
index 7f4d64f74..7f4d64f74 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/service/setu/perf_setu_api.c
diff --git a/src/setu/plugin_block_setu_test.c b/src/service/setu/plugin_block_setu_test.c
index 178ad3314..178ad3314 100644
--- a/src/setu/plugin_block_setu_test.c
+++ b/src/service/setu/plugin_block_setu_test.c
diff --git a/src/setu/setu.conf.in b/src/service/setu/setu.conf.in
index 6c48f6156..6c48f6156 100644
--- a/src/setu/setu.conf.in
+++ b/src/service/setu/setu.conf.in
diff --git a/src/setu/setu.h b/src/service/setu/setu.h
index 7b606f12c..7b606f12c 100644
--- a/src/setu/setu.h
+++ b/src/service/setu/setu.h
diff --git a/src/setu/setu_api.c b/src/service/setu/setu_api.c
index 7fa144590..7fa144590 100644
--- a/src/setu/setu_api.c
+++ b/src/service/setu/setu_api.c
diff --git a/src/setu/test_setu.conf b/src/service/setu/test_setu.conf
index 6d132fc1f..6d132fc1f 100644
--- a/src/setu/test_setu.conf
+++ b/src/service/setu/test_setu.conf
diff --git a/src/setu/test_setu_api.c b/src/service/setu/test_setu_api.c
index 5a0c9d70d..5a0c9d70d 100644
--- a/src/setu/test_setu_api.c
+++ b/src/service/setu/test_setu_api.c