[gnunet] 02/03: BUILD: Move exit/pt 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 858647ab4b2465430800689bda2c2837601c48d1
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 11:59:19 2023 +0200

    BUILD: Move exit/pt to service
---
 configure.ac                                | 4 ++--
 po/POTFILES.in                              | 6 +++---
 src/Makefile.am                             | 2 --
 src/service/Makefile.am                     | 4 +++-
 src/{ => service}/exit/.gitignore           | 0
 src/{ => service}/exit/Makefile.am          | 0
 src/{ => service}/exit/exit.conf            | 0
 src/{ => service}/exit/exit.h               | 0
 src/{ => service}/exit/gnunet-daemon-exit.c | 0
 src/{ => service}/exit/gnunet-helper-exit.c | 0
 src/{ => service}/exit/meson.build          | 0
 src/{ => service}/pt/.gitignore             | 0
 src/{ => service}/pt/Makefile.am            | 0
 src/{ => service}/pt/gnunet-daemon-pt.c     | 0
 src/{ => service}/pt/meson.build            | 0
 src/{ => service}/pt/pt.conf                | 0
 src/{ => service}/pt/test_gns_vpn.c         | 0
 src/{ => service}/pt/test_gns_vpn.conf      | 0
 src/{ => service}/pt/test_gnunet_vpn.c      | 0
 src/{ => service}/pt/test_gnunet_vpn.conf   | 0
 src/service/vpn/Makefile.am                 | 2 +-
 21 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index f97bd7a48..a792b0290 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1260,6 +1260,7 @@ src/service/dht/Makefile
 src/service/dht/dht.conf
 src/service/dns/Makefile
 src/service/dns/dns.conf
+src/service/exit/Makefile
 src/service/fs/Makefile
 src/service/fs/fs.conf
 src/service/gns/Makefile
@@ -1280,6 +1281,7 @@ src/service/nse/Makefile
 src/service/nse/nse.conf
 src/service/peerstore/Makefile
 src/service/peerstore/peerstore.conf
+src/service/pt/Makefile
 src/service/regex/Makefile
 src/service/regex/regex.conf
 src/service/rest/Makefile
@@ -1340,11 +1342,9 @@ src/contrib/service/rps/Makefile
 src/contrib/service/rps/rps.conf
 src/contrib/service/template/Makefile
 src/contrib/cli/template/Makefile
-src/exit/Makefile
 src/lib/hello/Makefile
 src/include/Makefile
 src/include/gnunet_config.h
-src/pt/Makefile
 src/reclaim/Makefile
 src/messenger/Makefile
 src/messenger/messenger.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b16ab69bc..3e96e599d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -98,8 +98,6 @@ src/contrib/service/set/ibf_sim.c
 src/contrib/service/set/plugin_block_set_test.c
 src/contrib/service/set/set_api.c
 src/contrib/service/template/gnunet-service-template.c
-src/exit/gnunet-daemon-exit.c
-src/exit/gnunet-helper-exit.c
 src/gana/gnunet-error-codes/gnunet_error_codes.c
 src/lib/block/bg_bf.c
 src/lib/block/block.c
@@ -253,7 +251,6 @@ src/plugin/namestore/plugin_namestore_postgres.c
 src/plugin/namestore/plugin_namestore_sqlite.c
 src/plugin/namestore/plugin_rest_namestore.c
 src/plugin/revocation/plugin_block_revocation.c
-src/pt/gnunet-daemon-pt.c
 src/reclaim/did_core.c
 src/reclaim/did_helper.c
 src/reclaim/did_misc.c
@@ -334,6 +331,8 @@ src/service/dns/gnunet-helper-dns.c
 src/service/dns/gnunet-service-dns.c
 src/service/dns/gnunet-zonewalk.c
 src/service/dns/plugin_block_dns.c
+src/service/exit/gnunet-daemon-exit.c
+src/service/exit/gnunet-helper-exit.c
 src/service/fs/fs_api.c
 src/service/fs/fs_directory.c
 src/service/fs/fs_dirmetascan.c
@@ -413,6 +412,7 @@ 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/pt/gnunet-daemon-pt.c
 src/service/regex/gnunet-daemon-regexprofiler.c
 src/service/regex/gnunet-regex-profiler.c
 src/service/regex/gnunet-regex-simulation-profiler.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 3631ff970..b30ae47f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,5 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  exit \
