[gnunet] 04/06: BUILD: Move topology to service

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 5ae8ee063302cc6c1fc7b74328af46a11cb02cdc
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 08:53:27 2023 +0200

    BUILD: Move topology to service
---
 configure.ac                                                |   4 ++--
 po/POTFILES.in                                              |   8 ++++----
 src/Makefile.am                                             |   2 --
 src/service/Makefile.am                                     |   2 ++
 src/{ => service}/hostlist/.gitignore                       |   0
 src/{ => service}/hostlist/Makefile.am                      |   0
 src/{ => service}/hostlist/gnunet-daemon-hostlist.c         |   0
 src/{ => service}/hostlist/gnunet-daemon-hostlist.h         |   0
 src/{ => service}/hostlist/gnunet-daemon-hostlist_client.c  |   0
 src/{ => service}/hostlist/gnunet-daemon-hostlist_client.h  |   0
 src/{ => service}/hostlist/gnunet-daemon-hostlist_server.c  |   0
 src/{ => service}/hostlist/gnunet-daemon-hostlist_server.h  |   0
 src/{ => service}/hostlist/hostlist.conf                    |   0
 src/{ => service}/hostlist/hostlists_learn_peer2.file       | Bin
 src/{ => service}/hostlist/learning_data.conf               |   0
 src/{ => service}/hostlist/meson.build                      |   0
 src/{ => service}/hostlist/test_gnunet_daemon_hostlist.c    |   0
 .../hostlist/test_gnunet_daemon_hostlist_data.conf          |   0
 .../hostlist/test_gnunet_daemon_hostlist_learning.c         |   0
 .../hostlist/test_gnunet_daemon_hostlist_peer1.conf         |   0
 .../hostlist/test_gnunet_daemon_hostlist_peer2.conf         |   0
 .../hostlist/test_gnunet_daemon_hostlist_reconnect.c        |   0
 src/{ => service}/hostlist/test_hostlist_defaults.conf      |   0
 src/{ => service}/hostlist/test_learning_adv_peer.conf      |   0
 src/{ => service}/hostlist/test_learning_learn_peer.conf    |   0
 src/{ => service}/hostlist/test_learning_learn_peer2.conf   |   0
 src/{ => service}/topology/.gitignore                       |   0
 src/{ => service}/topology/Makefile.am                      |   0
 src/{ => service}/topology/gnunet-daemon-topology.c         |   0
 src/{ => service}/topology/meson.build                      |   0
 src/{ => service}/topology/test_gnunet_daemon_topology.c    |   0
 .../topology/test_gnunet_daemon_topology_data.conf          |   0
 src/{ => service}/topology/topology.conf                    |   0
 33 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3407ea68a..98ae7939c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1253,6 +1253,7 @@ src/service/datastore/Makefile
 src/service/datastore/datastore.conf
 src/service/dht/Makefile
 src/service/dht/dht.conf
+src/service/hostlist/Makefile
 src/service/identity/Makefile
 src/service/identity/identity.conf
 src/service/nat/Makefile
@@ -1267,6 +1268,7 @@ src/service/rest/Makefile
 src/service/statistics/Makefile
 src/service/statistics/statistics.conf
 src/service/testing/Makefile
+src/service/topology/Makefile
 src/service/transport/Makefile
 src/service/transport/transport.conf
 src/service/util/Makefile
@@ -1308,7 +1310,6 @@ src/gns/nss/Makefile
 src/lib/hello/Makefile
 src/include/Makefile
 src/include/gnunet_config.h
-src/hostlist/Makefile
 src/namecache/Makefile
 src/namecache/namecache.conf
 src/namestore/Makefile
@@ -1328,7 +1329,6 @@ src/seti/Makefile
 src/seti/seti.conf
 src/setu/Makefile
 src/setu/setu.conf
-src/topology/Makefile
 src/vpn/Makefile
 src/vpn/vpn.conf
 src/zonemaster/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1982dedd1..474504fc0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -127,9 +127,6 @@ src/gns/nss/nss_gns_query.c
 src/gns/plugin_block_gns.c
 src/gns/plugin_gnsrecord_gns.c
 src/gns/plugin_rest_gns.c
