[gnunet] 01/06: BUILD: Move template to service/cli

[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 210da375234283e18dc4d6699e0455deb7a3e96b
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 08:20:28 2023 +0200

    BUILD: Move template to service/cli
---
 configure.ac                                                 | 3 ++-
 po/POTFILES.in                                               | 5 ++---
 src/Makefile.am                                              | 1 -
 src/cli/nat/Makefile.am                                      | 2 +-
 src/{ => contrib/cli}/template/gnunet-template.c             | 0
 src/contrib/service/Makefile.am                              | 1 +
 src/{ => contrib/service}/template/.gitignore                | 0
 src/{ => contrib/service}/template/Makefile.am               | 7 -------
 src/{ => contrib/service}/template/gnunet-service-template.c | 0
 src/{ => contrib/service}/template/meson.build               | 0
 src/{ => contrib/service}/template/template.conf             | 0
 src/{ => contrib/service}/template/test_template_api.c       | 0
 12 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index cdcad80da..199081918 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1288,6 +1288,8 @@ src/contrib/service/abd/abd.conf
 src/contrib/service/auction/Makefile
 src/contrib/service/rps/Makefile
 src/contrib/service/rps/rps.conf
+src/contrib/service/template/Makefile
+src/contrib/cli/template/Makefile
 src/consensus/Makefile
 src/consensus/consensus.conf
 src/conversation/Makefile
@@ -1325,7 +1327,6 @@ src/seti/Makefile
 src/seti/seti.conf
 src/setu/Makefile
 src/setu/setu.conf
-src/template/Makefile
 src/topology/Makefile
 src/vpn/Makefile
 src/vpn/vpn.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c4d20c4ba..c58c36658 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,6 +23,7 @@ src/cli/util/gnunet-uri.c
 src/consensus/consensus_api.c
 src/consensus/gnunet-service-consensus.c
 src/consensus/plugin_block_consensus.c
+src/contrib/cli/template/gnunet-template.c
 src/contrib/service/abd/abd_api.c
 src/contrib/service/abd/abd_serialization.c
 src/contrib/service/abd/delegate_misc.c
@@ -44,6 +45,7 @@ src/contrib/service/rps/rps-sampler_client.c
 src/contrib/service/rps/rps-sampler_common.c
 src/contrib/service/rps/rps-test_util.c
 src/contrib/service/rps/rps_api.c
+src/contrib/service/template/gnunet-service-template.c
 src/conversation/conversation_api.c
 src/conversation/conversation_api_call.c
 src/conversation/gnunet-conversation-test.c
@@ -123,7 +125,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/hello/gnunet-hello.c
 src/hostlist/gnunet-daemon-hostlist.c
 src/hostlist/gnunet-daemon-hostlist_client.c
 src/hostlist/gnunet-daemon-hostlist_server.c
@@ -489,8 +490,6 @@ src/setu/ibf.c
 src/setu/ibf_sim.c
 src/setu/plugin_block_setu_test.c
 src/setu/setu_api.c
-src/template/gnunet-service-template.c
-src/template/gnunet-template.c
 src/test/dhtu/testing_dhtu_cmd_send.c
 src/test/testing/gnunet-cmds-helper.c
 src/test/testing/gnunet-testing.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 1fc0748c7..8e950ee68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,6 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  template \
   nat-auto \
   hostlist \
   topology \
diff --git a/src/cli/nat/Makefile.am b/src/cli/nat/Makefile.am
index 8c1a3109c..1bdd1a6be 100644
--- a/src/cli/nat/Makefile.am
+++ b/src/cli/nat/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = \
  gnunet-nat
 
 gnunet_nat_SOURCES = \
-  gnunet-nat.c nat.h
+  gnunet-nat.c
 gnunet_nat_LDADD = \
   $(top_builddir)/src/service/nat/libgnunetnatnew.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/template/gnunet-template.c 
b/src/contrib/cli/template/gnunet-template.c
similarity index 100%
rename from src/template/gnunet-template.c
rename to src/contrib/cli/template/gnunet-template.c
diff --git a/src/contrib/service/Makefile.am b/src/contrib/service/Makefile.am
index 25c3670d9..d7cb9946d 100644
--- a/src/contrib/service/Makefile.am
+++ b/src/contrib/service/Makefile.am
@@ -6,4 +6,5 @@ if HAVE_EXPERIMENTAL
 endif
 
 SUBDIRS = \
+       template \
        $(EXP_DIR)
diff --git a/src/template/.gitignore b/src/contrib/service/template/.gitignore
similarity index 100%
rename from src/template/.gitignore
rename to src/contrib/service/template/.gitignore
diff --git a/src/template/Makefile.am b/src/contrib/service/template/Makefile.am
similarity index 86%
rename from src/template/Makefile.am
rename to src/contrib/service/template/Makefile.am
index 8db34b330..4661266d7 100644
--- a/src/template/Makefile.am
+++ b/src/contrib/service/template/Makefile.am
@@ -17,16 +17,9 @@ endif
 # libexec_PROGRAMS should be used for gnunet-service-template
 
 noinst_PROGRAMS = \
- gnunet-template \
  gnunet-service-template
 
 
-gnunet_template_SOURCES = \
- gnunet-template.c
-gnunet_template_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
 gnunet_service_template_SOURCES = \
  gnunet-service-template.c
 gnunet_service_template_LDADD = \
diff --git a/src/template/gnunet-service-template.c 
b/src/contrib/service/template/gnunet-service-template.c
similarity index 100%
rename from src/template/gnunet-service-template.c
rename to src/contrib/service/template/gnunet-service-template.c
diff --git a/src/template/meson.build b/src/contrib/service/template/meson.build
similarity index 100%
rename from src/template/meson.build
rename to src/contrib/service/template/meson.build
diff --git a/src/template/template.conf 
b/src/contrib/service/template/template.conf
similarity index 100%
rename from src/template/template.conf
rename to src/contrib/service/template/template.conf
diff --git a/src/template/test_template_api.c 
b/src/contrib/service/template/test_template_api.c
similarity index 100%
rename from src/template/test_template_api.c
rename to src/contrib/service/template/test_template_api.c

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