-  pt \
   reclaim \
   messenger
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index ff17f89a2..9b39208de 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -27,5 +27,7 @@ SUBDIRS = \
        vpn \
   gns \
   zonemaster \
-       fs
+       fs \
+       exit \
+       pt
 
diff --git a/src/exit/.gitignore b/src/service/exit/.gitignore
similarity index 100%
rename from src/exit/.gitignore
rename to src/service/exit/.gitignore
diff --git a/src/exit/Makefile.am b/src/service/exit/Makefile.am
similarity index 100%
rename from src/exit/Makefile.am
rename to src/service/exit/Makefile.am
diff --git a/src/exit/exit.conf b/src/service/exit/exit.conf
similarity index 100%
rename from src/exit/exit.conf
rename to src/service/exit/exit.conf
diff --git a/src/exit/exit.h b/src/service/exit/exit.h
similarity index 100%
rename from src/exit/exit.h
rename to src/service/exit/exit.h
diff --git a/src/exit/gnunet-daemon-exit.c 
b/src/service/exit/gnunet-daemon-exit.c
similarity index 100%
rename from src/exit/gnunet-daemon-exit.c
rename to src/service/exit/gnunet-daemon-exit.c
diff --git a/src/exit/gnunet-helper-exit.c 
b/src/service/exit/gnunet-helper-exit.c
similarity index 100%
rename from src/exit/gnunet-helper-exit.c
rename to src/service/exit/gnunet-helper-exit.c
diff --git a/src/exit/meson.build b/src/service/exit/meson.build
similarity index 100%
rename from src/exit/meson.build
rename to src/service/exit/meson.build
diff --git a/src/pt/.gitignore b/src/service/pt/.gitignore
similarity index 100%
rename from src/pt/.gitignore
rename to src/service/pt/.gitignore
diff --git a/src/pt/Makefile.am b/src/service/pt/Makefile.am
similarity index 100%
rename from src/pt/Makefile.am
rename to src/service/pt/Makefile.am
diff --git a/src/pt/gnunet-daemon-pt.c b/src/service/pt/gnunet-daemon-pt.c
similarity index 100%
rename from src/pt/gnunet-daemon-pt.c
rename to src/service/pt/gnunet-daemon-pt.c
diff --git a/src/pt/meson.build b/src/service/pt/meson.build
similarity index 100%
rename from src/pt/meson.build
rename to src/service/pt/meson.build
diff --git a/src/pt/pt.conf b/src/service/pt/pt.conf
similarity index 100%
rename from src/pt/pt.conf
rename to src/service/pt/pt.conf
diff --git a/src/pt/test_gns_vpn.c b/src/service/pt/test_gns_vpn.c
similarity index 100%
rename from src/pt/test_gns_vpn.c
rename to src/service/pt/test_gns_vpn.c
diff --git a/src/pt/test_gns_vpn.conf b/src/service/pt/test_gns_vpn.conf
similarity index 100%
rename from src/pt/test_gns_vpn.conf
rename to src/service/pt/test_gns_vpn.conf
diff --git a/src/pt/test_gnunet_vpn.c b/src/service/pt/test_gnunet_vpn.c
similarity index 100%
rename from src/pt/test_gnunet_vpn.c
rename to src/service/pt/test_gnunet_vpn.c
diff --git a/src/pt/test_gnunet_vpn.conf b/src/service/pt/test_gnunet_vpn.conf
similarity index 100%
rename from src/pt/test_gnunet_vpn.conf
rename to src/service/pt/test_gnunet_vpn.conf
diff --git a/src/service/vpn/Makefile.am b/src/service/vpn/Makefile.am
index 123ec77de..af500a0b8 100644
--- a/src/service/vpn/Makefile.am
+++ b/src/service/vpn/Makefile.am
@@ -42,7 +42,7 @@ gnunet_service_vpn_LDADD = \
   $(top_builddir)/src/service/regex/libgnunetregex.la \
   $(GN_LIBINTL)
 gnunet_service_vpn_CFLAGS = \
-  -I$(top_srcdir)/src/exit $(CFLAGS)
+  -I$(top_srcdir)/src/service/exit $(CFLAGS)
 
 libgnunetvpn_la_SOURCES = \
  vpn_api.c vpn.h

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