[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 02/03: BUILD: more more components into new structure; ftbfs fi
|
From: |
gnunet |
|
Subject: |
[gnunet] 02/03: BUILD: more more components into new structure; ftbfs fix |
|
Date: |
Wed, 18 Oct 2023 19:36:11 +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 ddfee3f564bff9c5d5719af3132d7869b8783ec4
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 18 19:35:11 2023 +0200
BUILD: more more components into new structure; ftbfs fix
---
configure.ac | 23 ++---
po/POTFILES.in | 92 ++++++++++----------
src/Makefile.am | 5 --
src/cadet/Makefile.am | 8 +-
src/cli/Makefile.am | 5 +-
src/cli/identity/Makefile.am | 2 +-
src/cli/nat/.gitignore | 1 +
src/cli/nat/Makefile.am | 17 ++++
src/{ => cli}/nat/gnunet-nat.c | 0
src/cli/nse/.gitignore | 1 +
src/cli/nse/Makefile.am | 19 ++++
src/{ => cli}/nse/gnunet-nse.c | 0
src/cli/statistics/.gitignore | 1 +
src/cli/statistics/Makefile.am | 40 +++++++++
src/{ => cli}/statistics/gnunet-statistics.c | 2 +-
src/consensus/Makefile.am | 6 +-
src/contrib/service/abd/Makefile.am | 2 +-
src/contrib/service/rps/Makefile.am | 12 +--
src/conversation/Makefile.am | 6 +-
src/datacache/Makefile.am | 20 ++---
src/datastore/Makefile.am | 38 ++++----
src/dht/Makefile.am | 8 +-
src/dns/Makefile.am | 2 +-
src/exit/Makefile.am | 2 +-
src/fs/Makefile.am | 48 +++++------
src/gns/Makefile.am | 2 +-
src/hostlist/Makefile.am | 12 +--
src/lib/gnsrecord/Makefile.am | 10 +--
src/messenger/Makefile.am | 4 +-
src/namecache/Makefile.am | 16 ++--
src/namestore/Makefile.am | 76 ++++++++--------
src/nat-auto/Makefile.am | 8 +-
src/plugin/dhtu/Makefile.am | 10 +--
src/pt/Makefile.am | 12 +--
src/reclaim/Makefile.am | 2 +-
src/regex/Makefile.am | 20 ++---
src/revocation/Makefile.am | 4 +-
src/scalarproduct/Makefile.am | 2 +-
src/secretsharing/Makefile.am | 4 +-
src/service/Makefile.am | 7 +-
src/service/core/Makefile.am | 26 +++---
src/service/identity/Makefile.am | 4 +-
src/{ => service}/nat/.gitignore | 0
src/{ => service}/nat/Makefile.am | 14 +--
src/{ => service}/nat/gnunet-helper-nat-client.c | 0
src/{ => service}/nat/gnunet-helper-nat-server.c | 0
src/{ => service}/nat/gnunet-nat-client-script.sh | 0
src/{ => service}/nat/gnunet-nat-server-script.sh | 0
src/{ => service}/nat/gnunet-service-nat.c | 0
src/{ => service}/nat/gnunet-service-nat.h | 0
.../nat/gnunet-service-nat_externalip.c | 0
.../nat/gnunet-service-nat_externalip.h | 0
src/{ => service}/nat/gnunet-service-nat_helper.c | 0
src/{ => service}/nat/gnunet-service-nat_helper.h | 0
src/{ => service}/nat/gnunet-service-nat_mini.c | 0
src/{ => service}/nat/gnunet-service-nat_mini.h | 0
src/{ => service}/nat/gnunet-service-nat_stun.c | 0
src/{ => service}/nat/gnunet-service-nat_stun.h | 0
src/{ => service}/nat/meson.build | 0
src/{ => service}/nat/nat.conf.in | 0
src/{ => service}/nat/nat.h | 0
src/{ => service}/nat/nat_api.c | 0
src/{ => service}/nat/nat_api_stun.c | 0
src/{ => service}/nat/nat_stun.h | 0
src/{ => service}/nat/test_nat.c | 0
src/{ => service}/nat/test_nat_data.conf | 0
src/{ => service}/nat/test_nat_mini.c | 0
src/{ => service}/nat/test_nat_test.c | 0
src/{ => service}/nat/test_nat_test_data.conf | 0
src/{ => service}/nat/test_stun.c | 0
src/{ => service}/nat/test_stun.conf | 0
src/{ => service}/nse/.gitignore | 0
src/{ => service}/nse/Makefile.am | 16 +---
src/{ => service}/nse/gnunet-nse-profiler.c | 0
src/{ => service}/nse/gnunet-service-nse.c | 0
src/{ => service}/nse/hostkeys.dat | Bin
src/{ => service}/nse/meson.build | 0
src/{ => service}/nse/nse.conf.in | 0
src/{ => service}/nse/nse.h | 0
src/{ => service}/nse/nse_api.c | 0
src/{ => service}/nse/nse_infiniband.conf | 0
src/{ => service}/nse/nse_profiler_test.conf | 0
src/{ => service}/nse/perf_kdf.c | 0
src/{ => service}/nse/test_nse.conf | 0
src/{ => service}/nse/test_nse_api.c | 0
src/{ => service}/nse/test_nse_multipeer.c | 0
src/{ => service}/peerstore/.gitignore | 0
src/{ => service}/peerstore/Makefile.am | 14 +--
src/{ => service}/peerstore/gnunet-peerstore.c | 0
.../peerstore/gnunet-service-peerstore.c | 0
src/{ => service}/peerstore/meson.build | 0
src/{ => service}/peerstore/peerstore.conf.in | 0
src/{ => service}/peerstore/peerstore.h | 0
src/{ => service}/peerstore/peerstore_api.c | 0
src/{ => service}/peerstore/peerstore_common.c | 0
src/{ => service}/peerstore/peerstore_common.h | 0
src/{ => service}/peerstore/perf_peerstore_store.c | 0
.../peerstore/plugin_peerstore_flat.c | 0
.../peerstore/plugin_peerstore_sqlite.c | 0
.../peerstore/test_peerstore_api_data.conf | 0
.../peerstore/test_peerstore_api_iterate.c | 0
.../peerstore/test_peerstore_api_store.c | 0
.../peerstore/test_peerstore_api_sync.c | 0
.../peerstore/test_peerstore_api_watch.c | 0
.../peerstore/test_plugin_peerstore.c | 0
.../peerstore/test_plugin_peerstore_flat.conf | 0
.../peerstore/test_plugin_peerstore_sqlite.conf | 0
src/{ => service}/statistics/.gitignore | 0
src/{ => service}/statistics/Makefile.am | 45 ++++------
.../statistics/gnunet-service-statistics.c | 0
src/{ => service}/statistics/meson.build | 0
src/{ => service}/statistics/statistics.conf.in | 0
src/{ => service}/statistics/statistics.h | 0
src/{ => service}/statistics/statistics_api.c | 0
.../statistics/test_gnunet_statistics.py.in | 0
src/{ => service}/statistics/test_statistics_api.c | 0
.../statistics/test_statistics_api_data.conf | 0
.../statistics/test_statistics_api_loop.c | 0
.../statistics/test_statistics_api_watch.c | 0
.../test_statistics_api_watch_zero_value.c | 0
src/{ => service}/transport/.gitignore | 0
src/{ => service}/transport/Makefile.am | 96 ++++++++++-----------
src/{ => service}/transport/NOTES | 0
src/{ => service}/transport/benchmark.sh | 0
src/{ => service}/transport/communicator.h | 0
.../transport/gnunet-communicator-quic.c | 0
.../transport/gnunet-communicator-tcp.c | 0
.../transport/gnunet-communicator-udp.c | 0
.../transport/gnunet-communicator-unix.c | 0
.../transport/gnunet-service-transport.c | 0
.../transport/gnunet-service-transport.h | 0
.../gnunet-transport-certificate-creation.in | 0
src/{ => service}/transport/gnunet-transport.c | 0
src/{ => service}/transport/ieee80211_radiotap.h | 0
src/{ => service}/transport/meson.build | 0
.../transport/template_cfg_peer1.conf | 0
.../transport/template_cfg_peer2.conf | 0
.../transport/template_tng_cfg_peer1.conf | 0
.../transport/test_communicator_basic.c | 0
.../test_communicator_quic_basic_peer1.conf | 0
.../test_communicator_quic_basic_peer2.conf | 0
.../test_communicator_tcp_basic_peer1.conf | 0
.../test_communicator_tcp_basic_peer2.conf | 0
.../test_communicator_tcp_bidirect_peer1.conf | 0
.../test_communicator_tcp_bidirect_peer2.conf | 0
.../test_communicator_tcp_rekey_peer1.conf | 0
.../test_communicator_tcp_rekey_peer2.conf | 0
.../test_communicator_udp_backchannel_peer1.conf | 0
.../test_communicator_udp_backchannel_peer2.conf | 0
.../test_communicator_udp_basic_peer1.conf | 0
.../test_communicator_udp_basic_peer2.conf | 0
.../test_communicator_udp_rekey_peer1.conf | 0
.../test_communicator_udp_rekey_peer2.conf | 0
.../test_communicator_unix_basic_peer1.conf | 0
.../test_communicator_unix_basic_peer2.conf | 0
src/{ => service}/transport/test_delay | 0
src/{ => service}/transport/test_plugin_hostkey | Bin
.../transport/test_plugin_hostkey.ecc | 0
src/{ => service}/transport/test_tng_defaults.conf | 0
.../transport/test_transport_address_switch.c | 0
.../test_transport_address_switch_tcp_peer1.conf | 0
.../test_transport_address_switch_tcp_peer2.conf | 0
.../test_transport_address_switch_udp_peer1.conf | 0
.../test_transport_address_switch_udp_peer2.conf | 0
src/{ => service}/transport/test_transport_api.c | 0
src/{ => service}/transport/test_transport_api2.c | 0
.../transport/test_transport_api2_tcp_node1.conf | 0
.../transport/test_transport_api2_tcp_node2.conf | 0
.../transport/test_transport_api2_tcp_peer1.conf | 0
.../transport/test_transport_api2_tcp_peer2.conf | 0
.../transport/test_transport_api2_tng_node.conf | 0
.../transport/test_transport_api_data.conf | 0
.../transport/test_transport_api_monitor_peers.c | 0
.../test_transport_api_monitor_peers_peer1.conf | 0
.../test_transport_api_monitor_peers_peer2.conf | 0
...est_transport_api_monitor_validation_peer1.conf | 0
...est_transport_api_monitor_validation_peer2.conf | 0
.../transport/test_transport_api_multi_peer1.conf | 0
.../transport/test_transport_api_multi_peer2.conf | 0
.../test_transport_api_tcp_nat_peer1.conf | 0
.../test_transport_api_tcp_nat_peer2.conf | 0
.../transport/test_transport_api_tcp_peer1.conf | 0
.../transport/test_transport_api_tcp_peer2.conf | 0
.../test_transport_api_udp_nat_peer1.conf | 0
.../test_transport_api_udp_nat_peer2.conf | 0
.../transport/test_transport_api_udp_peer1.conf | 0
.../transport/test_transport_api_udp_peer2.conf | 0
.../transport/test_transport_api_unix_peer1.conf | 0
.../transport/test_transport_api_unix_peer2.conf | 0
.../transport/test_transport_defaults.conf | 0
...test_transport_distance_vector_circle_topo.conf | 0
...est_transport_distance_vector_inverse_topo.conf | 0
.../test_transport_distance_vector_topo.conf | 0
.../transport/test_transport_just_run_topo.conf | 0
.../transport/test_transport_nat_icmp_tcp.sh | 0
.../test_transport_nat_icmp_tcp_topo.conf | 0
.../transport/test_transport_nat_upnp.sh | 0
.../transport/test_transport_nat_upnp_topo.conf | 0
.../transport/test_transport_plugin_cmd_just_run.c | 0
.../transport/test_transport_plugin_cmd_nat_upnp.c | 0
.../test_transport_plugin_cmd_simple_send.c | 0
...st_transport_plugin_cmd_simple_send_broadcast.c | 0
.../test_transport_plugin_cmd_simple_send_dv.c | 0
..._transport_plugin_cmd_simple_send_performance.c | 0
.../test_transport_plugin_cmd_udp_backchannel.c | 0
.../transport/test_transport_simple_send.sh | 0
.../test_transport_simple_send_broadcast.sh | 0
.../test_transport_simple_send_broadcast_topo.conf | 0
.../test_transport_simple_send_dv_circle.sh | 0
.../test_transport_simple_send_dv_inverse.sh | 0
.../test_transport_simple_send_performance.sh | 0
...est_transport_simple_send_performance_topo.conf | 0
.../transport/test_transport_simple_send_string.sh | 0
.../transport/test_transport_simple_send_topo.conf | 0
.../transport/test_transport_start_testcase.sh | 0
.../transport/test_transport_start_with_config.c | 0
...rt_test_transport_address_switch_tcp_peer1.conf | 0
...rt_test_transport_address_switch_tcp_peer2.conf | 0
.../transport/test_transport_testing_startstop.c | 0
.../transport/test_transport_udp_backchannel.sh | 0
.../test_transport_udp_backchannel_topo.conf | 0
.../transport/transport-testing-cmds.h | 0
.../transport/transport-testing-communicator.c | 0
.../transport/transport-testing-communicator.h | 0
.../transport/transport-testing-filenames2.c | 0
.../transport/transport-testing-loggers2.c | 0
.../transport/transport-testing-main2.c | 0
.../transport/transport-testing-send2.c | 0
src/{ => service}/transport/transport-testing2.c | 0
src/{ => service}/transport/transport-testing2.h | 0
src/{ => service}/transport/transport.conf.in | 0
src/{ => service}/transport/transport.h | 0
.../transport/transport_api2_application.c | 0
.../transport/transport_api2_communication.c | 0
src/{ => service}/transport/transport_api2_core.c | 0
.../transport/transport_api2_monitor.c | 0
.../transport_api_cmd_backchannel_check.c | 0
.../transport/transport_api_cmd_connecting_peers.c | 0
.../transport/transport_api_cmd_send_simple.c | 0
.../transport_api_cmd_send_simple_performance.c | 0
.../transport/transport_api_cmd_start_peer.c | 0
.../transport/transport_api_cmd_stop_peer.c | 0
src/{ => service}/transport/transport_api_traits.c | 0
src/{ => service}/transport/upnp.sh | 0
src/set/Makefile.am | 14 +--
src/seti/Makefile.am | 8 +-
src/setu/Makefile.am | 10 +--
src/topology/Makefile.am | 8 +-
src/vpn/Makefile.am | 2 +-
src/zonemaster/Makefile.am | 2 +-
250 files changed, 432 insertions(+), 376 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2004b6acc..1f6724a83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1248,8 +1248,18 @@ src/service/core/Makefile
src/service/core/core.conf
src/service/identity/Makefile
src/service/identity/identity.conf
+src/service/nat/Makefile
+src/service/nat/nat.conf
+src/service/nse/Makefile
+src/service/nse/nse.conf
+src/service/peerstore/Makefile
+src/service/peerstore/peerstore.conf
src/service/rest/Makefile
+src/service/statistics/Makefile
+src/service/statistics/statistics.conf
src/service/testing/Makefile
+src/service/transport/Makefile
+src/service/transport/transport.conf
src/service/util/Makefile
src/rest-plugin/Makefile
src/rest-plugin/identity/Makefile
@@ -1257,6 +1267,9 @@ src/rest-plugin/rest/Makefile
src/cli/Makefile
src/cli/arm/Makefile
src/cli/core/Makefile
+src/cli/nat/Makefile
+src/cli/nse/Makefile
+src/cli/statistics/Makefile
src/cli/util/Makefile
src/contrib/Makefile
src/contrib/service/Makefile
@@ -1292,14 +1305,8 @@ src/namecache/Makefile
src/namecache/namecache.conf
src/namestore/Makefile
src/namestore/namestore.conf
-src/nat/Makefile
-src/nat/nat.conf
src/nat-auto/Makefile
src/nat-auto/nat-auto.conf
-src/nse/Makefile
-src/nse/nse.conf
-src/peerstore/Makefile
-src/peerstore/peerstore.conf
src/pt/Makefile
src/regex/Makefile
src/regex/regex.conf
@@ -1315,12 +1322,8 @@ src/seti/Makefile
src/seti/seti.conf
src/setu/Makefile
src/setu/setu.conf
-src/statistics/Makefile
-src/statistics/statistics.conf
src/template/Makefile
src/topology/Makefile
-src/transport/Makefile
-src/transport/transport.conf
src/vpn/Makefile
src/vpn/vpn.conf
src/zonemaster/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e2a94ed63..847b756c2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,6 +20,8 @@ src/cadet/gnunet-service-cadet_tunnels.c
src/cli/arm/gnunet-arm.c
src/cli/core/gnunet-core.c
src/cli/identity/gnunet-identity.c
+src/cli/nat/gnunet-nat.c
+src/cli/nse/gnunet-nse.c
src/cli/util/gnunet-base32.c
src/cli/util/gnunet-config-diff.c
src/cli/util/gnunet-config.c
@@ -320,26 +322,6 @@ src/nat-auto/gnunet-service-nat-auto.c
src/nat-auto/gnunet-service-nat-auto_legacy.c
src/nat-auto/nat_auto_api.c
src/nat-auto/nat_auto_api_test.c
-src/nat/gnunet-helper-nat-client.c
-src/nat/gnunet-helper-nat-server.c
-src/nat/gnunet-nat.c
-src/nat/gnunet-service-nat.c
-src/nat/gnunet-service-nat_externalip.c
-src/nat/gnunet-service-nat_helper.c
-src/nat/gnunet-service-nat_mini.c
-src/nat/gnunet-service-nat_stun.c
-src/nat/nat_api.c
-src/nat/nat_api_stun.c
-src/nse/gnunet-nse-profiler.c
-src/nse/gnunet-nse.c
-src/nse/gnunet-service-nse.c
-src/nse/nse_api.c
-src/peerstore/gnunet-peerstore.c
-src/peerstore/gnunet-service-peerstore.c
-src/peerstore/peerstore_api.c
-src/peerstore/peerstore_common.c
-src/peerstore/plugin_peerstore_flat.c
-src/peerstore/plugin_peerstore_sqlite.c
src/plugin/block/plugin_block_template.c
src/plugin/block/plugin_block_test.c
src/plugin/dhtu/plugin_dhtu_gnunet.c
@@ -414,8 +396,29 @@ src/service/identity/gnunet-service-identity.c
src/service/identity/identity_api.c
src/service/identity/identity_api_lookup.c
src/service/identity/identity_api_suffix_lookup.c
+src/service/nat/gnunet-helper-nat-client.c
+src/service/nat/gnunet-helper-nat-server.c
+src/service/nat/gnunet-service-nat.c
+src/service/nat/gnunet-service-nat_externalip.c
+src/service/nat/gnunet-service-nat_helper.c
+src/service/nat/gnunet-service-nat_mini.c
+src/service/nat/gnunet-service-nat_stun.c
+src/service/nat/nat_api.c
+src/service/nat/nat_api_stun.c
+src/service/nse/gnunet-nse-profiler.c
+src/service/nse/gnunet-service-nse.c
+src/service/nse/nse_api.c
+src/service/peerstore/gnunet-peerstore.c
+src/service/peerstore/gnunet-service-peerstore.c
+src/service/peerstore/peerstore_api.c
+src/service/peerstore/peerstore_common.c
+src/service/peerstore/plugin_peerstore_flat.c
+src/service/peerstore/plugin_peerstore_sqlite.c
src/service/rest/gnunet-rest-server.c
src/service/rest/rest.c
+src/service/statistics/gnunet-service-statistics.c
+src/service/statistics/gnunet-statistics.c
+src/service/statistics/statistics_api.c
src/service/testing/gnunet-cmds-helper.c
src/service/testing/gnunet-testing.c
src/service/testing/list-keys.c
@@ -438,6 +441,29 @@ src/service/testing/testing_api_cmd_system_create.c
src/service/testing/testing_api_cmd_system_destroy.c
src/service/testing/testing_api_loop.c
src/service/testing/testing_api_traits.c
+src/service/transport/gnunet-communicator-quic.c
+src/service/transport/gnunet-communicator-tcp.c
+src/service/transport/gnunet-communicator-udp.c
+src/service/transport/gnunet-communicator-unix.c
+src/service/transport/gnunet-service-transport.c
+src/service/transport/gnunet-transport.c
+src/service/transport/transport-testing-communicator.c
+src/service/transport/transport-testing-filenames2.c
+src/service/transport/transport-testing-loggers2.c
+src/service/transport/transport-testing-main2.c
+src/service/transport/transport-testing-send2.c
+src/service/transport/transport-testing2.c
+src/service/transport/transport_api2_application.c
+src/service/transport/transport_api2_communication.c
+src/service/transport/transport_api2_core.c
+src/service/transport/transport_api2_monitor.c
+src/service/transport/transport_api_cmd_backchannel_check.c
+src/service/transport/transport_api_cmd_connecting_peers.c
+src/service/transport/transport_api_cmd_send_simple.c
+src/service/transport/transport_api_cmd_send_simple_performance.c
+src/service/transport/transport_api_cmd_start_peer.c
+src/service/transport/transport_api_cmd_stop_peer.c
+src/service/transport/transport_api_traits.c
src/service/util/gnunet-service-resolver.c
src/set/gnunet-service-set.c
src/set/gnunet-service-set_intersection.c
@@ -461,9 +487,6 @@ src/setu/ibf.c
src/setu/ibf_sim.c
src/setu/plugin_block_setu_test.c
src/setu/setu_api.c
-src/statistics/gnunet-service-statistics.c
-src/statistics/gnunet-statistics.c
-src/statistics/statistics_api.c
src/template/gnunet-service-template.c
src/template/gnunet-template.c
src/test/dhtu/testing_dhtu_cmd_send.c
@@ -490,29 +513,6 @@ src/test/testing/testing_api_cmd_system_destroy.c
src/test/testing/testing_api_loop.c
src/test/testing/testing_api_traits.c
src/topology/gnunet-daemon-topology.c
-src/transport/gnunet-communicator-quic.c
-src/transport/gnunet-communicator-tcp.c
-src/transport/gnunet-communicator-udp.c
-src/transport/gnunet-communicator-unix.c
-src/transport/gnunet-service-transport.c
-src/transport/gnunet-transport.c
-src/transport/transport-testing-communicator.c
-src/transport/transport-testing-filenames2.c
-src/transport/transport-testing-loggers2.c
-src/transport/transport-testing-main2.c
-src/transport/transport-testing-send2.c
-src/transport/transport-testing2.c
-src/transport/transport_api2_application.c
-src/transport/transport_api2_communication.c
-src/transport/transport_api2_core.c
-src/transport/transport_api2_monitor.c
-src/transport/transport_api_cmd_backchannel_check.c
-src/transport/transport_api_cmd_connecting_peers.c
-src/transport/transport_api_cmd_send_simple.c
-src/transport/transport_api_cmd_send_simple_performance.c
-src/transport/transport_api_cmd_start_peer.c
-src/transport/transport_api_cmd_stop_peer.c
-src/transport/transport_api_traits.c
src/vpn/gnunet-helper-vpn.c
src/vpn/gnunet-service-vpn.c
src/vpn/gnunet-vpn.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 9b7f9c367..c7d7b562a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,15 +17,10 @@ SUBDIRS = \
rest-plugin \
cli \
contrib \
- statistics \
datacache \
datastore \
template \
- peerstore \
- nat \
nat-auto \
- transport \
- nse \
dht \
hostlist \
topology \
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index d366ecd95..217c4847e 100644
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -64,9 +64,9 @@ 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/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/transport/libgnunettransportapplication.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/lib/block/libgnunetblock.la
if LINUX
@@ -79,7 +79,7 @@ test_cadet_local_mq_SOURCES = \
test_cadet_local_mq.c
test_cadet_local_mq_LDADD = \
libgnunetcadet.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
if ENABLE_TEST_RUN
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 218e68671..aac883508 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -1,4 +1,7 @@
SUBDIRS = \
util \
arm \
- core
+ statistics \
+ core \
+ nat \
+ nse
diff --git a/src/cli/identity/Makefile.am b/src/cli/identity/Makefile.am
index be2c2f1c6..d748c19ea 100644
--- a/src/cli/identity/Makefile.am
+++ b/src/cli/identity/Makefile.am
@@ -17,7 +17,7 @@ gnunet_identity_SOURCES = \
gnunet-identity.c
gnunet_identity_LDADD = \
$(top_builddir)/src/service/libgnunetidentity.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
diff --git a/src/cli/nat/.gitignore b/src/cli/nat/.gitignore
new file mode 100644
index 000000000..89e635e9f
--- /dev/null
+++ b/src/cli/nat/.gitignore
@@ -0,0 +1 @@
+gnunet-nat
diff --git a/src/cli/nat/Makefile.am b/src/cli/nat/Makefile.am
new file mode 100644
index 000000000..8c1a3109c
--- /dev/null
+++ b/src/cli/nat/Makefile.am
@@ -0,0 +1,17 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+bin_PROGRAMS = \
+ gnunet-nat
+
+gnunet_nat_SOURCES = \
+ gnunet-nat.c nat.h
+gnunet_nat_LDADD = \
+ $(top_builddir)/src/service/nat/libgnunetnatnew.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_nat_LDFLAGS = \
+ $(GN_LIBINTL)
diff --git a/src/nat/gnunet-nat.c b/src/cli/nat/gnunet-nat.c
similarity index 100%
rename from src/nat/gnunet-nat.c
rename to src/cli/nat/gnunet-nat.c
diff --git a/src/cli/nse/.gitignore b/src/cli/nse/.gitignore
new file mode 100644
index 000000000..ec3c6a9cf
--- /dev/null
+++ b/src/cli/nse/.gitignore
@@ -0,0 +1 @@
+gnunet-nse
diff --git a/src/cli/nse/Makefile.am b/src/cli/nse/Makefile.am
new file mode 100644
index 000000000..e724a22d3
--- /dev/null
+++ b/src/cli/nse/Makefile.am
@@ -0,0 +1,19 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+bin_PROGRAMS = gnunet-nse
+
+gnunet_nse_SOURCES = gnunet-nse.c
+gnunet_nse_LDADD = \
+ $(top_builddir)/src/service/nse/libgnunetnse.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(XLIB) $(GN_LIBINTL)
diff --git a/src/nse/gnunet-nse.c b/src/cli/nse/gnunet-nse.c
similarity index 100%
rename from src/nse/gnunet-nse.c
rename to src/cli/nse/gnunet-nse.c
diff --git a/src/cli/statistics/.gitignore b/src/cli/statistics/.gitignore
new file mode 100644
index 000000000..2a7218e76
--- /dev/null
+++ b/src/cli/statistics/.gitignore
@@ -0,0 +1 @@
+gnunet-statistics
diff --git a/src/cli/statistics/Makefile.am b/src/cli/statistics/Makefile.am
new file mode 100644
index 000000000..f4a572ff2
--- /dev/null
+++ b/src/cli/statistics/Makefile.am
@@ -0,0 +1,40 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+bin_PROGRAMS = \
+ gnunet-statistics
+
+gnunet_statistics_SOURCES = \
+ gnunet-statistics.c
+gnunet_statistics_LDADD = \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+# Config file still in service folder
+#if HAVE_PYTHON
+#check_SCRIPTS = \
+# test_gnunet_statistics.py
+#endif
+#
+#SUFFIXES = .py.in .py
+#.py.in.py:
+# $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)"
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk <
$(srcdir)/$< > $@
+# chmod +x $@
+#
+#test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile
+# $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)"
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk <
$(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py
+# chmod +x test_gnunet_statistics.py
+#
+#EXTRA_DIST = \
+# test_statistics_api_data.conf \
+# test_gnunet_statistics.py.in
diff --git a/src/statistics/gnunet-statistics.c
b/src/cli/statistics/gnunet-statistics.c
similarity index 99%
rename from src/statistics/gnunet-statistics.c
rename to src/cli/statistics/gnunet-statistics.c
index 5894ef68c..3336980d1 100644
--- a/src/statistics/gnunet-statistics.c
+++ b/src/cli/statistics/gnunet-statistics.c
@@ -27,7 +27,7 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_statistics_service.h"
-#include "statistics.h"
+#include "../../service/statistics/statistics.h"
/**
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 8815b95c9..a578a62cc 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -41,7 +41,7 @@ gnunet_service_consensus_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(top_builddir)/src/set/libgnunetset.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(GN_LIBINTL)
gnunet_service_evil_consensus_SOURCES = \
@@ -51,7 +51,7 @@ gnunet_service_evil_consensus_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(top_builddir)/src/set/libgnunetset.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(GN_LIBINTL)
gnunet_service_evil_consensus_CFLAGS = -DEVIL
@@ -92,7 +92,7 @@ test_consensus_api_SOURCES = \
test_consensus_api.c
test_consensus_api_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetconsensus.la
noinst_SCRIPTS = \
diff --git a/src/contrib/service/abd/Makefile.am
b/src/contrib/service/abd/Makefile.am
index 669c00d19..6eff980f4 100644
--- a/src/contrib/service/abd/Makefile.am
+++ b/src/contrib/service/abd/Makefile.am
@@ -68,7 +68,7 @@ gnunet_service_abd_LDADD = \
$(top_builddir)/src/gns/libgnunetgns.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(GN_LIBINTL)
diff --git a/src/contrib/service/rps/Makefile.am
b/src/contrib/service/rps/Makefile.am
index 2ee315d11..34532d67c 100644
--- a/src/contrib/service/rps/Makefile.am
+++ b/src/contrib/service/rps/Makefile.am
@@ -32,7 +32,7 @@ libgnunetrps_la_SOURCES = \
rps-sampler_client.h rps-sampler_client.c \
rps_api.c rps.h
libgnunetrps_la_LIBADD = \
- $(top_builddir)/src/nse/libgnunetnse.la \
+ $(top_builddir)/src/service/nse/libgnunetnse.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL) $(XLIB)
libgnunetrps_la_LDFLAGS = \
@@ -61,10 +61,10 @@ gnunet_service_rps_SOURCES = \
gnunet_service_rps_LDADD = \
libgnunetrps.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
- $(top_builddir)/src/nse/libgnunetnse.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/nse/libgnunetnse.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(LIBGCRYPT_LIBS) \
-lm -lgcrypt \
@@ -96,7 +96,7 @@ rps_test_src = \
#ld_rps_test_lib = \
# libgnunetrps.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
+# $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
# $(top_builddir)/src/testbed/libgnunettestbed.la \
# -lm
@@ -156,7 +156,7 @@ test_service_rps_sampler_elem_LDADD =
$(top_builddir)/src/lib/util/libgnunetutil
# rps-test_util.h rps-test_util.c \
# gnunet-rps-profiler.c
#gnunet_rps_profiler_LDADD = \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
+# $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
# libgnunetrps.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la \
# $(top_builddir)/src/testbed/libgnunettestbed.la \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 5aa79a0e0..366c4a199 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -225,7 +225,7 @@ test_conversation_api_LDADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_conversation_api_LDFLAGS = \
-export-dynamic
@@ -239,7 +239,7 @@ test_conversation_api_twocalls_LDADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_conversation_api_twocalls_LDFLAGS = \
-export-dynamic
@@ -253,7 +253,7 @@ test_conversation_api_reject_LDADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_conversation_api_reject_LDFLAGS = \
-export-dynamic
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 16359945a..9caeac543 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -33,7 +33,7 @@ lib_LTLIBRARIES = \
libgnunetdatacache_la_SOURCES = \
datacache.c
libgnunetdatacache_la_LIBADD = \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
libgnunetdatacache_la_LDFLAGS = \
@@ -55,7 +55,7 @@ noinst_LTLIBRARIES = \
libgnunet_plugin_datacache_sqlite_la_SOURCES = \
plugin_datacache_sqlite.c
libgnunet_plugin_datacache_sqlite_la_LIBADD = \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/sq/libgnunetsq.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
$(LTLIBINTL)
@@ -65,7 +65,7 @@ libgnunet_plugin_datacache_sqlite_la_LDFLAGS = \
libgnunet_plugin_datacache_heap_la_SOURCES = \
plugin_datacache_heap.c
libgnunet_plugin_datacache_heap_la_LIBADD = \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
$(LTLIBINTL)
libgnunet_plugin_datacache_heap_la_LDFLAGS = \
@@ -75,7 +75,7 @@ libgnunet_plugin_datacache_postgres_la_SOURCES = \
plugin_datacache_postgres.c
libgnunet_plugin_datacache_postgres_la_LIBADD = \
$(top_builddir)/src/lib/pq/libgnunetpq.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_PLUGIN_LDFLAGS) -lpq
libgnunet_plugin_datacache_postgres_la_CPPFLAGS = \
@@ -124,42 +124,42 @@ endif
test_datacache_sqlite_SOURCES = \
test_datacache.c
test_datacache_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatacache.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_datacache_quota_sqlite_SOURCES = \
test_datacache_quota.c
test_datacache_quota_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatacache.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_datacache_heap_SOURCES = \
test_datacache.c
test_datacache_heap_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatacache.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_datacache_quota_heap_SOURCES = \
test_datacache_quota.c
test_datacache_quota_heap_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatacache.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_datacache_postgres_SOURCES = \
test_datacache.c
test_datacache_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatacache.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_datacache_quota_postgres_SOURCES = \
test_datacache_quota.c
test_datacache_quota_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatacache.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am
index fc7b71bcc..5a49b173d 100644
--- a/src/datastore/Makefile.am
+++ b/src/datastore/Makefile.am
@@ -28,7 +28,7 @@ lib_LTLIBRARIES = \
libgnunetdatastore_la_SOURCES = \
datastore_api.c datastore.h
libgnunetdatastore_la_LIBADD = \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
libgnunetdatastore_la_LDFLAGS = \
@@ -44,7 +44,7 @@ libexec_PROGRAMS = \
gnunet_service_datastore_SOURCES = \
gnunet-service-datastore.c
gnunet_service_datastore_LDADD = \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -98,7 +98,7 @@ libgnunet_plugin_datastore_sqlite_la_SOURCES = \
plugin_datastore_sqlite.c
libgnunet_plugin_datastore_sqlite_la_LIBADD = \
$(top_builddir)/src/lib/sq/libgnunetsq.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
$(LTLIBINTL)
libgnunet_plugin_datastore_sqlite_la_LDFLAGS = \
@@ -117,7 +117,7 @@ libgnunet_plugin_datastore_heap_la_LDFLAGS = \
libgnunet_plugin_datastore_postgres_la_SOURCES = \
plugin_datastore_postgres.c
libgnunet_plugin_datastore_postgres_la_LIBADD = \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/pq/libgnunetpq.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq
libgnunet_plugin_datastore_postgres_la_LDFLAGS = \
@@ -151,102 +151,102 @@ endif
test_datastore_api_heap_SOURCES = \
test_datastore_api.c
test_datastore_api_heap_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatastore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_datastore_api_management_heap_SOURCES = \
test_datastore_api_management.c
test_datastore_api_management_heap_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatastore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
perf_datastore_api_heap_SOURCES = \
perf_datastore_api.c
perf_datastore_api_heap_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatastore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
perf_plugin_datastore_heap_SOURCES = \
perf_plugin_datastore.c
perf_plugin_datastore_heap_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_plugin_datastore_heap_SOURCES = \
test_plugin_datastore.c
test_plugin_datastore_heap_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_datastore_api_sqlite_SOURCES = \
test_datastore_api.c
test_datastore_api_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatastore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_datastore_api_management_sqlite_SOURCES = \
test_datastore_api_management.c
test_datastore_api_management_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatastore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
perf_datastore_api_sqlite_SOURCES = \
perf_datastore_api.c
perf_datastore_api_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatastore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
perf_plugin_datastore_sqlite_SOURCES = \
perf_plugin_datastore.c
perf_plugin_datastore_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_plugin_datastore_sqlite_SOURCES = \
test_plugin_datastore.c
test_plugin_datastore_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_datastore_api_postgres_SOURCES = \
test_datastore_api.c
test_datastore_api_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatastore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_datastore_api_management_postgres_SOURCES = \
test_datastore_api_management.c
test_datastore_api_management_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatastore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
perf_datastore_api_postgres_SOURCES = \
perf_datastore_api.c
perf_datastore_api_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetdatastore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_plugin_datastore_postgres_SOURCES = \
test_plugin_datastore.c
test_plugin_datastore_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
perf_plugin_datastore_postgres_SOURCES = \
perf_plugin_datastore.c
perf_plugin_datastore_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 6185d9d2c..8449d4825 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -60,10 +60,10 @@ gnunet_service_dht_SOURCES = \
gnunet-service-dht_routing.c gnunet-service-dht_routing.h
gnunet_service_dht_LDADD = \
libgnunetdht.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/nse/libgnunetnse.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/nse/libgnunetnse.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
$(top_builddir)/src/lib/block/libgnunetblockgroup.la \
@@ -113,7 +113,7 @@ test_dht_api_SOURCES = \
test_dht_api.c
test_dht_api_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
libgnunetdht.la
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 6c7462d9a..38ee78c3a 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -64,7 +64,7 @@ gnunet_dns_redirector_LDADD = \
gnunet_service_dns_SOURCES = \
gnunet-service-dns.c
gnunet_service_dns_LDADD = \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am
index 9e36a5064..c2dba0927 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -31,7 +31,7 @@ gnunet_daemon_exit_SOURCES = \
gnunet-daemon-exit.c exit.h
gnunet_daemon_exit_LDADD = \
$(top_builddir)/src/dht/libgnunetdht.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/regex/libgnunetregex.la \
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index b6083ea06..8616c0474 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -43,7 +43,7 @@ libgnunetfs_la_SOURCES = \
libgnunetfs_la_LIBADD = \
$(top_builddir)/src/datastore/libgnunetdatastore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring
@@ -157,7 +157,7 @@ gnunet_daemon_fsprofiler_SOURCES = \
gnunet-daemon-fsprofiler.c
gnunet_daemon_fsprofiler_LDADD = \
libgnunetfs.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -176,11 +176,11 @@ gnunet_service_fs_LDADD = \
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
$(top_builddir)/src/datastore/libgnunetdatastore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
$(GN_LIBINTL) -lm
gnunet_unindex_SOURCES = \
@@ -278,28 +278,28 @@ endif
test_fs_download_SOURCES = \
test_fs_download.c
test_fs_download_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetfs.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -455,7 +455,7 @@ test_fs_uri_LDADD = \
# perf_gnunet_service_fs_p2p.c
#perf_gnunet_service_fs_p2p_LDADD = \
# libgnunetfstest.a \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
+# $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
# $(top_builddir)/src/testbed/libgnunettestbed.la \
# libgnunetfs.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -464,7 +464,7 @@ test_fs_uri_LDADD = \
# perf_gnunet_service_fs_p2p.c
#perf_gnunet_service_fs_p2p_index_LDADD = \
# libgnunetfstest.a \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
+# $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
# $(top_builddir)/src/testbed/libgnunettestbed.la \
# libgnunetfs.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -473,7 +473,7 @@ test_fs_uri_LDADD = \
# perf_gnunet_service_fs_p2p.c
#perf_gnunet_service_fs_p2p_dht_LDADD = \
# libgnunetfstest.a \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
+# $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
# $(top_builddir)/src/testbed/libgnunettestbed.la \
# libgnunetfs.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -482,7 +482,7 @@ test_fs_uri_LDADD = \
# perf_gnunet_service_fs_p2p_respect.c
#perf_gnunet_service_fs_p2p_respect_LDADD = \
# libgnunetfstest.a \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
+# $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
# $(top_builddir)/src/testbed/libgnunettestbed.la \
# libgnunetfs.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 191103088..d739f8131 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -201,7 +201,7 @@ gnunet_service_gns_LDADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/revocation/libgnunetrevocation.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(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 \
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 9cf72142a..fc9952aa6 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -28,8 +28,8 @@ gnunet_daemon_hostlist_SOURCES = \
gnunet_daemon_hostlist_LDADD = \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBMHD) \
@LIBCURL@ \
@@ -54,21 +54,21 @@ endif
#test_gnunet_daemon_hostlist_SOURCES = \
# test_gnunet_daemon_hostlist.c
#test_gnunet_daemon_hostlist_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransport.la \
+# $(top_builddir)/src/service/transport/libgnunettransport.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la
#
#test_gnunet_daemon_hostlist_reconnect_SOURCES = \
# test_gnunet_daemon_hostlist_reconnect.c
#test_gnunet_daemon_hostlist_reconnect_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransport.la \
+# $(top_builddir)/src/service/transport/libgnunettransport.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la
#
#test_gnunet_daemon_hostlist_learning_SOURCES = \
# test_gnunet_daemon_hostlist_learning.c
#test_gnunet_daemon_hostlist_learning_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransport.la \
+# $(top_builddir)/src/service/transport/libgnunettransport.la \
# $(top_builddir)/src/service/core/libgnunetcore.la \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
+# $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la
EXTRA_DIST = \
diff --git a/src/lib/gnsrecord/Makefile.am b/src/lib/gnsrecord/Makefile.am
index 27d14a972..57b004847 100644
--- a/src/lib/gnsrecord/Makefile.am
+++ b/src/lib/gnsrecord/Makefile.am
@@ -74,7 +74,7 @@ EXTRA_DIST = \
test_gnsrecord_lsd0001testvectors_SOURCES = \
test_gnsrecord_testvectors.c
test_gnsrecord_lsd0001testvectors_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -82,14 +82,14 @@ test_gnsrecord_lsd0001testvectors_LDADD = \
test_gnsrecord_serialization_SOURCES = \
test_gnsrecord_serialization.c
test_gnsrecord_serialization_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_gnsrecord_block_expiration_SOURCES = \
test_gnsrecord_block_expiration.c
test_gnsrecord_block_expiration_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -97,7 +97,7 @@ test_gnsrecord_block_expiration_LDADD = \
test_gnsrecord_crypto_SOURCES = \
test_gnsrecord_crypto.c
test_gnsrecord_crypto_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -105,6 +105,6 @@ test_gnsrecord_crypto_LDADD = \
perf_gnsrecord_crypto_SOURCES = \
perf_gnsrecord_crypto.c
perf_gnsrecord_crypto_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/messenger/Makefile.am b/src/messenger/Makefile.am
index d464261df..60b2314ac 100644
--- a/src/messenger/Makefile.am
+++ b/src/messenger/Makefile.am
@@ -109,14 +109,14 @@ test_messenger_api_SOURCES = \
test_messenger.c
test_messenger_api_LDADD = \
libgnunetmessenger.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_messenger_anonymous_SOURCES = \
test_messenger_anonymous.c
test_messenger_anonymous_LDADD = \
libgnunetmessenger.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
EXTRA_DIST = \
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index 9be5a4fce..36e70813a 100644
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -93,7 +93,7 @@ gnunet_service_namecache_SOURCES = \
gnunet_service_namecache_LDADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamecache.la \
$(GN_LIBINTL)
@@ -108,7 +108,7 @@ libgnunet_plugin_namecache_flat_la_SOURCES = \
plugin_namecache_flat.c
libgnunet_plugin_namecache_flat_la_LIBADD = \
libgnunetnamecache.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
@@ -121,7 +121,7 @@ libgnunet_plugin_namecache_sqlite_la_SOURCES = \
libgnunet_plugin_namecache_sqlite_la_LIBADD = \
libgnunetnamecache.la \
$(top_builddir)/src/lib/sq/libgnunetsq.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
@@ -135,7 +135,7 @@ libgnunet_plugin_namecache_postgres_la_SOURCES = \
libgnunet_plugin_namecache_postgres_la_LIBADD = \
libgnunetnamecache.la \
$(top_builddir)/src/lib/pq/libgnunetpq.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \
@@ -149,26 +149,26 @@ test_namecache_api_cache_block_LDADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamecache.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_plugin_namecache_flat_SOURCES = \
test_plugin_namecache.c
test_plugin_namecache_flat_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_plugin_namecache_sqlite_SOURCES = \
test_plugin_namecache.c
test_plugin_namecache_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_plugin_namecache_postgres_SOURCES = \
test_plugin_namecache.c
test_plugin_namecache_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
EXTRA_DIST = \
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 2bdc25d56..3dbec4a25 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -127,7 +127,7 @@ libgnunetnamestore_la_SOURCES = \
libgnunetnamestore_la_LIBADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
libgnunetnamestore_la_LDFLAGS = \
@@ -147,7 +147,7 @@ gnunet_zoneimport_SOURCES = \
gnunet-zoneimport.c
gnunet_zoneimport_LDADD = \
libgnunetnamestore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -189,7 +189,7 @@ gnunet_service_namestore_LDADD = \
$(top_builddir)/src/namecache/libgnunetnamecache.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamestore.la \
$(GN_LIBINTL)
@@ -202,7 +202,7 @@ libgnunet_plugin_namestore_sqlite_la_LIBADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/sq/libgnunetsq.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
$(LTLIBINTL)
libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \
@@ -214,7 +214,7 @@ libgnunet_plugin_namestore_postgres_la_LIBADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/pq/libgnunetpq.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \
$(LTLIBINTL)
libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
@@ -223,7 +223,7 @@ libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
test_namestore_api_store_sqlite_SOURCES = \
test_namestore_api_store.c
test_namestore_api_store_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
@@ -232,7 +232,7 @@ test_namestore_api_store_sqlite_LDADD = \
test_namestore_api_store_postgres_SOURCES = \
test_namestore_api_store.c
test_namestore_api_store_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
@@ -241,7 +241,7 @@ test_namestore_api_store_postgres_LDADD = \
test_namestore_api_store_update_sqlite_SOURCES = \
test_namestore_api_store_update.c
test_namestore_api_store_update_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -251,7 +251,7 @@ test_namestore_api_store_update_sqlite_LDADD = \
test_namestore_api_store_update_postgres_SOURCES = \
test_namestore_api_store_update.c
test_namestore_api_store_update_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -261,7 +261,7 @@ test_namestore_api_store_update_postgres_LDADD = \
test_namestore_api_lookup_nick_sqlite_SOURCES = \
test_namestore_api_lookup_nick.c
test_namestore_api_lookup_nick_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -271,7 +271,7 @@ test_namestore_api_lookup_nick_sqlite_LDADD = \
test_namestore_api_lookup_nick_postgres_SOURCES = \
test_namestore_api_lookup_nick.c
test_namestore_api_lookup_nick_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -282,7 +282,7 @@ test_namestore_api_remove_sqlite_SOURCES = \
test_namestore_api_remove.c
test_namestore_api_remove_sqlite_LDADD = \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -291,7 +291,7 @@ test_namestore_api_remove_postgres_SOURCES = \
test_namestore_api_remove.c
test_namestore_api_remove_postgres_LDADD = \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -299,7 +299,7 @@ test_namestore_api_remove_postgres_LDADD = \
test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \
test_namestore_api_remove_not_existing_record.c
test_namestore_api_remove_not_existing_record_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -308,7 +308,7 @@ test_namestore_api_remove_not_existing_record_sqlite_LDADD
= \
test_namestore_api_remove_not_existing_record_postgres_SOURCES = \
test_namestore_api_remove_not_existing_record.c
test_namestore_api_remove_not_existing_record_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -318,7 +318,7 @@ test_namestore_api_zone_to_name_sqlite_SOURCES = \
test_namestore_api_zone_to_name.c
test_namestore_api_zone_to_name_sqlite_LDADD = \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamestore.la
@@ -326,7 +326,7 @@ test_namestore_api_zone_to_name_postgres_SOURCES = \
test_namestore_api_zone_to_name.c
test_namestore_api_zone_to_name_postgres_LDADD = \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamestore.la
@@ -334,7 +334,7 @@ test_namestore_api_monitoring_sqlite_SOURCES = \
test_namestore_api_monitoring.c
test_namestore_api_monitoring_sqlite_LDADD = \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -342,7 +342,7 @@ test_namestore_api_monitoring_sqlite_LDADD = \
test_namestore_api_monitoring_postgres_SOURCES = \
test_namestore_api_monitoring.c
test_namestore_api_monitoring_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -351,7 +351,7 @@ test_namestore_api_monitoring_postgres_LDADD = \
test_namestore_api_monitoring_existing_sqlite_SOURCES = \
test_namestore_api_monitoring_existing.c
test_namestore_api_monitoring_existing_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -360,7 +360,7 @@ test_namestore_api_monitoring_existing_sqlite_LDADD = \
test_namestore_api_monitoring_existing_postgres_SOURCES = \
test_namestore_api_monitoring_existing.c
test_namestore_api_monitoring_existing_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
@@ -369,7 +369,7 @@ test_namestore_api_monitoring_existing_postgres_LDADD = \
test_namestore_api_tx_rollback_sqlite_SOURCES = \
test_namestore_api_tx_rollback.c
test_namestore_api_tx_rollback_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -378,7 +378,7 @@ test_namestore_api_tx_rollback_sqlite_LDADD = \
test_namestore_api_tx_rollback_postgres_SOURCES = \
test_namestore_api_tx_rollback.c
test_namestore_api_tx_rollback_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -388,7 +388,7 @@ if HAVE_EXPERIMENTAL
test_namestore_api_edit_records_postgres_SOURCES = \
test_namestore_api_edit_records.c
test_namestore_api_edit_records_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -398,7 +398,7 @@ endif
test_namestore_api_zone_iteration_sqlite_SOURCES = \
test_namestore_api_zone_iteration.c
test_namestore_api_zone_iteration_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -407,7 +407,7 @@ test_namestore_api_zone_iteration_sqlite_LDADD = \
test_namestore_api_zone_iteration_postgres_SOURCES = \
test_namestore_api_zone_iteration.c
test_namestore_api_zone_iteration_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -416,7 +416,7 @@ test_namestore_api_zone_iteration_postgres_LDADD = \
perf_namestore_api_zone_iteration_postgres_SOURCES = \
perf_namestore_api_zone_iteration.c
perf_namestore_api_zone_iteration_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -425,7 +425,7 @@ perf_namestore_api_zone_iteration_postgres_LDADD = \
perf_namestore_api_import_sqlite_SOURCES = \
perf_namestore_api_import.c
perf_namestore_api_import_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -434,7 +434,7 @@ perf_namestore_api_import_sqlite_LDADD = \
perf_namestore_api_import_postgres_SOURCES = \
perf_namestore_api_import.c
perf_namestore_api_import_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -444,7 +444,7 @@ perf_namestore_api_import_postgres_LDADD = \
perf_namestore_api_zone_iteration_sqlite_SOURCES = \
perf_namestore_api_zone_iteration.c
perf_namestore_api_zone_iteration_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -453,7 +453,7 @@ perf_namestore_api_zone_iteration_sqlite_LDADD = \
test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \
test_namestore_api_zone_iteration_nick.c
test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -462,7 +462,7 @@ test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
test_namestore_api_zone_iteration_nick_postgres_SOURCES = \
test_namestore_api_zone_iteration_nick.c
test_namestore_api_zone_iteration_nick_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -471,7 +471,7 @@ test_namestore_api_zone_iteration_nick_postgres_LDADD = \
test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \
test_namestore_api_zone_iteration_specific_zone.c
test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -480,7 +480,7 @@
test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \
test_namestore_api_zone_iteration_specific_zone.c
test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -489,7 +489,7 @@
test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \
test_namestore_api_zone_iteration_stop.c
test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -498,7 +498,7 @@ test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
test_namestore_api_zone_iteration_stop_postgres_SOURCES = \
test_namestore_api_zone_iteration_stop.c
test_namestore_api_zone_iteration_stop_postgres_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -507,7 +507,7 @@ test_namestore_api_zone_iteration_stop_postgres_LDADD = \
test_plugin_namestore_sqlite_SOURCES = \
test_plugin_namestore.c
test_plugin_namestore_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -515,7 +515,7 @@ test_plugin_namestore_postgres_SOURCES = \
test_plugin_namestore.c
test_plugin_namestore_postgres_LDADD = \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
check_SCRIPTS = \
diff --git a/src/nat-auto/Makefile.am b/src/nat-auto/Makefile.am
index 0ca5da4dc..7c3f8e11d 100644
--- a/src/nat-auto/Makefile.am
+++ b/src/nat-auto/Makefile.am
@@ -18,7 +18,7 @@ libexec_PROGRAMS = \
gnunet_nat_server_SOURCES = \
gnunet-nat-server.c nat-auto.h
gnunet_nat_server_LDADD = \
- $(top_builddir)/src/nat/libgnunetnatnew.la \
+ $(top_builddir)/src/service/nat/libgnunetnatnew.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
gnunet_nat_server_LDFLAGS = \
$(GN_LIBINTL)
@@ -42,7 +42,7 @@ libgnunetnatauto_la_SOURCES = \
nat_auto_api.c \
nat_auto_api_test.c
libgnunetnatauto_la_LIBADD = \
- $(top_builddir)/src/nat/libgnunetnatnew.la \
+ $(top_builddir)/src/service/nat/libgnunetnatnew.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL) @EXT_LIBS@
libgnunetnatauto_la_LDFLAGS = \
@@ -53,8 +53,8 @@ gnunet_service_nat_auto_SOURCES = \
gnunet-service-nat-auto.c
gnunet_service_nat_auto_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/nat/libgnunetnatnew.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/nat/libgnunetnatnew.la \
$(LIBGCRYPT_LIBS) \
-lgcrypt \
$(GN_LIBINTL)
diff --git a/src/plugin/dhtu/Makefile.am b/src/plugin/dhtu/Makefile.am
index 26e706e36..500d5a7b1 100644
--- a/src/plugin/dhtu/Makefile.am
+++ b/src/plugin/dhtu/Makefile.am
@@ -34,10 +34,10 @@ libgnunet_plugin_dhtu_gnunet_la_SOURCES = \
plugin_dhtu_gnunet.c
libgnunet_plugin_dhtu_gnunet_la_LIBADD = \
$(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/transport/libgnunettransportapplication.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
- $(top_builddir)/src/nse/libgnunetnse.la \
+ $(top_builddir)/src/service/nse/libgnunetnse.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(XLIBS) \
$(LTLIBINTL)
@@ -51,7 +51,7 @@ lib_LTLIBRARIES = \
libgnunettestingdhtu_la_SOURCES = \
testing_dhtu_cmd_send.c
libgnunettestingdhtu_la_LIBADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(LTLIBINTL)
@@ -64,7 +64,7 @@ libgnunettestingdhtu_la_LDFLAGS = \
test_dhtu_ip_SOURCES = \
test_dhtu_ip.c
test_dhtu_ip_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index f00d16a5c..8a171ec0e 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -24,7 +24,7 @@ gnunet_daemon_pt_LDADD = \
$(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/dns/libgnunetdns.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -56,7 +56,7 @@ test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -64,7 +64,7 @@ test_gnunet_vpn_4_over_SOURCES = \
test_gnunet_vpn.c
test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
$(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -72,7 +72,7 @@ test_gnunet_vpn_6_over_SOURCES = \
test_gnunet_vpn.c
test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
$(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -80,7 +80,7 @@ test_gnunet_vpn_4_to_6_SOURCES = \
test_gnunet_vpn.c
test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \
$(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -88,6 +88,6 @@ test_gnunet_vpn_6_to_4_SOURCES = \
test_gnunet_vpn.c
test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \
$(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index e135f3534..c052dd2a8 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -124,7 +124,7 @@ gnunet_service_reclaim_LDADD = \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
libgnunetreclaim.la \
$(top_builddir)/src/gns/libgnunetgns.la \
$(GN_LIBINTL)
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 69f341259..57f48db44 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -33,7 +33,7 @@ gnunet_service_regex_SOURCES = \
gnunet_service_regex_LDADD = -lm \
libgnunetregexblock.la \
$(top_builddir)/src/dht/libgnunetdht.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -90,7 +90,7 @@ libgnunet_plugin_block_regex_la_LDFLAGS = \
# $(top_builddir)/src/lib/util/libgnunetutil.la \
# $(top_builddir)/src/dht/libgnunetdht.la \
# $(top_builddir)/src/lib/block/libgnunetblock.la \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la
+# $(top_builddir)/src/service/statistics/libgnunetstatistics.la
#endif
noinst_PROGRAMS = $(noinst_mysql_progs) \
@@ -102,7 +102,7 @@ perf_regex_LDADD = -lm \
$(top_builddir)/src/dht/libgnunetdht.la \
libgnunetregexblock.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la
perf_regex_LDFLAGS = \
$(GN_LIBINTL)
@@ -111,7 +111,7 @@ gnunet_daemon_regexprofiler_SOURCES = \
gnunet_daemon_regexprofiler_LDADD = -lm \
$(top_builddir)/src/dht/libgnunetdht.la \
libgnunetregexblock.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
gnunet_daemon_regexprofiler_LDFLAGS = \
$(GN_LIBINTL)
@@ -134,21 +134,21 @@ test_regex_eval_api_SOURCES = \
test_regex_eval_api_LDADD = -lm \
$(top_builddir)/src/dht/libgnunetdht.la \
libgnunetregexblock.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_regex_integration_SOURCES = \
test_regex_integration.c
test_regex_integration_LDADD = -lm \
libgnunetregex.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_regex_api_SOURCES = \
test_regex_api.c
test_regex_api_LDADD = -lm \
libgnunetregex.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_regex_iterate_api_SOURCES = \
@@ -156,7 +156,7 @@ test_regex_iterate_api_SOURCES = \
test_regex_iterate_api_LDADD = -lm \
libgnunetregexblock.la \
$(top_builddir)/src/dht/libgnunetdht.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_regex_proofs_SOURCES = \
@@ -164,7 +164,7 @@ test_regex_proofs_SOURCES = \
test_regex_proofs_LDADD = -lm \
$(top_builddir)/src/dht/libgnunetdht.la \
libgnunetregexblock.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_regex_graph_api_SOURCES = \
@@ -172,7 +172,7 @@ test_regex_graph_api_SOURCES = \
test_regex_graph_api_LDADD = -lm \
$(top_builddir)/src/dht/libgnunetdht.la \
libgnunetregexblock.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index d271298a8..0684dd8f2 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -53,7 +53,7 @@ gnunet_revocation_tvg_LDADD = \
test_revocation_lsd0001testvectors_SOURCES = \
test_revocation_testvectors.c
test_revocation_lsd0001testvectors_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetrevocation.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -83,7 +83,7 @@ gnunet_service_revocation_LDADD = \
libgnunetrevocation.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(top_builddir)/src/setu/libgnunetsetu.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
-lm \
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index ef9f8b245..9ad63b309 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -84,7 +84,7 @@ libgnunetscalarproduct_la_SOURCES = \
scalarproduct.h
libgnunetscalarproduct_la_LIBADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(LIBGCRYPT_LIBS) \
-lgcrypt \
$(LTLIBINTL)
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index 6879ef609..c22d57fea 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -28,7 +28,7 @@ lib_LTLIBRARIES = \
# gnunet-secretsharing-profiler.c
#gnunet_secretsharing_profiler_LDADD = \
# libgnunetsecretsharing.la \
-# $(top_builddir)/src/lib/testing/libgnunettesting.la \
+# $(top_builddir)/src/service/testing/libgnunettesting.la \
# $(top_builddir)/src/testbed/libgnunettestbed.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la \
# $(GN_LIBINTL)
@@ -67,7 +67,7 @@ test_secretsharing_api_SOURCES = \
test_secretsharing_api.c
test_secretsharing_api_LDADD = \
libgnunetsecretsharing.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
EXTRA_DIST = \
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 711b076f2..5c92e730e 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -1,7 +1,12 @@
SUBDIRS = \
util \
+ statistics \
arm \
- core \
+ peerstore \
testing \
+ nat \
+ transport \
+ core \
+ nse \
identity \
rest
diff --git a/src/service/core/Makefile.am b/src/service/core/Makefile.am
index 9ce8cf8b5..482befae9 100644
--- a/src/service/core/Makefile.am
+++ b/src/service/core/Makefile.am
@@ -39,11 +39,11 @@ 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/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
+ $(top_builddir)/src/service/transport/libgnunettransportcore.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -54,10 +54,10 @@ libgnunet_test_core_plugin_cmd_just_run_la_LDFLAGS = \
libgnunetcoretesting_la_SOURCES = \
core_api_cmd_connecting_peers.c
libgnunetcoretesting_la_LIBADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
- $(top_builddir)/src/transport/libgnunettransportapplication.la \
- $(top_builddir)/src/transport/libgnunettransportcore.la \
+ $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
+ $(top_builddir)/src/service/transport/libgnunettransportcore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
libgnunetcoretesting_la_LDFLAGS = \
$(GN_LIBINTL) \
@@ -74,9 +74,9 @@ gnunet_service_core_SOURCES = \
gnunet-service-core_sessions.c gnunet-service-core_sessions.h \
gnunet-service-core_typemap.c gnunet-service-core_typemap.h
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/service/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
+ $(top_builddir)/src/service/transport/libgnunettransportcore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL) $(Z_LIBS)
@@ -102,13 +102,13 @@ test_core_api_send_to_self_SOURCES = \
test_core_api_send_to_self.c
test_core_api_send_to_self_LDADD = \
libgnunetcore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.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/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetcore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/service/identity/Makefile.am b/src/service/identity/Makefile.am
index 079a9af2e..e99ef211f 100644
--- a/src/service/identity/Makefile.am
+++ b/src/service/identity/Makefile.am
@@ -39,7 +39,7 @@ gnunet_service_identity_SOURCES = \
gnunet-service-identity.c
gnunet_service_identity_LDADD = \
libgnunetidentity.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -57,7 +57,7 @@ test_identity_SOURCES = \
test_identity.c
test_identity_LDADD = \
libgnunetidentity.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
EXTRA_DIST = \
diff --git a/src/nat/.gitignore b/src/service/nat/.gitignore
similarity index 100%
rename from src/nat/.gitignore
rename to src/service/nat/.gitignore
diff --git a/src/nat/Makefile.am b/src/service/nat/Makefile.am
similarity index 90%
rename from src/nat/Makefile.am
rename to src/service/nat/Makefile.am
index 78ba9b92c..d6cbe94f1 100644
--- a/src/nat/Makefile.am
+++ b/src/service/nat/Makefile.am
@@ -22,9 +22,6 @@ else
install-exec-hook:
endif
-bin_PROGRAMS = \
- gnunet-nat
-
libexec_PROGRAMS = \
$(NATBIN) \
gnunet-service-nat
@@ -37,15 +34,6 @@ gnunet_helper_nat_client_SOURCES = \
$(NATCLIENT)
-gnunet_nat_SOURCES = \
- gnunet-nat.c nat.h
-gnunet_nat_LDADD = \
- libgnunetnatnew.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_nat_LDFLAGS = \
- $(GN_LIBINTL)
-
-
if USE_COVERAGE
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
@@ -72,7 +60,7 @@ gnunet_service_nat_SOURCES = \
gnunet-service-nat_helper.c gnunet-service-nat_helper.h
gnunet_service_nat_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(LIBGCRYPT_LIBS) \
-lgcrypt \
$(GN_LIBINTL)
diff --git a/src/nat/gnunet-helper-nat-client.c
b/src/service/nat/gnunet-helper-nat-client.c
similarity index 100%
rename from src/nat/gnunet-helper-nat-client.c
rename to src/service/nat/gnunet-helper-nat-client.c
diff --git a/src/nat/gnunet-helper-nat-server.c
b/src/service/nat/gnunet-helper-nat-server.c
similarity index 100%
rename from src/nat/gnunet-helper-nat-server.c
rename to src/service/nat/gnunet-helper-nat-server.c
diff --git a/src/nat/gnunet-nat-client-script.sh
b/src/service/nat/gnunet-nat-client-script.sh
similarity index 100%
rename from src/nat/gnunet-nat-client-script.sh
rename to src/service/nat/gnunet-nat-client-script.sh
diff --git a/src/nat/gnunet-nat-server-script.sh
b/src/service/nat/gnunet-nat-server-script.sh
similarity index 100%
rename from src/nat/gnunet-nat-server-script.sh
rename to src/service/nat/gnunet-nat-server-script.sh
diff --git a/src/nat/gnunet-service-nat.c b/src/service/nat/gnunet-service-nat.c
similarity index 100%
rename from src/nat/gnunet-service-nat.c
rename to src/service/nat/gnunet-service-nat.c
diff --git a/src/nat/gnunet-service-nat.h b/src/service/nat/gnunet-service-nat.h
similarity index 100%
rename from src/nat/gnunet-service-nat.h
rename to src/service/nat/gnunet-service-nat.h
diff --git a/src/nat/gnunet-service-nat_externalip.c
b/src/service/nat/gnunet-service-nat_externalip.c
similarity index 100%
rename from src/nat/gnunet-service-nat_externalip.c
rename to src/service/nat/gnunet-service-nat_externalip.c
diff --git a/src/nat/gnunet-service-nat_externalip.h
b/src/service/nat/gnunet-service-nat_externalip.h
similarity index 100%
rename from src/nat/gnunet-service-nat_externalip.h
rename to src/service/nat/gnunet-service-nat_externalip.h
diff --git a/src/nat/gnunet-service-nat_helper.c
b/src/service/nat/gnunet-service-nat_helper.c
similarity index 100%
rename from src/nat/gnunet-service-nat_helper.c
rename to src/service/nat/gnunet-service-nat_helper.c
diff --git a/src/nat/gnunet-service-nat_helper.h
b/src/service/nat/gnunet-service-nat_helper.h
similarity index 100%
rename from src/nat/gnunet-service-nat_helper.h
rename to src/service/nat/gnunet-service-nat_helper.h
diff --git a/src/nat/gnunet-service-nat_mini.c
b/src/service/nat/gnunet-service-nat_mini.c
similarity index 100%
rename from src/nat/gnunet-service-nat_mini.c
rename to src/service/nat/gnunet-service-nat_mini.c
diff --git a/src/nat/gnunet-service-nat_mini.h
b/src/service/nat/gnunet-service-nat_mini.h
similarity index 100%
rename from src/nat/gnunet-service-nat_mini.h
rename to src/service/nat/gnunet-service-nat_mini.h
diff --git a/src/nat/gnunet-service-nat_stun.c
b/src/service/nat/gnunet-service-nat_stun.c
similarity index 100%
rename from src/nat/gnunet-service-nat_stun.c
rename to src/service/nat/gnunet-service-nat_stun.c
diff --git a/src/nat/gnunet-service-nat_stun.h
b/src/service/nat/gnunet-service-nat_stun.h
similarity index 100%
rename from src/nat/gnunet-service-nat_stun.h
rename to src/service/nat/gnunet-service-nat_stun.h
diff --git a/src/nat/meson.build b/src/service/nat/meson.build
similarity index 100%
rename from src/nat/meson.build
rename to src/service/nat/meson.build
diff --git a/src/nat/nat.conf.in b/src/service/nat/nat.conf.in
similarity index 100%
rename from src/nat/nat.conf.in
rename to src/service/nat/nat.conf.in
diff --git a/src/nat/nat.h b/src/service/nat/nat.h
similarity index 100%
rename from src/nat/nat.h
rename to src/service/nat/nat.h
diff --git a/src/nat/nat_api.c b/src/service/nat/nat_api.c
similarity index 100%
rename from src/nat/nat_api.c
rename to src/service/nat/nat_api.c
diff --git a/src/nat/nat_api_stun.c b/src/service/nat/nat_api_stun.c
similarity index 100%
rename from src/nat/nat_api_stun.c
rename to src/service/nat/nat_api_stun.c
diff --git a/src/nat/nat_stun.h b/src/service/nat/nat_stun.h
similarity index 100%
rename from src/nat/nat_stun.h
rename to src/service/nat/nat_stun.h
diff --git a/src/nat/test_nat.c b/src/service/nat/test_nat.c
similarity index 100%
rename from src/nat/test_nat.c
rename to src/service/nat/test_nat.c
diff --git a/src/nat/test_nat_data.conf b/src/service/nat/test_nat_data.conf
similarity index 100%
rename from src/nat/test_nat_data.conf
rename to src/service/nat/test_nat_data.conf
diff --git a/src/nat/test_nat_mini.c b/src/service/nat/test_nat_mini.c
similarity index 100%
rename from src/nat/test_nat_mini.c
rename to src/service/nat/test_nat_mini.c
diff --git a/src/nat/test_nat_test.c b/src/service/nat/test_nat_test.c
similarity index 100%
rename from src/nat/test_nat_test.c
rename to src/service/nat/test_nat_test.c
diff --git a/src/nat/test_nat_test_data.conf
b/src/service/nat/test_nat_test_data.conf
similarity index 100%
rename from src/nat/test_nat_test_data.conf
rename to src/service/nat/test_nat_test_data.conf
diff --git a/src/nat/test_stun.c b/src/service/nat/test_stun.c
similarity index 100%
rename from src/nat/test_stun.c
rename to src/service/nat/test_stun.c
diff --git a/src/nat/test_stun.conf b/src/service/nat/test_stun.conf
similarity index 100%
rename from src/nat/test_stun.conf
rename to src/service/nat/test_stun.conf
diff --git a/src/nse/.gitignore b/src/service/nse/.gitignore
similarity index 100%
rename from src/nse/.gitignore
rename to src/service/nse/.gitignore
diff --git a/src/nse/Makefile.am b/src/service/nse/Makefile.am
similarity index 83%
rename from src/nse/Makefile.am
rename to src/service/nse/Makefile.am
index 053995c9a..7b89ef635 100644
--- a/src/nse/Makefile.am
+++ b/src/service/nse/Makefile.am
@@ -13,14 +13,6 @@ libexecdir= $(pkglibdir)/libexec/
pkgcfg_DATA = \
nse.conf
-bin_PROGRAMS = gnunet-nse
-
-gnunet_nse_SOURCES = gnunet-nse.c
-gnunet_nse_LDADD = \
- libgnunetnse.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(XLIB) $(GN_LIBINTL)
-
lib_LTLIBRARIES = libgnunetnse.la
libgnunetnse_la_SOURCES = \
@@ -45,8 +37,8 @@ libexec_PROGRAMS = \
#gnunet_nse_profiler_LDADD = -lm \
# libgnunetnse.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la \
-# $(top_builddir)/src/statistics/libgnunetstatistics.la \
-# $(top_builddir)/src/lib/testing/libgnunettesting.la \
+# $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+# $(top_builddir)/src/service/testing/libgnunettesting.la \
# $(top_builddir)/src/testbed/libgnunettestbed.la \
# $(GN_LIBINTL)
@@ -56,7 +48,7 @@ gnunet_service_nse_LDADD = \
libgnunetnse.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(LIBGCRYPT_LIBS) \
-lm -lgcrypt \
$(GN_LIBINTL)
@@ -84,7 +76,7 @@ test_nse_api_SOURCES = \
test_nse_api.c
test_nse_api_LDADD = \
libgnunetnse.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_nse_multipeer_SOURCES = \
diff --git a/src/nse/gnunet-nse-profiler.c
b/src/service/nse/gnunet-nse-profiler.c
similarity index 100%
rename from src/nse/gnunet-nse-profiler.c
rename to src/service/nse/gnunet-nse-profiler.c
diff --git a/src/nse/gnunet-service-nse.c b/src/service/nse/gnunet-service-nse.c
similarity index 100%
rename from src/nse/gnunet-service-nse.c
rename to src/service/nse/gnunet-service-nse.c
diff --git a/src/nse/hostkeys.dat b/src/service/nse/hostkeys.dat
similarity index 100%
rename from src/nse/hostkeys.dat
rename to src/service/nse/hostkeys.dat
diff --git a/src/nse/meson.build b/src/service/nse/meson.build
similarity index 100%
rename from src/nse/meson.build
rename to src/service/nse/meson.build
diff --git a/src/nse/nse.conf.in b/src/service/nse/nse.conf.in
similarity index 100%
rename from src/nse/nse.conf.in
rename to src/service/nse/nse.conf.in
diff --git a/src/nse/nse.h b/src/service/nse/nse.h
similarity index 100%
rename from src/nse/nse.h
rename to src/service/nse/nse.h
diff --git a/src/nse/nse_api.c b/src/service/nse/nse_api.c
similarity index 100%
rename from src/nse/nse_api.c
rename to src/service/nse/nse_api.c
diff --git a/src/nse/nse_infiniband.conf b/src/service/nse/nse_infiniband.conf
similarity index 100%
rename from src/nse/nse_infiniband.conf
rename to src/service/nse/nse_infiniband.conf
diff --git a/src/nse/nse_profiler_test.conf
b/src/service/nse/nse_profiler_test.conf
similarity index 100%
rename from src/nse/nse_profiler_test.conf
rename to src/service/nse/nse_profiler_test.conf
diff --git a/src/nse/perf_kdf.c b/src/service/nse/perf_kdf.c
similarity index 100%
rename from src/nse/perf_kdf.c
rename to src/service/nse/perf_kdf.c
diff --git a/src/nse/test_nse.conf b/src/service/nse/test_nse.conf
similarity index 100%
rename from src/nse/test_nse.conf
rename to src/service/nse/test_nse.conf
diff --git a/src/nse/test_nse_api.c b/src/service/nse/test_nse_api.c
similarity index 100%
rename from src/nse/test_nse_api.c
rename to src/service/nse/test_nse_api.c
diff --git a/src/nse/test_nse_multipeer.c b/src/service/nse/test_nse_multipeer.c
similarity index 100%
rename from src/nse/test_nse_multipeer.c
rename to src/service/nse/test_nse_multipeer.c
diff --git a/src/peerstore/.gitignore b/src/service/peerstore/.gitignore
similarity index 100%
rename from src/peerstore/.gitignore
rename to src/service/peerstore/.gitignore
diff --git a/src/peerstore/Makefile.am b/src/service/peerstore/Makefile.am
similarity index 90%
rename from src/peerstore/Makefile.am
rename to src/service/peerstore/Makefile.am
index 41a082f89..28948b7db 100644
--- a/src/peerstore/Makefile.am
+++ b/src/service/peerstore/Makefile.am
@@ -86,13 +86,13 @@ plugin_LTLIBRARIES = \
test_plugin_peerstore_sqlite_SOURCES = \
test_plugin_peerstore.c
test_plugin_peerstore_sqlite_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_plugin_peerstore_flat_SOURCES = \
test_plugin_peerstore.c
test_plugin_peerstore_flat_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
check_PROGRAMS = \
@@ -118,33 +118,33 @@ test_peerstore_api_store_SOURCES = \
test_peerstore_api_store.c
test_peerstore_api_store_LDADD = \
libgnunetpeerstore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_peerstore_api_iterate_SOURCES = \
test_peerstore_api_iterate.c
test_peerstore_api_iterate_LDADD = \
libgnunetpeerstore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_peerstore_api_watch_SOURCES = \
test_peerstore_api_watch.c
test_peerstore_api_watch_LDADD = \
libgnunetpeerstore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_peerstore_api_sync_SOURCES = \
test_peerstore_api_sync.c
test_peerstore_api_sync_LDADD = \
libgnunetpeerstore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
perf_peerstore_store_SOURCES = \
perf_peerstore_store.c
perf_peerstore_store_LDADD = \
libgnunetpeerstore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/peerstore/gnunet-peerstore.c
b/src/service/peerstore/gnunet-peerstore.c
similarity index 100%
rename from src/peerstore/gnunet-peerstore.c
rename to src/service/peerstore/gnunet-peerstore.c
diff --git a/src/peerstore/gnunet-service-peerstore.c
b/src/service/peerstore/gnunet-service-peerstore.c
similarity index 100%
rename from src/peerstore/gnunet-service-peerstore.c
rename to src/service/peerstore/gnunet-service-peerstore.c
diff --git a/src/peerstore/meson.build b/src/service/peerstore/meson.build
similarity index 100%
rename from src/peerstore/meson.build
rename to src/service/peerstore/meson.build
diff --git a/src/peerstore/peerstore.conf.in
b/src/service/peerstore/peerstore.conf.in
similarity index 100%
rename from src/peerstore/peerstore.conf.in
rename to src/service/peerstore/peerstore.conf.in
diff --git a/src/peerstore/peerstore.h b/src/service/peerstore/peerstore.h
similarity index 100%
rename from src/peerstore/peerstore.h
rename to src/service/peerstore/peerstore.h
diff --git a/src/peerstore/peerstore_api.c
b/src/service/peerstore/peerstore_api.c
similarity index 100%
rename from src/peerstore/peerstore_api.c
rename to src/service/peerstore/peerstore_api.c
diff --git a/src/peerstore/peerstore_common.c
b/src/service/peerstore/peerstore_common.c
similarity index 100%
rename from src/peerstore/peerstore_common.c
rename to src/service/peerstore/peerstore_common.c
diff --git a/src/peerstore/peerstore_common.h
b/src/service/peerstore/peerstore_common.h
similarity index 100%
rename from src/peerstore/peerstore_common.h
rename to src/service/peerstore/peerstore_common.h
diff --git a/src/peerstore/perf_peerstore_store.c
b/src/service/peerstore/perf_peerstore_store.c
similarity index 100%
rename from src/peerstore/perf_peerstore_store.c
rename to src/service/peerstore/perf_peerstore_store.c
diff --git a/src/peerstore/plugin_peerstore_flat.c
b/src/service/peerstore/plugin_peerstore_flat.c
similarity index 100%
rename from src/peerstore/plugin_peerstore_flat.c
rename to src/service/peerstore/plugin_peerstore_flat.c
diff --git a/src/peerstore/plugin_peerstore_sqlite.c
b/src/service/peerstore/plugin_peerstore_sqlite.c
similarity index 100%
rename from src/peerstore/plugin_peerstore_sqlite.c
rename to src/service/peerstore/plugin_peerstore_sqlite.c
diff --git a/src/peerstore/test_peerstore_api_data.conf
b/src/service/peerstore/test_peerstore_api_data.conf
similarity index 100%
rename from src/peerstore/test_peerstore_api_data.conf
rename to src/service/peerstore/test_peerstore_api_data.conf
diff --git a/src/peerstore/test_peerstore_api_iterate.c
b/src/service/peerstore/test_peerstore_api_iterate.c
similarity index 100%
rename from src/peerstore/test_peerstore_api_iterate.c
rename to src/service/peerstore/test_peerstore_api_iterate.c
diff --git a/src/peerstore/test_peerstore_api_store.c
b/src/service/peerstore/test_peerstore_api_store.c
similarity index 100%
rename from src/peerstore/test_peerstore_api_store.c
rename to src/service/peerstore/test_peerstore_api_store.c
diff --git a/src/peerstore/test_peerstore_api_sync.c
b/src/service/peerstore/test_peerstore_api_sync.c
similarity index 100%
rename from src/peerstore/test_peerstore_api_sync.c
rename to src/service/peerstore/test_peerstore_api_sync.c
diff --git a/src/peerstore/test_peerstore_api_watch.c
b/src/service/peerstore/test_peerstore_api_watch.c
similarity index 100%
rename from src/peerstore/test_peerstore_api_watch.c
rename to src/service/peerstore/test_peerstore_api_watch.c
diff --git a/src/peerstore/test_plugin_peerstore.c
b/src/service/peerstore/test_plugin_peerstore.c
similarity index 100%
rename from src/peerstore/test_plugin_peerstore.c
rename to src/service/peerstore/test_plugin_peerstore.c
diff --git a/src/peerstore/test_plugin_peerstore_flat.conf
b/src/service/peerstore/test_plugin_peerstore_flat.conf
similarity index 100%
rename from src/peerstore/test_plugin_peerstore_flat.conf
rename to src/service/peerstore/test_plugin_peerstore_flat.conf
diff --git a/src/peerstore/test_plugin_peerstore_sqlite.conf
b/src/service/peerstore/test_plugin_peerstore_sqlite.conf
similarity index 100%
rename from src/peerstore/test_plugin_peerstore_sqlite.conf
rename to src/service/peerstore/test_plugin_peerstore_sqlite.conf
diff --git a/src/statistics/.gitignore b/src/service/statistics/.gitignore
similarity index 100%
rename from src/statistics/.gitignore
rename to src/service/statistics/.gitignore
diff --git a/src/statistics/Makefile.am b/src/service/statistics/Makefile.am
similarity index 65%
rename from src/statistics/Makefile.am
rename to src/service/statistics/Makefile.am
index ed4796274..55cd266b0 100644
--- a/src/statistics/Makefile.am
+++ b/src/service/statistics/Makefile.am
@@ -27,16 +27,6 @@ libgnunetstatistics_la_LDFLAGS = \
libexec_PROGRAMS = \
gnunet-service-statistics
-bin_PROGRAMS = \
- gnunet-statistics
-
-gnunet_statistics_SOURCES = \
- gnunet-statistics.c
-gnunet_statistics_LDADD = \
- libgnunetstatistics.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
gnunet_service_statistics_SOURCES = \
gnunet-service-statistics.c
gnunet_service_statistics_LDADD = \
@@ -79,20 +69,21 @@ test_statistics_api_watch_zero_value_LDADD = \
libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
-if HAVE_PYTHON
-check_SCRIPTS = \
- test_gnunet_statistics.py
-endif
-
-SUFFIXES = .py.in .py
-.py.in.py:
- $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)"
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk <
$(srcdir)/$< > $@
- chmod +x $@
-
-test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile
- $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)"
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk <
$(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py
- chmod +x test_gnunet_statistics.py
-
-EXTRA_DIST = \
- test_statistics_api_data.conf \
- test_gnunet_statistics.py.in
+# Needs to be done with CLI
+#if HAVE_PYTHON
+#check_SCRIPTS = \
+# test_gnunet_statistics.py
+#endif
+#
+#SUFFIXES = .py.in .py
+#.py.in.py:
+# $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)"
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk <
$(srcdir)/$< > $@
+# chmod +x $@
+#
+#test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile
+# $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)"
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk <
$(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py
+# chmod +x test_gnunet_statistics.py
+#
+#EXTRA_DIST = \
+# test_statistics_api_data.conf \
+# test_gnunet_statistics.py.in
diff --git a/src/statistics/gnunet-service-statistics.c
b/src/service/statistics/gnunet-service-statistics.c
similarity index 100%
rename from src/statistics/gnunet-service-statistics.c
rename to src/service/statistics/gnunet-service-statistics.c
diff --git a/src/statistics/meson.build b/src/service/statistics/meson.build
similarity index 100%
rename from src/statistics/meson.build
rename to src/service/statistics/meson.build
diff --git a/src/statistics/statistics.conf.in
b/src/service/statistics/statistics.conf.in
similarity index 100%
rename from src/statistics/statistics.conf.in
rename to src/service/statistics/statistics.conf.in
diff --git a/src/statistics/statistics.h b/src/service/statistics/statistics.h
similarity index 100%
rename from src/statistics/statistics.h
rename to src/service/statistics/statistics.h
diff --git a/src/statistics/statistics_api.c
b/src/service/statistics/statistics_api.c
similarity index 100%
rename from src/statistics/statistics_api.c
rename to src/service/statistics/statistics_api.c
diff --git a/src/statistics/test_gnunet_statistics.py.in
b/src/service/statistics/test_gnunet_statistics.py.in
similarity index 100%
rename from src/statistics/test_gnunet_statistics.py.in
rename to src/service/statistics/test_gnunet_statistics.py.in
diff --git a/src/statistics/test_statistics_api.c
b/src/service/statistics/test_statistics_api.c
similarity index 100%
rename from src/statistics/test_statistics_api.c
rename to src/service/statistics/test_statistics_api.c
diff --git a/src/statistics/test_statistics_api_data.conf
b/src/service/statistics/test_statistics_api_data.conf
similarity index 100%
rename from src/statistics/test_statistics_api_data.conf
rename to src/service/statistics/test_statistics_api_data.conf
diff --git a/src/statistics/test_statistics_api_loop.c
b/src/service/statistics/test_statistics_api_loop.c
similarity index 100%
rename from src/statistics/test_statistics_api_loop.c
rename to src/service/statistics/test_statistics_api_loop.c
diff --git a/src/statistics/test_statistics_api_watch.c
b/src/service/statistics/test_statistics_api_watch.c
similarity index 100%
rename from src/statistics/test_statistics_api_watch.c
rename to src/service/statistics/test_statistics_api_watch.c
diff --git a/src/statistics/test_statistics_api_watch_zero_value.c
b/src/service/statistics/test_statistics_api_watch_zero_value.c
similarity index 100%
rename from src/statistics/test_statistics_api_watch_zero_value.c
rename to src/service/statistics/test_statistics_api_watch_zero_value.c
diff --git a/src/transport/.gitignore b/src/service/transport/.gitignore
similarity index 100%
rename from src/transport/.gitignore
rename to src/service/transport/.gitignore
diff --git a/src/transport/Makefile.am b/src/service/transport/Makefile.am
similarity index 82%
rename from src/transport/Makefile.am
rename to src/service/transport/Makefile.am
index 7f71b0967..e5a3fe9bd 100644
--- a/src/transport/Makefile.am
+++ b/src/service/transport/Makefile.am
@@ -47,9 +47,9 @@ libgnunettransporttesting2_la_LIBADD = \
libgnunettransportapplication.la \
libgnunettransportcore.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
libgnunettransporttesting2_la_LDFLAGS = \
$(GN_LIBINTL) \
@@ -129,16 +129,16 @@ gnunet_communicator_unix_SOURCES = \
gnunet-communicator-unix.c
gnunet_communicator_unix_LDADD = \
libgnunettransportcommunicator.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
gnunet_communicator_tcp_SOURCES = \
gnunet-communicator-tcp.c
gnunet_communicator_tcp_LDADD = \
libgnunettransportcommunicator.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/nat/libgnunetnatnew.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/nat/libgnunetnatnew.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(LIBGCRYPT_LIBS)
@@ -147,8 +147,8 @@ gnunet_communicator_udp_SOURCES = \
gnunet_communicator_udp_LDADD = \
libgnunettransportapplication.la \
libgnunettransportcommunicator.la \
- $(top_builddir)/src/nat/libgnunetnatnew.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/nat/libgnunetnatnew.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(LIBGCRYPT_LIBS)
@@ -159,9 +159,9 @@ gnunet_communicator_quic_SOURCES = \
gnunet_communicator_quic_LDADD = \
libgnunettransportapplication.la \
libgnunettransportcommunicator.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/nat/libgnunetnatnew.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/nat/libgnunetnatnew.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
-lquiche \
$(LIBGCRYPT_LIBS)
@@ -179,9 +179,9 @@ endif
gnunet_service_transport_SOURCES = \
gnunet-service-transport.c transport.h
gnunet_service_transport_LDADD = \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(LIBGCRYPT_LIBS) \
$(GN_LIBINTL)
@@ -200,9 +200,9 @@ libgnunet_test_transport_plugin_cmd_nat_upnp_la_LIBADD = \
libgnunettransporttesting2.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -216,9 +216,9 @@
libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LIBADD = \
libgnunettransporttesting2.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -232,9 +232,9 @@ libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD =
\
libgnunettransporttesting2.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -248,9 +248,9 @@
libgnunet_test_transport_plugin_cmd_simple_send_performance_la_LIBADD = \
libgnunettransporttesting2.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -264,9 +264,9 @@
libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LIBADD = \
libgnunettransporttesting2.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -280,9 +280,9 @@
libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LIBADD = \
libgnunettransporttesting2.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/service/arm/libgnunetarm.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -330,7 +330,7 @@ endif
test_transport_start_with_config_SOURCES = \
test_transport_start_with_config.c
test_transport_start_with_config_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
libgnunettransportcore.la \
@@ -340,65 +340,65 @@ test_communicator_basic_unix_SOURCES = \
test_communicator_basic.c
test_communicator_basic_unix_LDADD = \
libgnunettransporttesting2.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la
test_communicator_basic_tcp_SOURCES = \
test_communicator_basic.c
test_communicator_basic_tcp_LDADD = \
libgnunettransporttesting2.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la
test_communicator_basic_udp_SOURCES = \
test_communicator_basic.c
test_communicator_basic_udp_LDADD = \
libgnunettransporttesting2.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la
test_communicator_basic_quic_SOURCES = \
test_communicator_basic.c
test_communicator_basic_quic_LDADD = \
libgnunettransporttesting2.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la
test_communicator_rekey_tcp_SOURCES = \
test_communicator_basic.c
test_communicator_rekey_tcp_LDADD = \
libgnunettransporttesting2.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la
test_communicator_rekey_udp_SOURCES = \
test_communicator_basic.c
test_communicator_rekey_udp_LDADD = \
libgnunettransporttesting2.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la
test_communicator_backchannel_udp_SOURCES = \
test_communicator_basic.c
test_communicator_backchannel_udp_LDADD = \
libgnunettransporttesting2.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la
test_communicator_bidirect_tcp_SOURCES = \
test_communicator_basic.c
test_communicator_bidirect_tcp_LDADD = \
libgnunettransporttesting2.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la
test_transport_api2_tcp_SOURCES = \
test_transport_api2.c
diff --git a/src/transport/NOTES b/src/service/transport/NOTES
similarity index 100%
rename from src/transport/NOTES
rename to src/service/transport/NOTES
diff --git a/src/transport/benchmark.sh b/src/service/transport/benchmark.sh
similarity index 100%
rename from src/transport/benchmark.sh
rename to src/service/transport/benchmark.sh
diff --git a/src/transport/communicator.h b/src/service/transport/communicator.h
similarity index 100%
rename from src/transport/communicator.h
rename to src/service/transport/communicator.h
diff --git a/src/transport/gnunet-communicator-quic.c
b/src/service/transport/gnunet-communicator-quic.c
similarity index 100%
rename from src/transport/gnunet-communicator-quic.c
rename to src/service/transport/gnunet-communicator-quic.c
diff --git a/src/transport/gnunet-communicator-tcp.c
b/src/service/transport/gnunet-communicator-tcp.c
similarity index 100%
rename from src/transport/gnunet-communicator-tcp.c
rename to src/service/transport/gnunet-communicator-tcp.c
diff --git a/src/transport/gnunet-communicator-udp.c
b/src/service/transport/gnunet-communicator-udp.c
similarity index 100%
rename from src/transport/gnunet-communicator-udp.c
rename to src/service/transport/gnunet-communicator-udp.c
diff --git a/src/transport/gnunet-communicator-unix.c
b/src/service/transport/gnunet-communicator-unix.c
similarity index 100%
rename from src/transport/gnunet-communicator-unix.c
rename to src/service/transport/gnunet-communicator-unix.c
diff --git a/src/transport/gnunet-service-transport.c
b/src/service/transport/gnunet-service-transport.c
similarity index 100%
rename from src/transport/gnunet-service-transport.c
rename to src/service/transport/gnunet-service-transport.c
diff --git a/src/transport/gnunet-service-transport.h
b/src/service/transport/gnunet-service-transport.h
similarity index 100%
rename from src/transport/gnunet-service-transport.h
rename to src/service/transport/gnunet-service-transport.h
diff --git a/src/transport/gnunet-transport-certificate-creation.in
b/src/service/transport/gnunet-transport-certificate-creation.in
similarity index 100%
rename from src/transport/gnunet-transport-certificate-creation.in
rename to src/service/transport/gnunet-transport-certificate-creation.in
diff --git a/src/transport/gnunet-transport.c
b/src/service/transport/gnunet-transport.c
similarity index 100%
rename from src/transport/gnunet-transport.c
rename to src/service/transport/gnunet-transport.c
diff --git a/src/transport/ieee80211_radiotap.h
b/src/service/transport/ieee80211_radiotap.h
similarity index 100%
rename from src/transport/ieee80211_radiotap.h
rename to src/service/transport/ieee80211_radiotap.h
diff --git a/src/transport/meson.build b/src/service/transport/meson.build
similarity index 100%
rename from src/transport/meson.build
rename to src/service/transport/meson.build
diff --git a/src/transport/template_cfg_peer1.conf
b/src/service/transport/template_cfg_peer1.conf
similarity index 100%
rename from src/transport/template_cfg_peer1.conf
rename to src/service/transport/template_cfg_peer1.conf
diff --git a/src/transport/template_cfg_peer2.conf
b/src/service/transport/template_cfg_peer2.conf
similarity index 100%
rename from src/transport/template_cfg_peer2.conf
rename to src/service/transport/template_cfg_peer2.conf
diff --git a/src/transport/template_tng_cfg_peer1.conf
b/src/service/transport/template_tng_cfg_peer1.conf
similarity index 100%
rename from src/transport/template_tng_cfg_peer1.conf
rename to src/service/transport/template_tng_cfg_peer1.conf
diff --git a/src/transport/test_communicator_basic.c
b/src/service/transport/test_communicator_basic.c
similarity index 100%
rename from src/transport/test_communicator_basic.c
rename to src/service/transport/test_communicator_basic.c
diff --git a/src/transport/test_communicator_quic_basic_peer1.conf
b/src/service/transport/test_communicator_quic_basic_peer1.conf
similarity index 100%
rename from src/transport/test_communicator_quic_basic_peer1.conf
rename to src/service/transport/test_communicator_quic_basic_peer1.conf
diff --git a/src/transport/test_communicator_quic_basic_peer2.conf
b/src/service/transport/test_communicator_quic_basic_peer2.conf
similarity index 100%
rename from src/transport/test_communicator_quic_basic_peer2.conf
rename to src/service/transport/test_communicator_quic_basic_peer2.conf
diff --git a/src/transport/test_communicator_tcp_basic_peer1.conf
b/src/service/transport/test_communicator_tcp_basic_peer1.conf
similarity index 100%
rename from src/transport/test_communicator_tcp_basic_peer1.conf
rename to src/service/transport/test_communicator_tcp_basic_peer1.conf
diff --git a/src/transport/test_communicator_tcp_basic_peer2.conf
b/src/service/transport/test_communicator_tcp_basic_peer2.conf
similarity index 100%
rename from src/transport/test_communicator_tcp_basic_peer2.conf
rename to src/service/transport/test_communicator_tcp_basic_peer2.conf
diff --git a/src/transport/test_communicator_tcp_bidirect_peer1.conf
b/src/service/transport/test_communicator_tcp_bidirect_peer1.conf
similarity index 100%
rename from src/transport/test_communicator_tcp_bidirect_peer1.conf
rename to src/service/transport/test_communicator_tcp_bidirect_peer1.conf
diff --git a/src/transport/test_communicator_tcp_bidirect_peer2.conf
b/src/service/transport/test_communicator_tcp_bidirect_peer2.conf
similarity index 100%
rename from src/transport/test_communicator_tcp_bidirect_peer2.conf
rename to src/service/transport/test_communicator_tcp_bidirect_peer2.conf
diff --git a/src/transport/test_communicator_tcp_rekey_peer1.conf
b/src/service/transport/test_communicator_tcp_rekey_peer1.conf
similarity index 100%
rename from src/transport/test_communicator_tcp_rekey_peer1.conf
rename to src/service/transport/test_communicator_tcp_rekey_peer1.conf
diff --git a/src/transport/test_communicator_tcp_rekey_peer2.conf
b/src/service/transport/test_communicator_tcp_rekey_peer2.conf
similarity index 100%
rename from src/transport/test_communicator_tcp_rekey_peer2.conf
rename to src/service/transport/test_communicator_tcp_rekey_peer2.conf
diff --git a/src/transport/test_communicator_udp_backchannel_peer1.conf
b/src/service/transport/test_communicator_udp_backchannel_peer1.conf
similarity index 100%
rename from src/transport/test_communicator_udp_backchannel_peer1.conf
rename to src/service/transport/test_communicator_udp_backchannel_peer1.conf
diff --git a/src/transport/test_communicator_udp_backchannel_peer2.conf
b/src/service/transport/test_communicator_udp_backchannel_peer2.conf
similarity index 100%
rename from src/transport/test_communicator_udp_backchannel_peer2.conf
rename to src/service/transport/test_communicator_udp_backchannel_peer2.conf
diff --git a/src/transport/test_communicator_udp_basic_peer1.conf
b/src/service/transport/test_communicator_udp_basic_peer1.conf
similarity index 100%
rename from src/transport/test_communicator_udp_basic_peer1.conf
rename to src/service/transport/test_communicator_udp_basic_peer1.conf
diff --git a/src/transport/test_communicator_udp_basic_peer2.conf
b/src/service/transport/test_communicator_udp_basic_peer2.conf
similarity index 100%
rename from src/transport/test_communicator_udp_basic_peer2.conf
rename to src/service/transport/test_communicator_udp_basic_peer2.conf
diff --git a/src/transport/test_communicator_udp_rekey_peer1.conf
b/src/service/transport/test_communicator_udp_rekey_peer1.conf
similarity index 100%
rename from src/transport/test_communicator_udp_rekey_peer1.conf
rename to src/service/transport/test_communicator_udp_rekey_peer1.conf
diff --git a/src/transport/test_communicator_udp_rekey_peer2.conf
b/src/service/transport/test_communicator_udp_rekey_peer2.conf
similarity index 100%
rename from src/transport/test_communicator_udp_rekey_peer2.conf
rename to src/service/transport/test_communicator_udp_rekey_peer2.conf
diff --git a/src/transport/test_communicator_unix_basic_peer1.conf
b/src/service/transport/test_communicator_unix_basic_peer1.conf
similarity index 100%
rename from src/transport/test_communicator_unix_basic_peer1.conf
rename to src/service/transport/test_communicator_unix_basic_peer1.conf
diff --git a/src/transport/test_communicator_unix_basic_peer2.conf
b/src/service/transport/test_communicator_unix_basic_peer2.conf
similarity index 100%
rename from src/transport/test_communicator_unix_basic_peer2.conf
rename to src/service/transport/test_communicator_unix_basic_peer2.conf
diff --git a/src/transport/test_delay b/src/service/transport/test_delay
similarity index 100%
rename from src/transport/test_delay
rename to src/service/transport/test_delay
diff --git a/src/transport/test_plugin_hostkey
b/src/service/transport/test_plugin_hostkey
similarity index 100%
rename from src/transport/test_plugin_hostkey
rename to src/service/transport/test_plugin_hostkey
diff --git a/src/transport/test_plugin_hostkey.ecc
b/src/service/transport/test_plugin_hostkey.ecc
similarity index 100%
rename from src/transport/test_plugin_hostkey.ecc
rename to src/service/transport/test_plugin_hostkey.ecc
diff --git a/src/transport/test_tng_defaults.conf
b/src/service/transport/test_tng_defaults.conf
similarity index 100%
rename from src/transport/test_tng_defaults.conf
rename to src/service/transport/test_tng_defaults.conf
diff --git a/src/transport/test_transport_address_switch.c
b/src/service/transport/test_transport_address_switch.c
similarity index 100%
rename from src/transport/test_transport_address_switch.c
rename to src/service/transport/test_transport_address_switch.c
diff --git a/src/transport/test_transport_address_switch_tcp_peer1.conf
b/src/service/transport/test_transport_address_switch_tcp_peer1.conf
similarity index 100%
rename from src/transport/test_transport_address_switch_tcp_peer1.conf
rename to src/service/transport/test_transport_address_switch_tcp_peer1.conf
diff --git a/src/transport/test_transport_address_switch_tcp_peer2.conf
b/src/service/transport/test_transport_address_switch_tcp_peer2.conf
similarity index 100%
rename from src/transport/test_transport_address_switch_tcp_peer2.conf
rename to src/service/transport/test_transport_address_switch_tcp_peer2.conf
diff --git a/src/transport/test_transport_address_switch_udp_peer1.conf
b/src/service/transport/test_transport_address_switch_udp_peer1.conf
similarity index 100%
rename from src/transport/test_transport_address_switch_udp_peer1.conf
rename to src/service/transport/test_transport_address_switch_udp_peer1.conf
diff --git a/src/transport/test_transport_address_switch_udp_peer2.conf
b/src/service/transport/test_transport_address_switch_udp_peer2.conf
similarity index 100%
rename from src/transport/test_transport_address_switch_udp_peer2.conf
rename to src/service/transport/test_transport_address_switch_udp_peer2.conf
diff --git a/src/transport/test_transport_api.c
b/src/service/transport/test_transport_api.c
similarity index 100%
rename from src/transport/test_transport_api.c
rename to src/service/transport/test_transport_api.c
diff --git a/src/transport/test_transport_api2.c
b/src/service/transport/test_transport_api2.c
similarity index 100%
rename from src/transport/test_transport_api2.c
rename to src/service/transport/test_transport_api2.c
diff --git a/src/transport/test_transport_api2_tcp_node1.conf
b/src/service/transport/test_transport_api2_tcp_node1.conf
similarity index 100%
rename from src/transport/test_transport_api2_tcp_node1.conf
rename to src/service/transport/test_transport_api2_tcp_node1.conf
diff --git a/src/transport/test_transport_api2_tcp_node2.conf
b/src/service/transport/test_transport_api2_tcp_node2.conf
similarity index 100%
rename from src/transport/test_transport_api2_tcp_node2.conf
rename to src/service/transport/test_transport_api2_tcp_node2.conf
diff --git a/src/transport/test_transport_api2_tcp_peer1.conf
b/src/service/transport/test_transport_api2_tcp_peer1.conf
similarity index 100%
rename from src/transport/test_transport_api2_tcp_peer1.conf
rename to src/service/transport/test_transport_api2_tcp_peer1.conf
diff --git a/src/transport/test_transport_api2_tcp_peer2.conf
b/src/service/transport/test_transport_api2_tcp_peer2.conf
similarity index 100%
rename from src/transport/test_transport_api2_tcp_peer2.conf
rename to src/service/transport/test_transport_api2_tcp_peer2.conf
diff --git a/src/transport/test_transport_api2_tng_node.conf
b/src/service/transport/test_transport_api2_tng_node.conf
similarity index 100%
rename from src/transport/test_transport_api2_tng_node.conf
rename to src/service/transport/test_transport_api2_tng_node.conf
diff --git a/src/transport/test_transport_api_data.conf
b/src/service/transport/test_transport_api_data.conf
similarity index 100%
rename from src/transport/test_transport_api_data.conf
rename to src/service/transport/test_transport_api_data.conf
diff --git a/src/transport/test_transport_api_monitor_peers.c
b/src/service/transport/test_transport_api_monitor_peers.c
similarity index 100%
rename from src/transport/test_transport_api_monitor_peers.c
rename to src/service/transport/test_transport_api_monitor_peers.c
diff --git a/src/transport/test_transport_api_monitor_peers_peer1.conf
b/src/service/transport/test_transport_api_monitor_peers_peer1.conf
similarity index 100%
rename from src/transport/test_transport_api_monitor_peers_peer1.conf
rename to src/service/transport/test_transport_api_monitor_peers_peer1.conf
diff --git a/src/transport/test_transport_api_monitor_peers_peer2.conf
b/src/service/transport/test_transport_api_monitor_peers_peer2.conf
similarity index 100%
rename from src/transport/test_transport_api_monitor_peers_peer2.conf
rename to src/service/transport/test_transport_api_monitor_peers_peer2.conf
diff --git a/src/transport/test_transport_api_monitor_validation_peer1.conf
b/src/service/transport/test_transport_api_monitor_validation_peer1.conf
similarity index 100%
rename from src/transport/test_transport_api_monitor_validation_peer1.conf
rename to src/service/transport/test_transport_api_monitor_validation_peer1.conf
diff --git a/src/transport/test_transport_api_monitor_validation_peer2.conf
b/src/service/transport/test_transport_api_monitor_validation_peer2.conf
similarity index 100%
rename from src/transport/test_transport_api_monitor_validation_peer2.conf
rename to src/service/transport/test_transport_api_monitor_validation_peer2.conf
diff --git a/src/transport/test_transport_api_multi_peer1.conf
b/src/service/transport/test_transport_api_multi_peer1.conf
similarity index 100%
rename from src/transport/test_transport_api_multi_peer1.conf
rename to src/service/transport/test_transport_api_multi_peer1.conf
diff --git a/src/transport/test_transport_api_multi_peer2.conf
b/src/service/transport/test_transport_api_multi_peer2.conf
similarity index 100%
rename from src/transport/test_transport_api_multi_peer2.conf
rename to src/service/transport/test_transport_api_multi_peer2.conf
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf
b/src/service/transport/test_transport_api_tcp_nat_peer1.conf
similarity index 100%
rename from src/transport/test_transport_api_tcp_nat_peer1.conf
rename to src/service/transport/test_transport_api_tcp_nat_peer1.conf
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf
b/src/service/transport/test_transport_api_tcp_nat_peer2.conf
similarity index 100%
rename from src/transport/test_transport_api_tcp_nat_peer2.conf
rename to src/service/transport/test_transport_api_tcp_nat_peer2.conf
diff --git a/src/transport/test_transport_api_tcp_peer1.conf
b/src/service/transport/test_transport_api_tcp_peer1.conf
similarity index 100%
rename from src/transport/test_transport_api_tcp_peer1.conf
rename to src/service/transport/test_transport_api_tcp_peer1.conf
diff --git a/src/transport/test_transport_api_tcp_peer2.conf
b/src/service/transport/test_transport_api_tcp_peer2.conf
similarity index 100%
rename from src/transport/test_transport_api_tcp_peer2.conf
rename to src/service/transport/test_transport_api_tcp_peer2.conf
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf
b/src/service/transport/test_transport_api_udp_nat_peer1.conf
similarity index 100%
rename from src/transport/test_transport_api_udp_nat_peer1.conf
rename to src/service/transport/test_transport_api_udp_nat_peer1.conf
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf
b/src/service/transport/test_transport_api_udp_nat_peer2.conf
similarity index 100%
rename from src/transport/test_transport_api_udp_nat_peer2.conf
rename to src/service/transport/test_transport_api_udp_nat_peer2.conf
diff --git a/src/transport/test_transport_api_udp_peer1.conf
b/src/service/transport/test_transport_api_udp_peer1.conf
similarity index 100%
rename from src/transport/test_transport_api_udp_peer1.conf
rename to src/service/transport/test_transport_api_udp_peer1.conf
diff --git a/src/transport/test_transport_api_udp_peer2.conf
b/src/service/transport/test_transport_api_udp_peer2.conf
similarity index 100%
rename from src/transport/test_transport_api_udp_peer2.conf
rename to src/service/transport/test_transport_api_udp_peer2.conf
diff --git a/src/transport/test_transport_api_unix_peer1.conf
b/src/service/transport/test_transport_api_unix_peer1.conf
similarity index 100%
rename from src/transport/test_transport_api_unix_peer1.conf
rename to src/service/transport/test_transport_api_unix_peer1.conf
diff --git a/src/transport/test_transport_api_unix_peer2.conf
b/src/service/transport/test_transport_api_unix_peer2.conf
similarity index 100%
rename from src/transport/test_transport_api_unix_peer2.conf
rename to src/service/transport/test_transport_api_unix_peer2.conf
diff --git a/src/transport/test_transport_defaults.conf
b/src/service/transport/test_transport_defaults.conf
similarity index 100%
rename from src/transport/test_transport_defaults.conf
rename to src/service/transport/test_transport_defaults.conf
diff --git a/src/transport/test_transport_distance_vector_circle_topo.conf
b/src/service/transport/test_transport_distance_vector_circle_topo.conf
similarity index 100%
rename from src/transport/test_transport_distance_vector_circle_topo.conf
rename to src/service/transport/test_transport_distance_vector_circle_topo.conf
diff --git a/src/transport/test_transport_distance_vector_inverse_topo.conf
b/src/service/transport/test_transport_distance_vector_inverse_topo.conf
similarity index 100%
rename from src/transport/test_transport_distance_vector_inverse_topo.conf
rename to src/service/transport/test_transport_distance_vector_inverse_topo.conf
diff --git a/src/transport/test_transport_distance_vector_topo.conf
b/src/service/transport/test_transport_distance_vector_topo.conf
similarity index 100%
rename from src/transport/test_transport_distance_vector_topo.conf
rename to src/service/transport/test_transport_distance_vector_topo.conf
diff --git a/src/transport/test_transport_just_run_topo.conf
b/src/service/transport/test_transport_just_run_topo.conf
similarity index 100%
rename from src/transport/test_transport_just_run_topo.conf
rename to src/service/transport/test_transport_just_run_topo.conf
diff --git a/src/transport/test_transport_nat_icmp_tcp.sh
b/src/service/transport/test_transport_nat_icmp_tcp.sh
similarity index 100%
rename from src/transport/test_transport_nat_icmp_tcp.sh
rename to src/service/transport/test_transport_nat_icmp_tcp.sh
diff --git a/src/transport/test_transport_nat_icmp_tcp_topo.conf
b/src/service/transport/test_transport_nat_icmp_tcp_topo.conf
similarity index 100%
rename from src/transport/test_transport_nat_icmp_tcp_topo.conf
rename to src/service/transport/test_transport_nat_icmp_tcp_topo.conf
diff --git a/src/transport/test_transport_nat_upnp.sh
b/src/service/transport/test_transport_nat_upnp.sh
similarity index 100%
rename from src/transport/test_transport_nat_upnp.sh
rename to src/service/transport/test_transport_nat_upnp.sh
diff --git a/src/transport/test_transport_nat_upnp_topo.conf
b/src/service/transport/test_transport_nat_upnp_topo.conf
similarity index 100%
rename from src/transport/test_transport_nat_upnp_topo.conf
rename to src/service/transport/test_transport_nat_upnp_topo.conf
diff --git a/src/transport/test_transport_plugin_cmd_just_run.c
b/src/service/transport/test_transport_plugin_cmd_just_run.c
similarity index 100%
rename from src/transport/test_transport_plugin_cmd_just_run.c
rename to src/service/transport/test_transport_plugin_cmd_just_run.c
diff --git a/src/transport/test_transport_plugin_cmd_nat_upnp.c
b/src/service/transport/test_transport_plugin_cmd_nat_upnp.c
similarity index 100%
rename from src/transport/test_transport_plugin_cmd_nat_upnp.c
rename to src/service/transport/test_transport_plugin_cmd_nat_upnp.c
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c
b/src/service/transport/test_transport_plugin_cmd_simple_send.c
similarity index 100%
rename from src/transport/test_transport_plugin_cmd_simple_send.c
rename to src/service/transport/test_transport_plugin_cmd_simple_send.c
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
b/src/service/transport/test_transport_plugin_cmd_simple_send_broadcast.c
similarity index 100%
rename from src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
rename to
src/service/transport/test_transport_plugin_cmd_simple_send_broadcast.c
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_dv.c
b/src/service/transport/test_transport_plugin_cmd_simple_send_dv.c
similarity index 100%
rename from src/transport/test_transport_plugin_cmd_simple_send_dv.c
rename to src/service/transport/test_transport_plugin_cmd_simple_send_dv.c
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_performance.c
b/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c
similarity index 100%
rename from src/transport/test_transport_plugin_cmd_simple_send_performance.c
rename to
src/service/transport/test_transport_plugin_cmd_simple_send_performance.c
diff --git a/src/transport/test_transport_plugin_cmd_udp_backchannel.c
b/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c
similarity index 100%
rename from src/transport/test_transport_plugin_cmd_udp_backchannel.c
rename to src/service/transport/test_transport_plugin_cmd_udp_backchannel.c
diff --git a/src/transport/test_transport_simple_send.sh
b/src/service/transport/test_transport_simple_send.sh
similarity index 100%
rename from src/transport/test_transport_simple_send.sh
rename to src/service/transport/test_transport_simple_send.sh
diff --git a/src/transport/test_transport_simple_send_broadcast.sh
b/src/service/transport/test_transport_simple_send_broadcast.sh
similarity index 100%
rename from src/transport/test_transport_simple_send_broadcast.sh
rename to src/service/transport/test_transport_simple_send_broadcast.sh
diff --git a/src/transport/test_transport_simple_send_broadcast_topo.conf
b/src/service/transport/test_transport_simple_send_broadcast_topo.conf
similarity index 100%
rename from src/transport/test_transport_simple_send_broadcast_topo.conf
rename to src/service/transport/test_transport_simple_send_broadcast_topo.conf
diff --git a/src/transport/test_transport_simple_send_dv_circle.sh
b/src/service/transport/test_transport_simple_send_dv_circle.sh
similarity index 100%
rename from src/transport/test_transport_simple_send_dv_circle.sh
rename to src/service/transport/test_transport_simple_send_dv_circle.sh
diff --git a/src/transport/test_transport_simple_send_dv_inverse.sh
b/src/service/transport/test_transport_simple_send_dv_inverse.sh
similarity index 100%
rename from src/transport/test_transport_simple_send_dv_inverse.sh
rename to src/service/transport/test_transport_simple_send_dv_inverse.sh
diff --git a/src/transport/test_transport_simple_send_performance.sh
b/src/service/transport/test_transport_simple_send_performance.sh
similarity index 100%
rename from src/transport/test_transport_simple_send_performance.sh
rename to src/service/transport/test_transport_simple_send_performance.sh
diff --git a/src/transport/test_transport_simple_send_performance_topo.conf
b/src/service/transport/test_transport_simple_send_performance_topo.conf
similarity index 100%
rename from src/transport/test_transport_simple_send_performance_topo.conf
rename to src/service/transport/test_transport_simple_send_performance_topo.conf
diff --git a/src/transport/test_transport_simple_send_string.sh
b/src/service/transport/test_transport_simple_send_string.sh
similarity index 100%
rename from src/transport/test_transport_simple_send_string.sh
rename to src/service/transport/test_transport_simple_send_string.sh
diff --git a/src/transport/test_transport_simple_send_topo.conf
b/src/service/transport/test_transport_simple_send_topo.conf
similarity index 100%
rename from src/transport/test_transport_simple_send_topo.conf
rename to src/service/transport/test_transport_simple_send_topo.conf
diff --git a/src/transport/test_transport_start_testcase.sh
b/src/service/transport/test_transport_start_testcase.sh
similarity index 100%
rename from src/transport/test_transport_start_testcase.sh
rename to src/service/transport/test_transport_start_testcase.sh
diff --git a/src/transport/test_transport_start_with_config.c
b/src/service/transport/test_transport_start_with_config.c
similarity index 100%
rename from src/transport/test_transport_start_with_config.c
rename to src/service/transport/test_transport_start_with_config.c
diff --git
a/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf
b/src/service/transport/test_transport_test_transport_address_switch_tcp_peer1.conf
similarity index 100%
rename from
src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf
rename to
src/service/transport/test_transport_test_transport_address_switch_tcp_peer1.conf
diff --git
a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
b/src/service/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
similarity index 100%
rename from
src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
rename to
src/service/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
diff --git a/src/transport/test_transport_testing_startstop.c
b/src/service/transport/test_transport_testing_startstop.c
similarity index 100%
rename from src/transport/test_transport_testing_startstop.c
rename to src/service/transport/test_transport_testing_startstop.c
diff --git a/src/transport/test_transport_udp_backchannel.sh
b/src/service/transport/test_transport_udp_backchannel.sh
similarity index 100%
rename from src/transport/test_transport_udp_backchannel.sh
rename to src/service/transport/test_transport_udp_backchannel.sh
diff --git a/src/transport/test_transport_udp_backchannel_topo.conf
b/src/service/transport/test_transport_udp_backchannel_topo.conf
similarity index 100%
rename from src/transport/test_transport_udp_backchannel_topo.conf
rename to src/service/transport/test_transport_udp_backchannel_topo.conf
diff --git a/src/transport/transport-testing-cmds.h
b/src/service/transport/transport-testing-cmds.h
similarity index 100%
rename from src/transport/transport-testing-cmds.h
rename to src/service/transport/transport-testing-cmds.h
diff --git a/src/transport/transport-testing-communicator.c
b/src/service/transport/transport-testing-communicator.c
similarity index 100%
rename from src/transport/transport-testing-communicator.c
rename to src/service/transport/transport-testing-communicator.c
diff --git a/src/transport/transport-testing-communicator.h
b/src/service/transport/transport-testing-communicator.h
similarity index 100%
rename from src/transport/transport-testing-communicator.h
rename to src/service/transport/transport-testing-communicator.h
diff --git a/src/transport/transport-testing-filenames2.c
b/src/service/transport/transport-testing-filenames2.c
similarity index 100%
rename from src/transport/transport-testing-filenames2.c
rename to src/service/transport/transport-testing-filenames2.c
diff --git a/src/transport/transport-testing-loggers2.c
b/src/service/transport/transport-testing-loggers2.c
similarity index 100%
rename from src/transport/transport-testing-loggers2.c
rename to src/service/transport/transport-testing-loggers2.c
diff --git a/src/transport/transport-testing-main2.c
b/src/service/transport/transport-testing-main2.c
similarity index 100%
rename from src/transport/transport-testing-main2.c
rename to src/service/transport/transport-testing-main2.c
diff --git a/src/transport/transport-testing-send2.c
b/src/service/transport/transport-testing-send2.c
similarity index 100%
rename from src/transport/transport-testing-send2.c
rename to src/service/transport/transport-testing-send2.c
diff --git a/src/transport/transport-testing2.c
b/src/service/transport/transport-testing2.c
similarity index 100%
rename from src/transport/transport-testing2.c
rename to src/service/transport/transport-testing2.c
diff --git a/src/transport/transport-testing2.h
b/src/service/transport/transport-testing2.h
similarity index 100%
rename from src/transport/transport-testing2.h
rename to src/service/transport/transport-testing2.h
diff --git a/src/transport/transport.conf.in
b/src/service/transport/transport.conf.in
similarity index 100%
rename from src/transport/transport.conf.in
rename to src/service/transport/transport.conf.in
diff --git a/src/transport/transport.h b/src/service/transport/transport.h
similarity index 100%
rename from src/transport/transport.h
rename to src/service/transport/transport.h
diff --git a/src/transport/transport_api2_application.c
b/src/service/transport/transport_api2_application.c
similarity index 100%
rename from src/transport/transport_api2_application.c
rename to src/service/transport/transport_api2_application.c
diff --git a/src/transport/transport_api2_communication.c
b/src/service/transport/transport_api2_communication.c
similarity index 100%
rename from src/transport/transport_api2_communication.c
rename to src/service/transport/transport_api2_communication.c
diff --git a/src/transport/transport_api2_core.c
b/src/service/transport/transport_api2_core.c
similarity index 100%
rename from src/transport/transport_api2_core.c
rename to src/service/transport/transport_api2_core.c
diff --git a/src/transport/transport_api2_monitor.c
b/src/service/transport/transport_api2_monitor.c
similarity index 100%
rename from src/transport/transport_api2_monitor.c
rename to src/service/transport/transport_api2_monitor.c
diff --git a/src/transport/transport_api_cmd_backchannel_check.c
b/src/service/transport/transport_api_cmd_backchannel_check.c
similarity index 100%
rename from src/transport/transport_api_cmd_backchannel_check.c
rename to src/service/transport/transport_api_cmd_backchannel_check.c
diff --git a/src/transport/transport_api_cmd_connecting_peers.c
b/src/service/transport/transport_api_cmd_connecting_peers.c
similarity index 100%
rename from src/transport/transport_api_cmd_connecting_peers.c
rename to src/service/transport/transport_api_cmd_connecting_peers.c
diff --git a/src/transport/transport_api_cmd_send_simple.c
b/src/service/transport/transport_api_cmd_send_simple.c
similarity index 100%
rename from src/transport/transport_api_cmd_send_simple.c
rename to src/service/transport/transport_api_cmd_send_simple.c
diff --git a/src/transport/transport_api_cmd_send_simple_performance.c
b/src/service/transport/transport_api_cmd_send_simple_performance.c
similarity index 100%
rename from src/transport/transport_api_cmd_send_simple_performance.c
rename to src/service/transport/transport_api_cmd_send_simple_performance.c
diff --git a/src/transport/transport_api_cmd_start_peer.c
b/src/service/transport/transport_api_cmd_start_peer.c
similarity index 100%
rename from src/transport/transport_api_cmd_start_peer.c
rename to src/service/transport/transport_api_cmd_start_peer.c
diff --git a/src/transport/transport_api_cmd_stop_peer.c
b/src/service/transport/transport_api_cmd_stop_peer.c
similarity index 100%
rename from src/transport/transport_api_cmd_stop_peer.c
rename to src/service/transport/transport_api_cmd_stop_peer.c
diff --git a/src/transport/transport_api_traits.c
b/src/service/transport/transport_api_traits.c
similarity index 100%
rename from src/transport/transport_api_traits.c
rename to src/service/transport/transport_api_traits.c
diff --git a/src/transport/upnp.sh b/src/service/transport/upnp.sh
similarity index 100%
rename from src/transport/upnp.sh
rename to src/service/transport/upnp.sh
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index d8c47f45d..150da06e0 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -28,9 +28,9 @@ gnunet_set_profiler_SOURCES = \
gnunet-set-profiler.c
gnunet_set_profiler_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
libgnunetset.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(GN_LIBINTL)
@@ -50,7 +50,7 @@ gnunet_service_set_SOURCES = \
gnunet-service-set_protocol.h
gnunet_service_set_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
@@ -80,28 +80,28 @@ test_set_api_SOURCES = \
test_set_api.c
test_set_api_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetset.la
test_set_union_result_symmetric_SOURCES = \
test_set_union_result_symmetric.c
test_set_union_result_symmetric_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetset.la
test_set_intersection_result_full_SOURCES = \
test_set_intersection_result_full.c
test_set_intersection_result_full_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetset.la
test_set_union_copy_SOURCES = \
test_set_union_copy.c
test_set_union_copy_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetset.la
plugin_LTLIBRARIES = \
diff --git a/src/seti/Makefile.am b/src/seti/Makefile.am
index 96adf377d..46e200516 100644
--- a/src/seti/Makefile.am
+++ b/src/seti/Makefile.am
@@ -27,9 +27,9 @@ gnunet_seti_profiler_SOURCES = \
gnunet-seti-profiler.c
gnunet_seti_profiler_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
libgnunetseti.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(GN_LIBINTL)
@@ -38,7 +38,7 @@ gnunet_service_seti_SOURCES = \
gnunet-service-seti_protocol.h
gnunet_service_seti_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
@@ -65,7 +65,7 @@ test_seti_api_SOURCES = \
test_seti_api.c
test_seti_api_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetseti.la
plugin_LTLIBRARIES = \
diff --git a/src/setu/Makefile.am b/src/setu/Makefile.am
index 3ecd8f32a..f826c9e2a 100644
--- a/src/setu/Makefile.am
+++ b/src/setu/Makefile.am
@@ -28,9 +28,9 @@ gnunet_setu_profiler_SOURCES = \
gnunet-setu-profiler.c
gnunet_setu_profiler_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
libgnunetsetu.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
$(GN_LIBINTL)
@@ -48,7 +48,7 @@ gnunet_service_setu_SOURCES = \
gnunet-service-setu_protocol.h
gnunet_service_setu_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
@@ -76,7 +76,7 @@ test_setu_api_SOURCES = \
test_setu_api.c
test_setu_api_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetsetu.la
@@ -84,7 +84,7 @@ perf_setu_api_SOURCES = \
perf_setu_api.c
perf_setu_api_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetsetu.la
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
index 620d51d9a..7f5ad1893 100644
--- a/src/topology/Makefile.am
+++ b/src/topology/Makefile.am
@@ -20,9 +20,9 @@ gnunet_daemon_topology_SOURCES = \
gnunet-daemon-topology.c
gnunet_daemon_topology_LDADD = \
$(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/transport/libgnunettransportapplication.la \
+ $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -40,7 +40,7 @@ test_gnunet_daemon_topology_SOURCES = \
test_gnunet_daemon_topology.c
test_gnunet_daemon_topology_LDADD = \
$(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
EXTRA_DIST = \
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 38a7e8b3f..2f102a3fd 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -39,7 +39,7 @@ gnunet_helper_vpn_LDADD = \
gnunet_service_vpn_SOURCES = \
gnunet-service-vpn.c
gnunet_service_vpn_LDADD = \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/regex/libgnunetregex.la \
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am
index b5fcb9d7b..5c10827b8 100644
--- a/src/zonemaster/Makefile.am
+++ b/src/zonemaster/Makefile.am
@@ -24,7 +24,7 @@ gnunet_service_zonemaster_LDADD = \
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/namecache/libgnunetnamecache.la \
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.