-src/hostlist/gnunet-daemon-hostlist.c
-src/hostlist/gnunet-daemon-hostlist_client.c
-src/hostlist/gnunet-daemon-hostlist_server.c
 src/lib/block/bg_bf.c
 src/lib/block/block.c
 src/lib/curl/curl.c
@@ -391,6 +388,9 @@ src/service/dht/gnunet-service-dht_neighbours.c
 src/service/dht/gnunet-service-dht_routing.c
 src/service/dht/gnunet_dht_profiler.c
 src/service/dht/plugin_block_dht.c
+src/service/hostlist/gnunet-daemon-hostlist.c
+src/service/hostlist/gnunet-daemon-hostlist_client.c
+src/service/hostlist/gnunet-daemon-hostlist_server.c
 src/service/identity/gnunet-service-identity.c
 src/service/identity/identity_api.c
 src/service/identity/identity_api_lookup.c
@@ -444,6 +444,7 @@ 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/topology/gnunet-daemon-topology.c
 src/service/transport/gnunet-communicator-quic.c
 src/service/transport/gnunet-communicator-tcp.c
 src/service/transport/gnunet-communicator-udp.c
@@ -513,7 +514,6 @@ src/test/testing/testing_api_cmd_system_create.c
 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/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 10af79519..da3cd2d5f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,6 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  hostlist \
-  topology \
   regex \
   dns \
   namecache \
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index f25006a37..6b4fa3264 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -9,6 +9,8 @@ SUBDIRS = \
        transport \
        core \
        nse \
+  hostlist \
+  topology \
        identity \
        rest \
        datacache \
