[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 02/03: BUILD: Move dht/datastore to service/cli
|
From: |
gnunet |
|
Subject: |
[gnunet] 02/03: BUILD: Move dht/datastore to service/cli |
|
Date: |
Wed, 18 Oct 2023 20:35:55 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 498cb28b16dbebbacb674fa166aeac3fe4ea9922
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 18 20:19:34 2023 +0200
BUILD: Move dht/datastore to service/cli
---
configure.ac | 12 ++---
po/POTFILES.in | 50 ++++++++++-----------
src/Makefile.am | 3 --
src/cli/Makefile.am | 2 +
src/cli/datastore/.gitignore | 1 +
src/cli/datastore/Makefile.am | 24 ++++++++++
src/{ => cli}/datastore/gnunet-datastore.c | 0
src/cli/dht/.gitignore | 5 +++
src/cli/dht/Makefile.am | 52 ++++++++++++++++++++++
src/{ => cli}/dht/gnunet-dht-get.c | 0
src/{ => cli}/dht/gnunet-dht-hello.c | 0
src/{ => cli}/dht/gnunet-dht-monitor.c | 0
src/{ => cli}/dht/gnunet-dht-put.c | 0
src/exit/Makefile.am | 2 +-
src/fs/Makefile.am | 6 +--
src/gns/Makefile.am | 2 +-
src/pt/Makefile.am | 2 +-
src/regex/Makefile.am | 16 +++----
src/service/Makefile.am | 3 ++
src/service/cadet/Makefile.am | 2 +-
src/{ => service}/datacache/.gitignore | 0
src/{ => service}/datacache/Makefile.am | 0
src/{ => service}/datacache/datacache-0001.sql | 0
src/{ => service}/datacache/datacache-drop.sql | 0
src/{ => service}/datacache/datacache.c | 0
src/{ => service}/datacache/datacache.conf | 0
src/{ => service}/datacache/meson.build | 0
.../datacache/plugin_datacache_heap.c | 0
.../datacache/plugin_datacache_postgres.c | 0
.../datacache/plugin_datacache_sqlite.c | 0
.../datacache/plugin_datacache_template.c | 0
src/{ => service}/datacache/test_datacache.c | 0
.../datacache/test_datacache_data_heap.conf | 0
.../datacache/test_datacache_data_postgres.conf | 0
.../datacache/test_datacache_data_sqlite.conf | 0
src/{ => service}/datacache/test_datacache_quota.c | 0
src/{ => service}/datastore/.gitignore | 1 -
src/{ => service}/datastore/Makefile.am | 11 -----
src/{ => service}/datastore/datastore-0001.sql | 0
src/{ => service}/datastore/datastore-drop.sql | 0
src/{ => service}/datastore/datastore.conf.in | 0
src/{ => service}/datastore/datastore.h | 0
src/{ => service}/datastore/datastore_api.c | 0
.../datastore/gnunet-service-datastore.c | 0
src/{ => service}/datastore/meson.build | 0
src/{ => service}/datastore/perf_datastore_api.c | 0
.../datastore/perf_plugin_datastore.c | 0
.../datastore/perf_plugin_datastore_data_heap.conf | 0
.../perf_plugin_datastore_data_postgres.conf | 0
.../perf_plugin_datastore_data_sqlite.conf | 0
.../datastore/plugin_datastore_heap.c | 0
.../datastore/plugin_datastore_postgres.c | 0
.../datastore/plugin_datastore_sqlite.c | 0
.../datastore/plugin_datastore_template.c | 0
src/{ => service}/datastore/selectrandom.sql | 0
src/{ => service}/datastore/test_datastore_api.c | 0
.../datastore/test_datastore_api_data_heap.conf | 0
.../test_datastore_api_data_postgres.conf | 0
.../datastore/test_datastore_api_data_sqlite.conf | 0
.../datastore/test_datastore_api_management.c | 0
src/{ => service}/datastore/test_defaults.conf | 0
.../datastore/test_plugin_datastore.c | 0
.../datastore/test_plugin_datastore_data_heap.conf | 0
.../test_plugin_datastore_data_postgres.conf | 0
.../test_plugin_datastore_data_sqlite.conf | 0
src/{ => service}/dht/.gitignore | 5 ---
src/{ => service}/dht/Makefile.am | 40 +----------------
src/{ => service}/dht/dht.conf.in | 0
src/{ => service}/dht/dht.h | 0
src/{ => service}/dht/dht_api.c | 0
src/{ => service}/dht/dht_test_lib.c | 0
src/{ => service}/dht/dht_test_lib.h | 0
src/{ => service}/dht/dhtu_testbed_connect.sh | 0
src/{ => service}/dht/dhtu_testbed_deploy.conf | 0
src/{ => service}/dht/dhtu_testbed_deploy.sh | 0
src/{ => service}/dht/gnunet-service-dht.c | 0
src/{ => service}/dht/gnunet-service-dht.h | 0
src/{ => service}/dht/gnunet-service-dht_clients.c | 0
.../dht/gnunet-service-dht_datacache.c | 0
.../dht/gnunet-service-dht_datacache.h | 0
.../dht/gnunet-service-dht_neighbours.c | 0
.../dht/gnunet-service-dht_neighbours.h | 0
src/{ => service}/dht/gnunet-service-dht_routing.c | 0
src/{ => service}/dht/gnunet-service-dht_routing.h | 0
src/{ => service}/dht/gnunet_dht_profiler.c | 0
src/{ => service}/dht/meson.build | 0
src/{ => service}/dht/plugin_block_dht.c | 0
src/{ => service}/dht/test_dht_2dtorus.conf | 0
src/{ => service}/dht/test_dht_api.c | 0
src/{ => service}/dht/test_dht_api_data.conf | 0
src/{ => service}/dht/test_dht_api_peer1.conf | 0
src/{ => service}/dht/test_dht_line.conf | 0
src/{ => service}/dht/test_dht_monitor.c | 0
src/{ => service}/dht/test_dht_monitor.conf | 0
src/{ => service}/dht/test_dht_multipeer.conf | 0
.../dht/test_dht_multipeer_topology.dat | 0
src/{ => service}/dht/test_dht_tools.conf | 0
src/{ => service}/dht/test_dht_tools.py.in | 0
src/{ => service}/dht/test_dht_tools.sh | 0
src/{ => service}/dht/test_dht_topo.c | 0
src/zonemaster/Makefile.am | 2 +-
101 files changed, 136 insertions(+), 105 deletions(-)
diff --git a/configure.ac b/configure.ac
index a1bc27098..cdcad80da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1248,6 +1248,11 @@ src/service/cadet/Makefile
src/service/cadet/cadet.conf
src/service/core/Makefile
src/service/core/core.conf
+src/service/datacache/Makefile
+src/service/datastore/Makefile
+src/service/datastore/datastore.conf
+src/service/dht/Makefile
+src/service/dht/dht.conf
src/service/identity/Makefile
src/service/identity/identity.conf
src/service/nat/Makefile
@@ -1270,6 +1275,8 @@ src/cli/Makefile
src/cli/arm/Makefile
src/cli/cadet/Makefile
src/cli/core/Makefile
+src/cli/datastore/Makefile
+src/cli/dht/Makefile
src/cli/nat/Makefile
src/cli/nse/Makefile
src/cli/statistics/Makefile
@@ -1285,11 +1292,6 @@ src/consensus/Makefile
src/consensus/consensus.conf
src/conversation/Makefile
src/conversation/conversation.conf
-src/datacache/Makefile
-src/datastore/Makefile
-src/datastore/datastore.conf
-src/dht/Makefile
-src/dht/dht.conf
src/dns/Makefile
src/dns/dns.conf
src/exit/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9cb0be8c0..c4d20c4ba 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,11 @@
src/cli/arm/gnunet-arm.c
src/cli/cadet/gnunet-cadet.c
src/cli/core/gnunet-core.c
+src/cli/datastore/gnunet-datastore.c
+src/cli/dht/gnunet-dht-get.c
+src/cli/dht/gnunet-dht-hello.c
+src/cli/dht/gnunet-dht-monitor.c
+src/cli/dht/gnunet-dht-put.c
src/cli/identity/gnunet-identity.c
src/cli/nat/gnunet-nat.c
src/cli/nse/gnunet-nse.c
@@ -53,31 +58,6 @@ src/conversation/gnunet_gst_test.c
src/conversation/microphone.c
src/conversation/plugin_gnsrecord_conversation.c
src/conversation/speaker.c
-src/datacache/datacache.c
-src/datacache/plugin_datacache_heap.c
-src/datacache/plugin_datacache_postgres.c
-src/datacache/plugin_datacache_sqlite.c
-src/datacache/plugin_datacache_template.c
-src/datastore/datastore_api.c
-src/datastore/gnunet-datastore.c
-src/datastore/gnunet-service-datastore.c
-src/datastore/plugin_datastore_heap.c
-src/datastore/plugin_datastore_postgres.c
-src/datastore/plugin_datastore_sqlite.c
-src/datastore/plugin_datastore_template.c
-src/dht/dht_api.c
-src/dht/dht_test_lib.c
-src/dht/gnunet-dht-get.c
-src/dht/gnunet-dht-hello.c
-src/dht/gnunet-dht-monitor.c
-src/dht/gnunet-dht-put.c
-src/dht/gnunet-service-dht.c
-src/dht/gnunet-service-dht_clients.c
-src/dht/gnunet-service-dht_datacache.c
-src/dht/gnunet-service-dht_neighbours.c
-src/dht/gnunet-service-dht_routing.c
-src/dht/gnunet_dht_profiler.c
-src/dht/plugin_block_dht.c
src/dns/dns_api.c
src/dns/gnunet-dns-monitor.c
src/dns/gnunet-dns-redirector.c
@@ -395,6 +375,26 @@ src/service/core/gnunet-service-core.c
src/service/core/gnunet-service-core_kx.c
src/service/core/gnunet-service-core_sessions.c
src/service/core/gnunet-service-core_typemap.c
+src/service/datacache/datacache.c
+src/service/datacache/plugin_datacache_heap.c
+src/service/datacache/plugin_datacache_postgres.c
+src/service/datacache/plugin_datacache_sqlite.c
+src/service/datacache/plugin_datacache_template.c
+src/service/datastore/datastore_api.c
+src/service/datastore/gnunet-service-datastore.c
+src/service/datastore/plugin_datastore_heap.c
+src/service/datastore/plugin_datastore_postgres.c
+src/service/datastore/plugin_datastore_sqlite.c
+src/service/datastore/plugin_datastore_template.c
+src/service/dht/dht_api.c
+src/service/dht/dht_test_lib.c
+src/service/dht/gnunet-service-dht.c
+src/service/dht/gnunet-service-dht_clients.c
+src/service/dht/gnunet-service-dht_datacache.c
+src/service/dht/gnunet-service-dht_neighbours.c
+src/service/dht/gnunet-service-dht_routing.c
+src/service/dht/gnunet_dht_profiler.c
+src/service/dht/plugin_block_dht.c
src/service/identity/gnunet-service-identity.c
src/service/identity/identity_api.c
src/service/identity/identity_api_lookup.c
diff --git a/src/Makefile.am b/src/Makefile.am
index e31709946..1fc0748c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,11 +17,8 @@ SUBDIRS = \
rest-plugin \
cli \
contrib \
- datacache \
- datastore \
template \
nat-auto \
- dht \
hostlist \
topology \
regex \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index a7cf2eb01..cc716dda4 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -5,4 +5,6 @@ SUBDIRS = \
core \
nat \
nse \
+ datastore \
+ dht \
cadet
diff --git a/src/cli/datastore/.gitignore b/src/cli/datastore/.gitignore
new file mode 100644
index 000000000..ddb105175
--- /dev/null
+++ b/src/cli/datastore/.gitignore
@@ -0,0 +1 @@
+gnunet-datastore
diff --git a/src/cli/datastore/Makefile.am b/src/cli/datastore/Makefile.am
new file mode 100644
index 000000000..91098db96
--- /dev/null
+++ b/src/cli/datastore/Makefile.am
@@ -0,0 +1,24 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIBS = -lgcov
+endif
+
+
+bin_PROGRAMS = \
+ gnunet-datastore
+
+gnunet_datastore_SOURCES = \
+ gnunet-datastore.c
+gnunet_datastore_LDADD = \
+ $(top_builddir)/src/service/datastore/libgnunetdatastore.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
diff --git a/src/datastore/gnunet-datastore.c
b/src/cli/datastore/gnunet-datastore.c
similarity index 100%
rename from src/datastore/gnunet-datastore.c
rename to src/cli/datastore/gnunet-datastore.c
diff --git a/src/cli/dht/.gitignore b/src/cli/dht/.gitignore
new file mode 100644
index 000000000..3b6564ef0
--- /dev/null
+++ b/src/cli/dht/.gitignore
@@ -0,0 +1,5 @@
+gnunet-dht-get
+gnunet-dht-monitor
+gnunet-dht-profiler
+gnunet-dht-put
+gnunet-dht-hello
diff --git a/src/cli/dht/Makefile.am b/src/cli/dht/Makefile.am
new file mode 100644
index 000000000..f026b5270
--- /dev/null
+++ b/src/cli/dht/Makefile.am
@@ -0,0 +1,52 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+bin_PROGRAMS = \
+ gnunet-dht-monitor \
+ gnunet-dht-get \
+ gnunet-dht-put \
+ gnunet-dht-hello
+
+gnunet_dht_get_SOURCES = \
+ gnunet-dht-get.c
+gnunet_dht_get_LDADD = \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_dht_get_LDFLAGS = \
+ $(GN_LIBINTL)
+
+gnunet_dht_hello_SOURCES = \
+ gnunet-dht-hello.c
+gnunet_dht_hello_LDADD = \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_dht_hello_LDFLAGS = \
+ $(GN_LIBINTL)
+
+gnunet_dht_put_SOURCES = \
+ gnunet-dht-put.c
+gnunet_dht_put_LDADD = \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_dht_put_LDFLAGS = \
+ $(GN_LIBINTL)
+
+gnunet_dht_monitor_SOURCES = \
+ gnunet-dht-monitor.c
+gnunet_dht_monitor_LDADD = \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_dht_monitor_LDFLAGS = \
+ $(GN_LIBINTL)
+
diff --git a/src/dht/gnunet-dht-get.c b/src/cli/dht/gnunet-dht-get.c
similarity index 100%
rename from src/dht/gnunet-dht-get.c
rename to src/cli/dht/gnunet-dht-get.c
diff --git a/src/dht/gnunet-dht-hello.c b/src/cli/dht/gnunet-dht-hello.c
similarity index 100%
rename from src/dht/gnunet-dht-hello.c
rename to src/cli/dht/gnunet-dht-hello.c
diff --git a/src/dht/gnunet-dht-monitor.c b/src/cli/dht/gnunet-dht-monitor.c
similarity index 100%
rename from src/dht/gnunet-dht-monitor.c
rename to src/cli/dht/gnunet-dht-monitor.c
diff --git a/src/dht/gnunet-dht-put.c b/src/cli/dht/gnunet-dht-put.c
similarity index 100%
rename from src/dht/gnunet-dht-put.c
rename to src/cli/dht/gnunet-dht-put.c
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am
index 9864055e8..65ea493dc 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -30,7 +30,7 @@ gnunet_helper_exit_SOURCES = \
gnunet_daemon_exit_SOURCES = \
gnunet-daemon-exit.c exit.h
gnunet_daemon_exit_LDADD = \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/cadet/libgnunetcadet.la \
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index e923955b5..38d75c0dc 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -42,7 +42,7 @@ libgnunetfs_la_SOURCES = \
meta_data.c
libgnunetfs_la_LIBADD = \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ $(top_builddir)/src/service/datastore/libgnunetdatastore.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring
@@ -173,9 +173,9 @@ gnunet_service_fs_SOURCES = \
gnunet-service-fs_cadet_server.c
gnunet_service_fs_LDADD = \
libgnunetfs.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ $(top_builddir)/src/service/datastore/libgnunetdatastore.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/cadet/libgnunetcadet.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index d739f8131..c42e5e6d4 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -204,7 +204,7 @@ gnunet_service_gns_LDADD = \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/dns/libgnunetdns.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/namecache/libgnunetnamecache.la \
$(LIBIDN) $(LIBIDN2) \
$(GN_LIBINTL)
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 98578d7dd..659ede7f8 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -22,7 +22,7 @@ gnunet_daemon_pt_SOURCES = \
gnunet_daemon_pt_LDADD = \
$(top_builddir)/src/vpn/libgnunetvpn.la \
$(top_builddir)/src/service/cadet/libgnunetcadet.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/dns/libgnunetdns.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 57f48db44..14cdb054b 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -32,7 +32,7 @@ gnunet_service_regex_SOURCES = \
$(REGEX_INTERNAL) gnunet-service-regex.c
gnunet_service_regex_LDADD = -lm \
libgnunetregexblock.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -88,7 +88,7 @@ libgnunet_plugin_block_regex_la_LDFLAGS = \
#gnunet_regex_simulation_profiler_LDADD = \
# libgnunetregexblock.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la \
-# $(top_builddir)/src/dht/libgnunetdht.la \
+# $(top_builddir)/src/service/dht/libgnunetdht.la \
# $(top_builddir)/src/lib/block/libgnunetblock.la \
# $(top_builddir)/src/service/statistics/libgnunetstatistics.la
#endif
@@ -99,7 +99,7 @@ noinst_PROGRAMS = $(noinst_mysql_progs) \
perf_regex_SOURCES = \
$(REGEX_INTERNAL_TEST) perf-regex.c
perf_regex_LDADD = -lm \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la
@@ -109,7 +109,7 @@ perf_regex_LDFLAGS = \
gnunet_daemon_regexprofiler_SOURCES = \
$(REGEX_INTERNAL_TEST) gnunet-daemon-regexprofiler.c
gnunet_daemon_regexprofiler_LDADD = -lm \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -132,7 +132,7 @@ endif
test_regex_eval_api_SOURCES = \
$(REGEX_INTERNAL_TEST) test_regex_eval_api.c
test_regex_eval_api_LDADD = -lm \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -155,14 +155,14 @@ test_regex_iterate_api_SOURCES = \
$(REGEX_INTERNAL) test_regex_iterate_api.c
test_regex_iterate_api_LDADD = -lm \
libgnunetregexblock.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_regex_proofs_SOURCES = \
$(REGEX_INTERNAL_TEST) test_regex_proofs.c
test_regex_proofs_LDADD = -lm \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -170,7 +170,7 @@ test_regex_proofs_LDADD = -lm \
test_regex_graph_api_SOURCES = \
$(REGEX_INTERNAL_TEST) test_regex_graph_api.c
test_regex_graph_api_LDADD = -lm \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 6317053c1..aa87eb34a 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -10,4 +10,7 @@ SUBDIRS = \
nse \
identity \
rest \
+ datacache \
+ datastore \
+ dht \
cadet
diff --git a/src/service/cadet/Makefile.am b/src/service/cadet/Makefile.am
index 6983c1f2d..0046ffc70 100644
--- a/src/service/cadet/Makefile.am
+++ b/src/service/cadet/Makefile.am
@@ -52,7 +52,7 @@ gnunet_service_cadet_SOURCES = \
gnunet_service_cadet_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/transport/libgnunettransportapplication.la \
$(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
diff --git a/src/datacache/.gitignore b/src/service/datacache/.gitignore
similarity index 100%
rename from src/datacache/.gitignore
rename to src/service/datacache/.gitignore
diff --git a/src/datacache/Makefile.am b/src/service/datacache/Makefile.am
similarity index 100%
rename from src/datacache/Makefile.am
rename to src/service/datacache/Makefile.am
diff --git a/src/datacache/datacache-0001.sql
b/src/service/datacache/datacache-0001.sql
similarity index 100%
rename from src/datacache/datacache-0001.sql
rename to src/service/datacache/datacache-0001.sql
diff --git a/src/datacache/datacache-drop.sql
b/src/service/datacache/datacache-drop.sql
similarity index 100%
rename from src/datacache/datacache-drop.sql
rename to src/service/datacache/datacache-drop.sql
diff --git a/src/datacache/datacache.c b/src/service/datacache/datacache.c
similarity index 100%
rename from src/datacache/datacache.c
rename to src/service/datacache/datacache.c
diff --git a/src/datacache/datacache.conf b/src/service/datacache/datacache.conf
similarity index 100%
rename from src/datacache/datacache.conf
rename to src/service/datacache/datacache.conf
diff --git a/src/datacache/meson.build b/src/service/datacache/meson.build
similarity index 100%
rename from src/datacache/meson.build
rename to src/service/datacache/meson.build
diff --git a/src/datacache/plugin_datacache_heap.c
b/src/service/datacache/plugin_datacache_heap.c
similarity index 100%
rename from src/datacache/plugin_datacache_heap.c
rename to src/service/datacache/plugin_datacache_heap.c
diff --git a/src/datacache/plugin_datacache_postgres.c
b/src/service/datacache/plugin_datacache_postgres.c
similarity index 100%
rename from src/datacache/plugin_datacache_postgres.c
rename to src/service/datacache/plugin_datacache_postgres.c
diff --git a/src/datacache/plugin_datacache_sqlite.c
b/src/service/datacache/plugin_datacache_sqlite.c
similarity index 100%
rename from src/datacache/plugin_datacache_sqlite.c
rename to src/service/datacache/plugin_datacache_sqlite.c
diff --git a/src/datacache/plugin_datacache_template.c
b/src/service/datacache/plugin_datacache_template.c
similarity index 100%
rename from src/datacache/plugin_datacache_template.c
rename to src/service/datacache/plugin_datacache_template.c
diff --git a/src/datacache/test_datacache.c
b/src/service/datacache/test_datacache.c
similarity index 100%
rename from src/datacache/test_datacache.c
rename to src/service/datacache/test_datacache.c
diff --git a/src/datacache/test_datacache_data_heap.conf
b/src/service/datacache/test_datacache_data_heap.conf
similarity index 100%
rename from src/datacache/test_datacache_data_heap.conf
rename to src/service/datacache/test_datacache_data_heap.conf
diff --git a/src/datacache/test_datacache_data_postgres.conf
b/src/service/datacache/test_datacache_data_postgres.conf
similarity index 100%
rename from src/datacache/test_datacache_data_postgres.conf
rename to src/service/datacache/test_datacache_data_postgres.conf
diff --git a/src/datacache/test_datacache_data_sqlite.conf
b/src/service/datacache/test_datacache_data_sqlite.conf
similarity index 100%
rename from src/datacache/test_datacache_data_sqlite.conf
rename to src/service/datacache/test_datacache_data_sqlite.conf
diff --git a/src/datacache/test_datacache_quota.c
b/src/service/datacache/test_datacache_quota.c
similarity index 100%
rename from src/datacache/test_datacache_quota.c
rename to src/service/datacache/test_datacache_quota.c
diff --git a/src/datastore/.gitignore b/src/service/datastore/.gitignore
similarity index 96%
rename from src/datastore/.gitignore
rename to src/service/datastore/.gitignore
index 51d3391b9..bd5c170ca 100644
--- a/src/datastore/.gitignore
+++ b/src/service/datastore/.gitignore
@@ -1,5 +1,4 @@
gnunet-service-datastore
-gnunet-datastore
perf_datastore_api_heap
perf_plugin_datastore_heap
test_datastore_api_heap
diff --git a/src/datastore/Makefile.am b/src/service/datastore/Makefile.am
similarity index 97%
rename from src/datastore/Makefile.am
rename to src/service/datastore/Makefile.am
index 5a49b173d..9ae5004c6 100644
--- a/src/datastore/Makefile.am
+++ b/src/service/datastore/Makefile.am
@@ -35,9 +35,6 @@ libgnunetdatastore_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
-version-info 1:0:0
-bin_PROGRAMS = \
- gnunet-datastore
-
libexec_PROGRAMS = \
gnunet-service-datastore
@@ -48,14 +45,6 @@ gnunet_service_datastore_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
-gnunet_datastore_SOURCES = \
- gnunet-datastore.c
-gnunet_datastore_LDADD = \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-
if HAVE_SQLITE
SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la
if HAVE_BENCHMARKS
diff --git a/src/datastore/datastore-0001.sql
b/src/service/datastore/datastore-0001.sql
similarity index 100%
rename from src/datastore/datastore-0001.sql
rename to src/service/datastore/datastore-0001.sql
diff --git a/src/datastore/datastore-drop.sql
b/src/service/datastore/datastore-drop.sql
similarity index 100%
rename from src/datastore/datastore-drop.sql
rename to src/service/datastore/datastore-drop.sql
diff --git a/src/datastore/datastore.conf.in
b/src/service/datastore/datastore.conf.in
similarity index 100%
rename from src/datastore/datastore.conf.in
rename to src/service/datastore/datastore.conf.in
diff --git a/src/datastore/datastore.h b/src/service/datastore/datastore.h
similarity index 100%
rename from src/datastore/datastore.h
rename to src/service/datastore/datastore.h
diff --git a/src/datastore/datastore_api.c
b/src/service/datastore/datastore_api.c
similarity index 100%
rename from src/datastore/datastore_api.c
rename to src/service/datastore/datastore_api.c
diff --git a/src/datastore/gnunet-service-datastore.c
b/src/service/datastore/gnunet-service-datastore.c
similarity index 100%
rename from src/datastore/gnunet-service-datastore.c
rename to src/service/datastore/gnunet-service-datastore.c
diff --git a/src/datastore/meson.build b/src/service/datastore/meson.build
similarity index 100%
rename from src/datastore/meson.build
rename to src/service/datastore/meson.build
diff --git a/src/datastore/perf_datastore_api.c
b/src/service/datastore/perf_datastore_api.c
similarity index 100%
rename from src/datastore/perf_datastore_api.c
rename to src/service/datastore/perf_datastore_api.c
diff --git a/src/datastore/perf_plugin_datastore.c
b/src/service/datastore/perf_plugin_datastore.c
similarity index 100%
rename from src/datastore/perf_plugin_datastore.c
rename to src/service/datastore/perf_plugin_datastore.c
diff --git a/src/datastore/perf_plugin_datastore_data_heap.conf
b/src/service/datastore/perf_plugin_datastore_data_heap.conf
similarity index 100%
rename from src/datastore/perf_plugin_datastore_data_heap.conf
rename to src/service/datastore/perf_plugin_datastore_data_heap.conf
diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf
b/src/service/datastore/perf_plugin_datastore_data_postgres.conf
similarity index 100%
rename from src/datastore/perf_plugin_datastore_data_postgres.conf
rename to src/service/datastore/perf_plugin_datastore_data_postgres.conf
diff --git a/src/datastore/perf_plugin_datastore_data_sqlite.conf
b/src/service/datastore/perf_plugin_datastore_data_sqlite.conf
similarity index 100%
rename from src/datastore/perf_plugin_datastore_data_sqlite.conf
rename to src/service/datastore/perf_plugin_datastore_data_sqlite.conf
diff --git a/src/datastore/plugin_datastore_heap.c
b/src/service/datastore/plugin_datastore_heap.c
similarity index 100%
rename from src/datastore/plugin_datastore_heap.c
rename to src/service/datastore/plugin_datastore_heap.c
diff --git a/src/datastore/plugin_datastore_postgres.c
b/src/service/datastore/plugin_datastore_postgres.c
similarity index 100%
rename from src/datastore/plugin_datastore_postgres.c
rename to src/service/datastore/plugin_datastore_postgres.c
diff --git a/src/datastore/plugin_datastore_sqlite.c
b/src/service/datastore/plugin_datastore_sqlite.c
similarity index 100%
rename from src/datastore/plugin_datastore_sqlite.c
rename to src/service/datastore/plugin_datastore_sqlite.c
diff --git a/src/datastore/plugin_datastore_template.c
b/src/service/datastore/plugin_datastore_template.c
similarity index 100%
rename from src/datastore/plugin_datastore_template.c
rename to src/service/datastore/plugin_datastore_template.c
diff --git a/src/datastore/selectrandom.sql
b/src/service/datastore/selectrandom.sql
similarity index 100%
rename from src/datastore/selectrandom.sql
rename to src/service/datastore/selectrandom.sql
diff --git a/src/datastore/test_datastore_api.c
b/src/service/datastore/test_datastore_api.c
similarity index 100%
rename from src/datastore/test_datastore_api.c
rename to src/service/datastore/test_datastore_api.c
diff --git a/src/datastore/test_datastore_api_data_heap.conf
b/src/service/datastore/test_datastore_api_data_heap.conf
similarity index 100%
rename from src/datastore/test_datastore_api_data_heap.conf
rename to src/service/datastore/test_datastore_api_data_heap.conf
diff --git a/src/datastore/test_datastore_api_data_postgres.conf
b/src/service/datastore/test_datastore_api_data_postgres.conf
similarity index 100%
rename from src/datastore/test_datastore_api_data_postgres.conf
rename to src/service/datastore/test_datastore_api_data_postgres.conf
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf
b/src/service/datastore/test_datastore_api_data_sqlite.conf
similarity index 100%
rename from src/datastore/test_datastore_api_data_sqlite.conf
rename to src/service/datastore/test_datastore_api_data_sqlite.conf
diff --git a/src/datastore/test_datastore_api_management.c
b/src/service/datastore/test_datastore_api_management.c
similarity index 100%
rename from src/datastore/test_datastore_api_management.c
rename to src/service/datastore/test_datastore_api_management.c
diff --git a/src/datastore/test_defaults.conf
b/src/service/datastore/test_defaults.conf
similarity index 100%
rename from src/datastore/test_defaults.conf
rename to src/service/datastore/test_defaults.conf
diff --git a/src/datastore/test_plugin_datastore.c
b/src/service/datastore/test_plugin_datastore.c
similarity index 100%
rename from src/datastore/test_plugin_datastore.c
rename to src/service/datastore/test_plugin_datastore.c
diff --git a/src/datastore/test_plugin_datastore_data_heap.conf
b/src/service/datastore/test_plugin_datastore_data_heap.conf
similarity index 100%
rename from src/datastore/test_plugin_datastore_data_heap.conf
rename to src/service/datastore/test_plugin_datastore_data_heap.conf
diff --git a/src/datastore/test_plugin_datastore_data_postgres.conf
b/src/service/datastore/test_plugin_datastore_data_postgres.conf
similarity index 100%
rename from src/datastore/test_plugin_datastore_data_postgres.conf
rename to src/service/datastore/test_plugin_datastore_data_postgres.conf
diff --git a/src/datastore/test_plugin_datastore_data_sqlite.conf
b/src/service/datastore/test_plugin_datastore_data_sqlite.conf
similarity index 100%
rename from src/datastore/test_plugin_datastore_data_sqlite.conf
rename to src/service/datastore/test_plugin_datastore_data_sqlite.conf
diff --git a/src/dht/.gitignore b/src/service/dht/.gitignore
similarity index 60%
rename from src/dht/.gitignore
rename to src/service/dht/.gitignore
index bd8af1217..939cf3f5f 100644
--- a/src/dht/.gitignore
+++ b/src/service/dht/.gitignore
@@ -1,7 +1,3 @@
-gnunet-dht-get
-gnunet-dht-monitor
-gnunet-dht-profiler
-gnunet-dht-put
gnunet-service-dht
test_dht_2dtorus
test_dht_api
@@ -10,4 +6,3 @@ test_dht_monitor
test_dht_multipeer
test_dht_tools.py
test_dht_twopeer
-gnunet-dht-hello
diff --git a/src/dht/Makefile.am b/src/service/dht/Makefile.am
similarity index 72%
rename from src/dht/Makefile.am
rename to src/service/dht/Makefile.am
index 8449d4825..bf3d26235 100644
--- a/src/dht/Makefile.am
+++ b/src/service/dht/Makefile.am
@@ -47,12 +47,6 @@ libgnunet_plugin_block_dht_la_LDFLAGS = \
libexec_PROGRAMS = \
gnunet-service-dht
-bin_PROGRAMS = \
- gnunet-dht-monitor \
- gnunet-dht-get \
- gnunet-dht-put \
- gnunet-dht-hello
-
gnunet_service_dht_SOURCES = \
gnunet-service-dht.c gnunet-service-dht.h \
gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
@@ -67,44 +61,12 @@ gnunet_service_dht_LDADD = \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
$(top_builddir)/src/lib/block/libgnunetblockgroup.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ $(top_builddir)/src/service/datacache/libgnunetdatacache.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
-lm
gnunet_service_dht_LDFLAGS = \
$(GN_LIBINTL)
-gnunet_dht_get_SOURCES = \
- gnunet-dht-get.c
-gnunet_dht_get_LDADD = \
- libgnunetdht.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_get_LDFLAGS = \
- $(GN_LIBINTL)
-
-gnunet_dht_hello_SOURCES = \
- gnunet-dht-hello.c
-gnunet_dht_hello_LDADD = \
- libgnunetdht.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_hello_LDFLAGS = \
- $(GN_LIBINTL)
-
-gnunet_dht_put_SOURCES = \
- gnunet-dht-put.c
-gnunet_dht_put_LDADD = \
- libgnunetdht.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_put_LDFLAGS = \
- $(GN_LIBINTL)
-
-gnunet_dht_monitor_SOURCES = \
- gnunet-dht-monitor.c
-gnunet_dht_monitor_LDADD = \
- libgnunetdht.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_monitor_LDFLAGS = \
- $(GN_LIBINTL)
-
if ENABLE_TEST_RUN
AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
endif
diff --git a/src/dht/dht.conf.in b/src/service/dht/dht.conf.in
similarity index 100%
rename from src/dht/dht.conf.in
rename to src/service/dht/dht.conf.in
diff --git a/src/dht/dht.h b/src/service/dht/dht.h
similarity index 100%
rename from src/dht/dht.h
rename to src/service/dht/dht.h
diff --git a/src/dht/dht_api.c b/src/service/dht/dht_api.c
similarity index 100%
rename from src/dht/dht_api.c
rename to src/service/dht/dht_api.c
diff --git a/src/dht/dht_test_lib.c b/src/service/dht/dht_test_lib.c
similarity index 100%
rename from src/dht/dht_test_lib.c
rename to src/service/dht/dht_test_lib.c
diff --git a/src/dht/dht_test_lib.h b/src/service/dht/dht_test_lib.h
similarity index 100%
rename from src/dht/dht_test_lib.h
rename to src/service/dht/dht_test_lib.h
diff --git a/src/dht/dhtu_testbed_connect.sh
b/src/service/dht/dhtu_testbed_connect.sh
similarity index 100%
rename from src/dht/dhtu_testbed_connect.sh
rename to src/service/dht/dhtu_testbed_connect.sh
diff --git a/src/dht/dhtu_testbed_deploy.conf
b/src/service/dht/dhtu_testbed_deploy.conf
similarity index 100%
rename from src/dht/dhtu_testbed_deploy.conf
rename to src/service/dht/dhtu_testbed_deploy.conf
diff --git a/src/dht/dhtu_testbed_deploy.sh
b/src/service/dht/dhtu_testbed_deploy.sh
similarity index 100%
rename from src/dht/dhtu_testbed_deploy.sh
rename to src/service/dht/dhtu_testbed_deploy.sh
diff --git a/src/dht/gnunet-service-dht.c b/src/service/dht/gnunet-service-dht.c
similarity index 100%
rename from src/dht/gnunet-service-dht.c
rename to src/service/dht/gnunet-service-dht.c
diff --git a/src/dht/gnunet-service-dht.h b/src/service/dht/gnunet-service-dht.h
similarity index 100%
rename from src/dht/gnunet-service-dht.h
rename to src/service/dht/gnunet-service-dht.h
diff --git a/src/dht/gnunet-service-dht_clients.c
b/src/service/dht/gnunet-service-dht_clients.c
similarity index 100%
rename from src/dht/gnunet-service-dht_clients.c
rename to src/service/dht/gnunet-service-dht_clients.c
diff --git a/src/dht/gnunet-service-dht_datacache.c
b/src/service/dht/gnunet-service-dht_datacache.c
similarity index 100%
rename from src/dht/gnunet-service-dht_datacache.c
rename to src/service/dht/gnunet-service-dht_datacache.c
diff --git a/src/dht/gnunet-service-dht_datacache.h
b/src/service/dht/gnunet-service-dht_datacache.h
similarity index 100%
rename from src/dht/gnunet-service-dht_datacache.h
rename to src/service/dht/gnunet-service-dht_datacache.h
diff --git a/src/dht/gnunet-service-dht_neighbours.c
b/src/service/dht/gnunet-service-dht_neighbours.c
similarity index 100%
rename from src/dht/gnunet-service-dht_neighbours.c
rename to src/service/dht/gnunet-service-dht_neighbours.c
diff --git a/src/dht/gnunet-service-dht_neighbours.h
b/src/service/dht/gnunet-service-dht_neighbours.h
similarity index 100%
rename from src/dht/gnunet-service-dht_neighbours.h
rename to src/service/dht/gnunet-service-dht_neighbours.h
diff --git a/src/dht/gnunet-service-dht_routing.c
b/src/service/dht/gnunet-service-dht_routing.c
similarity index 100%
rename from src/dht/gnunet-service-dht_routing.c
rename to src/service/dht/gnunet-service-dht_routing.c
diff --git a/src/dht/gnunet-service-dht_routing.h
b/src/service/dht/gnunet-service-dht_routing.h
similarity index 100%
rename from src/dht/gnunet-service-dht_routing.h
rename to src/service/dht/gnunet-service-dht_routing.h
diff --git a/src/dht/gnunet_dht_profiler.c
b/src/service/dht/gnunet_dht_profiler.c
similarity index 100%
rename from src/dht/gnunet_dht_profiler.c
rename to src/service/dht/gnunet_dht_profiler.c
diff --git a/src/dht/meson.build b/src/service/dht/meson.build
similarity index 100%
rename from src/dht/meson.build
rename to src/service/dht/meson.build
diff --git a/src/dht/plugin_block_dht.c b/src/service/dht/plugin_block_dht.c
similarity index 100%
rename from src/dht/plugin_block_dht.c
rename to src/service/dht/plugin_block_dht.c
diff --git a/src/dht/test_dht_2dtorus.conf
b/src/service/dht/test_dht_2dtorus.conf
similarity index 100%
rename from src/dht/test_dht_2dtorus.conf
rename to src/service/dht/test_dht_2dtorus.conf
diff --git a/src/dht/test_dht_api.c b/src/service/dht/test_dht_api.c
similarity index 100%
rename from src/dht/test_dht_api.c
rename to src/service/dht/test_dht_api.c
diff --git a/src/dht/test_dht_api_data.conf
b/src/service/dht/test_dht_api_data.conf
similarity index 100%
rename from src/dht/test_dht_api_data.conf
rename to src/service/dht/test_dht_api_data.conf
diff --git a/src/dht/test_dht_api_peer1.conf
b/src/service/dht/test_dht_api_peer1.conf
similarity index 100%
rename from src/dht/test_dht_api_peer1.conf
rename to src/service/dht/test_dht_api_peer1.conf
diff --git a/src/dht/test_dht_line.conf b/src/service/dht/test_dht_line.conf
similarity index 100%
rename from src/dht/test_dht_line.conf
rename to src/service/dht/test_dht_line.conf
diff --git a/src/dht/test_dht_monitor.c b/src/service/dht/test_dht_monitor.c
similarity index 100%
rename from src/dht/test_dht_monitor.c
rename to src/service/dht/test_dht_monitor.c
diff --git a/src/dht/test_dht_monitor.conf
b/src/service/dht/test_dht_monitor.conf
similarity index 100%
rename from src/dht/test_dht_monitor.conf
rename to src/service/dht/test_dht_monitor.conf
diff --git a/src/dht/test_dht_multipeer.conf
b/src/service/dht/test_dht_multipeer.conf
similarity index 100%
rename from src/dht/test_dht_multipeer.conf
rename to src/service/dht/test_dht_multipeer.conf
diff --git a/src/dht/test_dht_multipeer_topology.dat
b/src/service/dht/test_dht_multipeer_topology.dat
similarity index 100%
rename from src/dht/test_dht_multipeer_topology.dat
rename to src/service/dht/test_dht_multipeer_topology.dat
diff --git a/src/dht/test_dht_tools.conf b/src/service/dht/test_dht_tools.conf
similarity index 100%
rename from src/dht/test_dht_tools.conf
rename to src/service/dht/test_dht_tools.conf
diff --git a/src/dht/test_dht_tools.py.in b/src/service/dht/test_dht_tools.py.in
similarity index 100%
rename from src/dht/test_dht_tools.py.in
rename to src/service/dht/test_dht_tools.py.in
diff --git a/src/dht/test_dht_tools.sh b/src/service/dht/test_dht_tools.sh
similarity index 100%
rename from src/dht/test_dht_tools.sh
rename to src/service/dht/test_dht_tools.sh
diff --git a/src/dht/test_dht_topo.c b/src/service/dht/test_dht_topo.c
similarity index 100%
rename from src/dht/test_dht_topo.c
rename to src/service/dht/test_dht_topo.c
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am
index 5c10827b8..1c0d882d6 100644
--- a/src/zonemaster/Makefile.am
+++ b/src/zonemaster/Makefile.am
@@ -21,7 +21,7 @@ libexec_PROGRAMS = \
gnunet_service_zonemaster_SOURCES = \
gnunet-service-zonemaster.c
gnunet_service_zonemaster_LDADD = \
- $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/service/dht/libgnunetdht.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la \
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.