diff --git a/src/hostlist/.gitignore b/src/service/hostlist/.gitignore
similarity index 100%
rename from src/hostlist/.gitignore
rename to src/service/hostlist/.gitignore
diff --git a/src/hostlist/Makefile.am b/src/service/hostlist/Makefile.am
similarity index 100%
rename from src/hostlist/Makefile.am
rename to src/service/hostlist/Makefile.am
diff --git a/src/hostlist/gnunet-daemon-hostlist.c 
b/src/service/hostlist/gnunet-daemon-hostlist.c
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist.c
rename to src/service/hostlist/gnunet-daemon-hostlist.c
diff --git a/src/hostlist/gnunet-daemon-hostlist.h 
b/src/service/hostlist/gnunet-daemon-hostlist.h
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist.h
rename to src/service/hostlist/gnunet-daemon-hostlist.h
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c 
b/src/service/hostlist/gnunet-daemon-hostlist_client.c
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist_client.c
rename to src/service/hostlist/gnunet-daemon-hostlist_client.c
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.h 
b/src/service/hostlist/gnunet-daemon-hostlist_client.h
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist_client.h
rename to src/service/hostlist/gnunet-daemon-hostlist_client.h
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c 
b/src/service/hostlist/gnunet-daemon-hostlist_server.c
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist_server.c
rename to src/service/hostlist/gnunet-daemon-hostlist_server.c
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.h 
b/src/service/hostlist/gnunet-daemon-hostlist_server.h
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist_server.h
rename to src/service/hostlist/gnunet-daemon-hostlist_server.h
diff --git a/src/hostlist/hostlist.conf b/src/service/hostlist/hostlist.conf
similarity index 100%
rename from src/hostlist/hostlist.conf
rename to src/service/hostlist/hostlist.conf
diff --git a/src/hostlist/hostlists_learn_peer2.file 
b/src/service/hostlist/hostlists_learn_peer2.file
similarity index 100%
rename from src/hostlist/hostlists_learn_peer2.file
rename to src/service/hostlist/hostlists_learn_peer2.file
diff --git a/src/hostlist/learning_data.conf 
b/src/service/hostlist/learning_data.conf
similarity index 100%
rename from src/hostlist/learning_data.conf
rename to src/service/hostlist/learning_data.conf
diff --git a/src/hostlist/meson.build b/src/service/hostlist/meson.build
similarity index 100%
rename from src/hostlist/meson.build
rename to src/service/hostlist/meson.build
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c 
b/src/service/hostlist/test_gnunet_daemon_hostlist.c
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist.c
rename to src/service/hostlist/test_gnunet_daemon_hostlist.c
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf 
b/src/service/hostlist/test_gnunet_daemon_hostlist_data.conf
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist_data.conf
rename to src/service/hostlist/test_gnunet_daemon_hostlist_data.conf
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c 
b/src/service/hostlist/test_gnunet_daemon_hostlist_learning.c
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist_learning.c
rename to src/service/hostlist/test_gnunet_daemon_hostlist_learning.c
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 
b/src/service/hostlist/test_gnunet_daemon_hostlist_peer1.conf
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
rename to src/service/hostlist/test_gnunet_daemon_hostlist_peer1.conf
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf 
b/src/service/hostlist/test_gnunet_daemon_hostlist_peer2.conf
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
rename to src/service/hostlist/test_gnunet_daemon_hostlist_peer2.conf
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c 
b/src/service/hostlist/test_gnunet_daemon_hostlist_reconnect.c
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
rename to src/service/hostlist/test_gnunet_daemon_hostlist_reconnect.c
diff --git a/src/hostlist/test_hostlist_defaults.conf 
b/src/service/hostlist/test_hostlist_defaults.conf
similarity index 100%
rename from src/hostlist/test_hostlist_defaults.conf
rename to src/service/hostlist/test_hostlist_defaults.conf
diff --git a/src/hostlist/test_learning_adv_peer.conf 
b/src/service/hostlist/test_learning_adv_peer.conf
similarity index 100%
rename from src/hostlist/test_learning_adv_peer.conf
rename to src/service/hostlist/test_learning_adv_peer.conf
diff --git a/src/hostlist/test_learning_learn_peer.conf 
b/src/service/hostlist/test_learning_learn_peer.conf
similarity index 100%
rename from src/hostlist/test_learning_learn_peer.conf
rename to src/service/hostlist/test_learning_learn_peer.conf
diff --git a/src/hostlist/test_learning_learn_peer2.conf 
b/src/service/hostlist/test_learning_learn_peer2.conf
similarity index 100%
rename from src/hostlist/test_learning_learn_peer2.conf
rename to src/service/hostlist/test_learning_learn_peer2.conf
diff --git a/src/topology/.gitignore b/src/service/topology/.gitignore
similarity index 100%
rename from src/topology/.gitignore
rename to src/service/topology/.gitignore
diff --git a/src/topology/Makefile.am b/src/service/topology/Makefile.am
similarity index 100%
rename from src/topology/Makefile.am
rename to src/service/topology/Makefile.am
diff --git a/src/topology/gnunet-daemon-topology.c 
b/src/service/topology/gnunet-daemon-topology.c
similarity index 100%
rename from src/topology/gnunet-daemon-topology.c
rename to src/service/topology/gnunet-daemon-topology.c
diff --git a/src/topology/meson.build b/src/service/topology/meson.build
similarity index 100%
rename from src/topology/meson.build
rename to src/service/topology/meson.build
diff --git a/src/topology/test_gnunet_daemon_topology.c 
b/src/service/topology/test_gnunet_daemon_topology.c
similarity index 100%
rename from src/topology/test_gnunet_daemon_topology.c
rename to src/service/topology/test_gnunet_daemon_topology.c
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf 
b/src/service/topology/test_gnunet_daemon_topology_data.conf
similarity index 100%
rename from src/topology/test_gnunet_daemon_topology_data.conf
rename to src/service/topology/test_gnunet_daemon_topology_data.conf
diff --git a/src/topology/topology.conf b/src/service/topology/topology.conf
similarity index 100%
rename from src/topology/topology.conf
rename to src/service/topology/topology.conf

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.