[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 10/10: BUILD: Move identity/rest components to service/rest-plu
|
From: |
gnunet |
|
Subject: |
[gnunet] 10/10: BUILD: Move identity/rest components to service/rest-plugin |
|
Date: |
Wed, 18 Oct 2023 15:15:58 +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 65dbd214b80664872f6514fdd663a30e405a6ad6
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 18 15:15:05 2023 +0200
BUILD: Move identity/rest components to service/rest-plugin
---
configure.ac | 9 ++-
po/POTFILES.in | 20 ++---
src/Makefile.am | 6 +-
src/cli/identity/Makefile.am | 36 +++++++++
src/{ => cli}/identity/gnunet-identity.c | 0
src/contrib/service/abd/Makefile.am | 8 +-
src/conversation/Makefile.am | 12 +--
src/fs/Makefile.am | 2 +-
src/gns/Makefile.am | 24 +++---
src/messenger/Makefile.am | 4 +-
src/namecache/Makefile.am | 14 ++--
src/namestore/Makefile.am | 86 +++++++++++-----------
src/pt/Makefile.am | 2 +-
src/reclaim/Makefile.am | 24 +++---
src/rest-plugin/Makefile.am | 3 +
src/rest-plugin/identity/Makefile.am | 26 +++++++
.../identity/plugin_rest_identity.c | 2 +-
src/{ => rest-plugin}/rest/Makefile.am | 35 +--------
src/{ => rest-plugin}/rest/plugin_rest_config.c | 0
src/{ => rest-plugin}/rest/plugin_rest_copying.c | 0
src/revocation/Makefile.am | 14 ++--
src/service/Makefile.am | 4 +-
src/{ => service}/identity/.gitignore | 0
src/{ => service}/identity/Makefile.am | 28 -------
.../identity/gnunet-service-identity.c | 0
src/{ => service}/identity/identity.conf.in | 0
src/{ => service}/identity/identity.h | 0
src/{ => service}/identity/identity_api.c | 0
src/{ => service}/identity/identity_api_lookup.c | 0
.../identity/identity_api_suffix_lookup.c | 0
src/{ => service}/identity/meson.build | 0
src/{ => service}/identity/test_identity.c | 0
src/{ => service}/identity/test_identity.conf | 0
.../identity/test_identity_messages.sh | 0
.../identity/test_plugin_rest_identity.sh | 0
.../test_plugin_rest_identity_signature.sh | 0
src/{ => service}/rest/.gitignore | 0
src/{ => service}/rest/Makefile.am | 26 -------
src/{ => service}/rest/gnunet-rest-server.c | 0
src/{ => service}/rest/meson.build | 0
src/{ => service}/rest/rest.c | 0
src/{ => service}/rest/rest.conf | 0
src/zonemaster/Makefile.am | 2 +-
43 files changed, 184 insertions(+), 203 deletions(-)
diff --git a/configure.ac b/configure.ac
index d977b94e3..251e35ed6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1247,7 +1247,13 @@ src/service/arm/Makefile
src/service/arm/arm.conf
src/service/core/Makefile
src/service/core/core.conf
+src/service/identity/Makefile
+src/service/identity/identity.conf
+src/service/rest/Makefile
src/service/util/Makefile
+src/rest-plugin/Makefile
+src/rest-plugin/identity/Makefile
+src/rest-plugin/rest/Makefile
src/cli/Makefile
src/cli/arm/Makefile
src/cli/core/Makefile
@@ -1279,8 +1285,6 @@ src/gns/Makefile
src/gns/gns.conf
src/gns/nss/Makefile
src/lib/hello/Makefile
-src/identity/Makefile
-src/identity/identity.conf
src/include/Makefile
src/include/gnunet_config.h
src/hostlist/Makefile
@@ -1321,7 +1325,6 @@ src/vpn/Makefile
src/vpn/vpn.conf
src/zonemaster/Makefile
src/zonemaster/zonemaster.conf
-src/rest/Makefile
src/reclaim/Makefile
src/messenger/Makefile
src/messenger/messenger.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 72036df8c..7ae79a60d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,6 +19,7 @@ src/cadet/gnunet-service-cadet_peer.c
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/util/gnunet-base32.c
src/cli/util/gnunet-config-diff.c
src/cli/util/gnunet-config.c
@@ -160,12 +161,6 @@ 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/identity/gnunet-identity.c
-src/identity/gnunet-service-identity.c
-src/identity/identity_api.c
-src/identity/identity_api_lookup.c
-src/identity/identity_api_suffix_lookup.c
-src/identity/plugin_rest_identity.c
src/lib/block/bg_bf.c
src/lib/block/block.c
src/lib/curl/curl.c
@@ -408,10 +403,9 @@ src/regex/regex_internal_dht.c
src/regex/regex_test_graph.c
src/regex/regex_test_lib.c
src/regex/regex_test_random.c
-src/rest/gnunet-rest-server.c
-src/rest/plugin_rest_config.c
-src/rest/plugin_rest_copying.c
-src/rest/rest.c
+src/rest-plugin/identity/plugin_rest_identity.c
+src/rest-plugin/rest/plugin_rest_config.c
+src/rest-plugin/rest/plugin_rest_copying.c
src/revocation/gnunet-revocation-tvg.c
src/revocation/gnunet-revocation.c
src/revocation/gnunet-service-revocation.c
@@ -438,6 +432,12 @@ src/service/core/gnunet-service-core.c
src/service/core/gnunet-service-core_kx.c
src/service/core/gnunet-service-core_sessions.c
src/service/core/gnunet-service-core_typemap.c
+src/service/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/rest/gnunet-rest-server.c
+src/service/rest/rest.c
src/service/util/gnunet-service-resolver.c
src/set/gnunet-service-set.c
src/set/gnunet-service-set_intersection.c
diff --git a/src/Makefile.am b/src/Makefile.am
index cf40834b6..757d2c1c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,18 +9,15 @@ CONVERSATION_DIR = conversation
endif
endif
-REST_DIR = rest
-
-
SUBDIRS = \
include $(INTLEMU_SUBDIRS) \
lib \
plugin \
service \
+ rest-plugin \
cli \
contrib \
statistics \
- $(REST_DIR) \
datacache \
datastore \
template \
@@ -34,7 +31,6 @@ SUBDIRS = \
topology \
regex \
dns \
- identity \
namecache \
namestore \
cadet \
diff --git a/src/cli/identity/Makefile.am b/src/cli/identity/Makefile.am
new file mode 100644
index 000000000..be2c2f1c6
--- /dev/null
+++ b/src/cli/identity/Makefile.am
@@ -0,0 +1,36 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+bin_PROGRAMS = \
+ gnunet-identity
+
+gnunet_identity_SOURCES = \
+ gnunet-identity.c
+gnunet_identity_LDADD = \
+ $(top_builddir)/src/service/libgnunetidentity.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+check_SCRIPTS = \
+ test_identity_messages.sh
+
+# if ENABLE_TEST_RUN
+# AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
+# TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+# endif
+
+
+EXTRA_DIST = \
+ test_identity_messages.sh
+
+
diff --git a/src/identity/gnunet-identity.c b/src/cli/identity/gnunet-identity.c
similarity index 100%
rename from src/identity/gnunet-identity.c
rename to src/cli/identity/gnunet-identity.c
diff --git a/src/contrib/service/abd/Makefile.am
b/src/contrib/service/abd/Makefile.am
index 6fa2dc848..669c00d19 100644
--- a/src/contrib/service/abd/Makefile.am
+++ b/src/contrib/service/abd/Makefile.am
@@ -43,7 +43,7 @@ gnunet_abd_LDADD = \
libgnunetabd.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(GN_LIBINTL)
@@ -53,7 +53,7 @@ libgnunet_plugin_gnsrecord_abd_la_SOURCES = \
libgnunet_plugin_gnsrecord_abd_la_LIBADD = \
libgnunetabd.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(LTLIBINTL)
libgnunet_plugin_gnsrecord_abd_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
@@ -67,7 +67,7 @@ gnunet_service_abd_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/gns/libgnunetgns.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(GN_LIBINTL)
@@ -80,7 +80,7 @@ libgnunetabd_la_SOURCES = \
delegate_misc.h
libgnunetabd_la_LIBADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(XLIB)
libgnunetabd_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 744280af0..5aa79a0e0 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -72,7 +72,7 @@ libgnunetconversation_la_LIBADD = \
$(top_builddir)/src/gns/libgnunetgns.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
libgnunetconversation_la_LDFLAGS = \
@@ -185,7 +185,7 @@ gnunet_service_conversation_LDADD = \
libgnunetmicrophone.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(INTLLIBS)
#gnunet_service_conversation_LDFLAGS = \
#
@@ -199,7 +199,7 @@ gnunet_conversation_LDADD = \
$(top_builddir)/src/gns/libgnunetgns.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(INTLLIBS)
#gnunet_conversation_LDFLAGS = \
@@ -224,7 +224,7 @@ test_conversation_api_LDADD = \
libgnunetmicrophone.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_conversation_api_LDFLAGS = \
@@ -238,7 +238,7 @@ test_conversation_api_twocalls_LDADD = \
libgnunetmicrophone.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_conversation_api_twocalls_LDFLAGS = \
@@ -252,7 +252,7 @@ test_conversation_api_reject_LDADD = \
libgnunetmicrophone.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_conversation_api_reject_LDFLAGS = \
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index e61d2724e..b6083ea06 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -107,7 +107,7 @@ gnunet_download_LDADD = \
gnunet_publish_SOURCES = \
gnunet-publish.c
gnunet_publish_LDADD = \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetfs.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index e50cf4281..191103088 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -87,8 +87,8 @@ libgnunet_plugin_rest_gns_la_LIBADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \
libgnunetgns.la \
- $(top_builddir)/src/rest/libgnunetrest.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/json/libgnunetjson.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
$(LTLIBINTL) -ljansson $(MHD_LIBS)
@@ -101,7 +101,7 @@ libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
plugin_gnsrecord_gns.c
libgnunet_plugin_gnsrecord_gns_la_LIBADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(LTLIBINTL)
libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \
@@ -113,7 +113,7 @@ gnunet_gns_SOURCES = \
gnunet_gns_LDADD = \
libgnunetgns.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(LIBIDN) $(LIBIDN2) \
$(GN_LIBINTL)
@@ -123,7 +123,7 @@ gnunet_gns_benchmark_SOURCES = \
gnunet_gns_benchmark_LDADD = \
libgnunetgns.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -132,7 +132,7 @@ gnunet_bcd_SOURCES = \
gnunet-bcd.c
gnunet_bcd_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(GN_LIBINTL) $(MHD_LIBS)
gnunet_bcd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
@@ -144,7 +144,7 @@ gnunet_dns2gns_LDADD = \
libgnunetgns.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(USE_VPN) \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(GN_LIBINTL)
if HAVE_SUDO
@@ -167,7 +167,7 @@ gnunet_gns_proxy_SOURCES = \
gnunet-gns-proxy.c
gnunet_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \
libgnunetgns.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
if HAVE_GNUTLS_DANE
@@ -185,7 +185,7 @@ test_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@
$(AM_CFLAGS)
#gnunet_gns_import_SOURCES = \
# gnunet-gns-import.c
#gnunet_gns_import_LDADD = \
-# $(top_builddir)/src/identity/libgnunetidentity.la \
+# $(top_builddir)/src/service/identity/libgnunetidentity.la \
# $(top_builddir)/src/namestore/libgnunetnamestore.la \
# $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
# $(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -199,7 +199,7 @@ gnunet_service_gns_SOURCES = \
gnunet_service_gns_LDADD = \
-lm \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/revocation/libgnunetrevocation.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -215,7 +215,7 @@ libgnunetgns_la_SOURCES = \
gns_tld_api.c gns.h
libgnunetgns_la_LIBADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la
libgnunetgns_la_LDFLAGS = \
$(GN_LIBINTL) \
@@ -228,7 +228,7 @@ libgnunet_plugin_block_gns_la_LIBADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
$(top_builddir)/src/lib/block/libgnunetblockgroup.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la
libgnunet_plugin_block_gns_la_LDFLAGS = \
$(GN_LIBINTL) \
diff --git a/src/messenger/Makefile.am b/src/messenger/Makefile.am
index a1228a7a1..d464261df 100644
--- a/src/messenger/Makefile.am
+++ b/src/messenger/Makefile.am
@@ -54,7 +54,7 @@ libgnunetmessenger_la_SOURCES = \
libgnunetmessenger_la_LIBADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(XLIB) \
$(LTLIBINTL)
libgnunetmessenger_la_LDFLAGS = \
@@ -94,7 +94,7 @@ gnunet_service_messenger_LDADD = \
libgnunetmessenger.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/cadet/libgnunetcadet.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(GN_LIBINTL)
check_PROGRAMS = test_messenger_anonymous
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index b4a0d68f5..9be5a4fce 100644
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -64,7 +64,7 @@ libgnunetnamecache_la_SOURCES = \
namecache.h
libgnunetnamecache_la_LIBADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
libgnunetnamecache_la_LDFLAGS = \
@@ -82,7 +82,7 @@ gnunet_namecache_SOURCES = \
gnunet-namecache.c
gnunet_namecache_LDADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamecache.la \
$(GN_LIBINTL)
@@ -92,7 +92,7 @@ gnunet_service_namecache_SOURCES = \
gnunet_service_namecache_LDADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamecache.la \
@@ -110,7 +110,7 @@ libgnunet_plugin_namecache_flat_la_LIBADD = \
libgnunetnamecache.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
$(LTLIBINTL)
libgnunet_plugin_namecache_flat_la_LDFLAGS = \
@@ -123,7 +123,7 @@ libgnunet_plugin_namecache_sqlite_la_LIBADD = \
$(top_builddir)/src/lib/sq/libgnunetsq.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
$(LTLIBINTL)
libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \
@@ -137,7 +137,7 @@ libgnunet_plugin_namecache_postgres_la_LIBADD = \
$(top_builddir)/src/lib/pq/libgnunetpq.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \
$(LTLIBINTL)
libgnunet_plugin_namecache_postgres_la_LDFLAGS = \
@@ -147,7 +147,7 @@ test_namecache_api_cache_block_SOURCES = \
test_namecache_api_cache_block.c
test_namecache_api_cache_block_LDADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamecache.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index c9833add5..2bdc25d56 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -108,8 +108,8 @@ libgnunet_plugin_rest_namestore_la_SOURCES = \
plugin_rest_namestore.c
libgnunet_plugin_rest_namestore_la_LIBADD = \
libgnunetnamestore.la \
- $(top_builddir)/src/rest/libgnunetrest.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/json/libgnunetjson.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \
@@ -126,7 +126,7 @@ libgnunetnamestore_la_SOURCES = \
namestore.h
libgnunetnamestore_la_LIBADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -138,7 +138,7 @@ gnunet_namestore_zonefile_SOURCES = \
gnunet-namestore-zonefile.c
gnunet_namestore_zonefile_LDADD = \
libgnunetnamestore.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -148,7 +148,7 @@ gnunet_zoneimport_SOURCES = \
gnunet_zoneimport_LDADD = \
libgnunetnamestore.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -156,7 +156,7 @@ gnunet_zoneimport_LDADD = \
gnunet_namestore_SOURCES = \
gnunet-namestore.c
gnunet_namestore_LDADD = \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamestore.la \
@@ -175,7 +175,7 @@ gnunet_namestore_fcfsd_SOURCES = \
gnunet-namestore-fcfsd.c
gnunet_namestore_fcfsd_LDADD = $(MHD_LIBS) \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/json/libgnunetjson.la \
@@ -188,7 +188,7 @@ gnunet_service_namestore_SOURCES = \
gnunet_service_namestore_LDADD = \
$(top_builddir)/src/namecache/libgnunetnamecache.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamestore.la \
@@ -200,7 +200,7 @@ libgnunet_plugin_namestore_sqlite_la_SOURCES = \
plugin_namestore_sqlite.c
libgnunet_plugin_namestore_sqlite_la_LIBADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/sq/libgnunetsq.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
@@ -212,7 +212,7 @@ libgnunet_plugin_namestore_postgres_la_SOURCES = \
plugin_namestore_postgres.c
libgnunet_plugin_namestore_postgres_la_LIBADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/pq/libgnunetpq.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \
@@ -226,7 +226,7 @@ test_namestore_api_store_sqlite_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la
test_namestore_api_store_postgres_SOURCES = \
@@ -235,7 +235,7 @@ test_namestore_api_store_postgres_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la
test_namestore_api_store_update_sqlite_SOURCES = \
@@ -243,7 +243,7 @@ test_namestore_api_store_update_sqlite_SOURCES = \
test_namestore_api_store_update_sqlite_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namecache/libgnunetnamecache.la \
libgnunetnamestore.la
@@ -253,7 +253,7 @@ test_namestore_api_store_update_postgres_SOURCES = \
test_namestore_api_store_update_postgres_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namecache/libgnunetnamecache.la \
libgnunetnamestore.la
@@ -263,7 +263,7 @@ test_namestore_api_lookup_nick_sqlite_SOURCES = \
test_namestore_api_lookup_nick_sqlite_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namecache/libgnunetnamecache.la \
libgnunetnamestore.la
@@ -273,7 +273,7 @@ test_namestore_api_lookup_nick_postgres_SOURCES = \
test_namestore_api_lookup_nick_postgres_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/namecache/libgnunetnamecache.la \
libgnunetnamestore.la
@@ -281,7 +281,7 @@ test_namestore_api_lookup_nick_postgres_LDADD = \
test_namestore_api_remove_sqlite_SOURCES = \
test_namestore_api_remove.c
test_namestore_api_remove_sqlite_LDADD = \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -290,7 +290,7 @@ test_namestore_api_remove_sqlite_LDADD = \
test_namestore_api_remove_postgres_SOURCES = \
test_namestore_api_remove.c
test_namestore_api_remove_postgres_LDADD = \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -301,7 +301,7 @@
test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \
test_namestore_api_remove_not_existing_record_sqlite_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -309,7 +309,7 @@
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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -317,7 +317,7 @@
test_namestore_api_remove_not_existing_record_postgres_LDADD = \
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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamestore.la
@@ -325,7 +325,7 @@ test_namestore_api_zone_to_name_sqlite_LDADD = \
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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetnamestore.la
@@ -333,7 +333,7 @@ test_namestore_api_zone_to_name_postgres_LDADD = \
test_namestore_api_monitoring_sqlite_SOURCES = \
test_namestore_api_monitoring.c
test_namestore_api_monitoring_sqlite_LDADD = \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -343,7 +343,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -352,7 +352,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -363,14 +363,14 @@ test_namestore_api_monitoring_existing_postgres_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -379,7 +379,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -389,7 +389,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetnamestore.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -399,7 +399,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -408,7 +408,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -418,7 +418,7 @@ perf_namestore_api_zone_iteration_postgres_SOURCES = \
perf_namestore_api_zone_iteration_postgres_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -427,7 +427,7 @@ perf_namestore_api_import_sqlite_SOURCES = \
perf_namestore_api_import_sqlite_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -436,7 +436,7 @@ perf_namestore_api_import_postgres_SOURCES = \
perf_namestore_api_import_postgres_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -445,7 +445,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -454,7 +454,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -463,7 +463,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -472,7 +472,7 @@
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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -481,7 +481,7 @@
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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -490,7 +490,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -499,7 +499,7 @@ 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/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
libgnunetnamestore.la
@@ -508,13 +508,13 @@ test_plugin_namestore_sqlite_SOURCES = \
test_plugin_namestore.c
test_plugin_namestore_sqlite_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
test_plugin_namestore_postgres_SOURCES = \
test_plugin_namestore.c
test_plugin_namestore_postgres_LDADD = \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 80772fc1b..f00d16a5c 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -54,7 +54,7 @@ test_gns_vpn_SOURCES = \
test_gns_vpn.c
test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/identity/libgnunetidentity.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/lib/util/libgnunetutil.la
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index a3bb58e23..e135f3534 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -58,11 +58,11 @@ libgnunet_plugin_rest_reclaim_la_SOURCES = \
json_reclaim.h \
json_reclaim.c
libgnunet_plugin_rest_reclaim_la_LIBADD = \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetreclaim.la \
$(top_builddir)/src/lib/json/libgnunetjson.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/rest/libgnunetrest.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
$(LTLIBINTL) -ljansson $(MHD_LIBS)
@@ -76,9 +76,9 @@ libgnunet_plugin_rest_openid_connect_la_SOURCES = \
oidc_helper.h \
oidc_helper.c
libgnunet_plugin_rest_openid_connect_la_LIBADD = \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetreclaim.la \
- $(top_builddir)/src/rest/libgnunetrest.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/gns/libgnunetgns.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -97,7 +97,7 @@ libgnunet_plugin_rest_pabc_la_SOURCES = \
libgnunet_plugin_rest_pabc_la_LIBADD = \
libgnunetreclaim.la \
$(top_builddir)/src/lib/json/libgnunetjson.la \
- $(top_builddir)/src/rest/libgnunetrest.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
$(LTLIBINTL) -ljansson -lpabc $(MHD_LIBS)
libgnunet_plugin_rest_pabc_la_LDFLAGS = \
@@ -121,7 +121,7 @@ gnunet_service_reclaim_SOURCES = \
gnunet-service-reclaim_tickets.h
gnunet_service_reclaim_LDADD = \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(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 \
@@ -138,7 +138,7 @@ libgnunetreclaim_la_SOURCES = \
reclaim_credential.h
libgnunetreclaim_la_LIBADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(GN_LIBINTL) $(XLIB)
libgnunetreclaim_la_LDFLAGS = \
$(GN_LIB_LDFLAGS) \
@@ -153,7 +153,7 @@ libgnunetdid_la_LIBADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/gns/libgnunetgns.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
-ljansson \
$(GN_LIBINTL) $(XLIB)
@@ -188,7 +188,7 @@ endif
libgnunet_plugin_reclaim_credential_jwt_la_SOURCES = \
plugin_reclaim_credential_jwt.c
libgnunet_plugin_reclaim_credential_jwt_la_LIBADD = \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
libgnunetreclaim.la \
-ljansson\
@@ -202,7 +202,7 @@ gnunet_reclaim_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
libgnunetreclaim.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(GN_LIBINTL)
test_reclaim_attribute_SOURCES = \
@@ -218,7 +218,7 @@ gnunet_did_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/gns/libgnunetgns.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
libgnunetdid.la \
-ljansson
@@ -230,7 +230,7 @@ test_did_helper_LDADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/gns/libgnunetgns.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
libgnunetdid.la \
-ljansson
diff --git a/src/rest-plugin/Makefile.am b/src/rest-plugin/Makefile.am
new file mode 100644
index 000000000..fb74b9f2e
--- /dev/null
+++ b/src/rest-plugin/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+ rest \
+ identity
diff --git a/src/rest-plugin/identity/Makefile.am
b/src/rest-plugin/identity/Makefile.am
new file mode 100644
index 000000000..bcad0c2dd
--- /dev/null
+++ b/src/rest-plugin/identity/Makefile.am
@@ -0,0 +1,26 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+libgnunet_plugin_rest_identity_la_SOURCES = \
+ plugin_rest_identity.c
+libgnunet_plugin_rest_identity_la_LIBADD = \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+ $(LTLIBINTL) -ljansson $(MHD_LIBS)
+libgnunet_plugin_rest_identity_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_identity_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
diff --git a/src/identity/plugin_rest_identity.c
b/src/rest-plugin/identity/plugin_rest_identity.c
similarity index 99%
rename from src/identity/plugin_rest_identity.c
rename to src/rest-plugin/identity/plugin_rest_identity.c
index cae0e4d95..e7b7f8a9c 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/rest-plugin/identity/plugin_rest_identity.c
@@ -28,7 +28,7 @@
#include "gnunet_rest_plugin.h"
#include "gnunet_identity_service.h"
#include "gnunet_rest_lib.h"
-#include "identity.h"
+#include "../../service/identity/identity.h"
#include "gnunet_util_lib.h"
#include "microhttpd.h"
#include <jansson.h>
diff --git a/src/rest/Makefile.am b/src/rest-plugin/rest/Makefile.am
similarity index 60%
copy from src/rest/Makefile.am
copy to src/rest-plugin/rest/Makefile.am
index e3952a45e..4f7f834fb 100644
--- a/src/rest/Makefile.am
+++ b/src/rest-plugin/rest/Makefile.am
@@ -7,31 +7,19 @@ pkgcfgdir= $(pkgdatadir)/config.d/
libexecdir= $(pkglibdir)/libexec/
-pkgcfg_DATA = \
- rest.conf
-
if USE_COVERAGE
AM_CFLAGS = --coverage -O0
XLIBS = -lgcov
endif
-lib_LTLIBRARIES = \
- libgnunetrest.la
-
-libexec_PROGRAMS = \
- gnunet-rest-server
-
plugin_LTLIBRARIES = \
libgnunet_plugin_rest_copying.la \
libgnunet_plugin_rest_config.la
-EXTRA_DIST = \
- rest.conf
-
libgnunet_plugin_rest_copying_la_SOURCES = \
plugin_rest_copying.c
libgnunet_plugin_rest_copying_la_LIBADD = \
- libgnunetrest.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
$(LTLIBINTL) $(MHD_LIBS)
libgnunet_plugin_rest_copying_la_LDFLAGS = \
@@ -41,28 +29,9 @@ libgnunet_plugin_rest_copying_la_CFLAGS = $(MHD_CFLAGS)
$(AM_CFLAGS)
libgnunet_plugin_rest_config_la_SOURCES = \
plugin_rest_config.c
libgnunet_plugin_rest_config_la_LIBADD = \
- libgnunetrest.la \
+ $(top_builddir)/src/service/rest/libgnunetrest.la \
$(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
$(LTLIBINTL) $(MHD_LIBS) -ljansson
libgnunet_plugin_rest_config_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
libgnunet_plugin_rest_config_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-
-
-gnunet_rest_server_SOURCES = \
- gnunet-rest-server.c
-gnunet_rest_server_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL) $(MHD_LIBS)
-gnunet_rest_server_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-libgnunetrest_la_SOURCES = \
- rest.c
-libgnunetrest_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \
- $(GN_LIBINTL) $(MHD_LIBS)
-libgnunetrest_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
-libgnunetrest_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
diff --git a/src/rest/plugin_rest_config.c
b/src/rest-plugin/rest/plugin_rest_config.c
similarity index 100%
rename from src/rest/plugin_rest_config.c
rename to src/rest-plugin/rest/plugin_rest_config.c
diff --git a/src/rest/plugin_rest_copying.c
b/src/rest-plugin/rest/plugin_rest_copying.c
similarity index 100%
rename from src/rest/plugin_rest_copying.c
rename to src/rest-plugin/rest/plugin_rest_copying.c
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index 631ebbf95..d271298a8 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -28,7 +28,7 @@ libgnunet_plugin_block_revocation_la_LIBADD = \
$(top_builddir)/src/lib/block/libgnunetblockgroup.la \
$(top_builddir)/src/lib/block/libgnunetblock.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(LTLIBINTL)
libgnunet_plugin_block_revocation_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
@@ -38,7 +38,7 @@ gnunet_revocation_SOURCES = \
gnunet-revocation.c
gnunet_revocation_LDADD = \
libgnunetrevocation.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -46,7 +46,7 @@ gnunet_revocation_tvg_SOURCES = \
gnunet-revocation-tvg.c
gnunet_revocation_tvg_LDADD = \
libgnunetrevocation.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(GN_LIBINTL)
@@ -54,7 +54,7 @@ test_revocation_lsd0001testvectors_SOURCES = \
test_revocation_testvectors.c
test_revocation_lsd0001testvectors_LDADD = \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetrevocation.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
@@ -64,7 +64,7 @@ libgnunetrevocation_la_SOURCES = \
revocation_api.c revocation.h
libgnunetrevocation_la_LIBADD = \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(LIBGCRYPT_LIBS) \
$(GN_LIBINTL) $(XLIB) -lgcrypt
libgnunetrevocation_la_LDFLAGS = \
@@ -84,7 +84,7 @@ gnunet_service_revocation_LDADD = \
$(top_builddir)/src/service/core/libgnunetcore.la \
$(top_builddir)/src/setu/libgnunetsetu.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
-lm \
$(GN_LIBINTL)
@@ -92,7 +92,7 @@ gnunet_service_revocation_LDADD = \
test_revocation_SOURCES = \
test_revocation.c
test_revocation_LDADD = \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
libgnunetrevocation.la \
$(top_builddir)/src//core/libgnunetcore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 218e68671..737a4fd4d 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -1,4 +1,6 @@
SUBDIRS = \
util \
arm \
- core
+ core \
+ identity \
+ rest
diff --git a/src/identity/.gitignore b/src/service/identity/.gitignore
similarity index 100%
rename from src/identity/.gitignore
rename to src/service/identity/.gitignore
diff --git a/src/identity/Makefile.am b/src/service/identity/Makefile.am
similarity index 65%
rename from src/identity/Makefile.am
rename to src/service/identity/Makefile.am
index bf430ed77..079a9af2e 100644
--- a/src/identity/Makefile.am
+++ b/src/service/identity/Makefile.am
@@ -8,8 +8,6 @@ if USE_COVERAGE
XLIB = -lgcov
endif
-plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la
-
pkgcfgdir= $(pkgdatadir)/config.d/
libexecdir= $(pkglibdir)/libexec/
@@ -21,18 +19,6 @@ lib_LTLIBRARIES = \
libgnunetidentity.la
-libgnunet_plugin_rest_identity_la_SOURCES = \
- plugin_rest_identity.c
-libgnunet_plugin_rest_identity_la_LIBADD = \
- libgnunetidentity.la \
- $(top_builddir)/src/rest/libgnunetrest.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) -ljansson $(MHD_LIBS)
-libgnunet_plugin_rest_identity_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_identity_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-
libgnunetidentity_la_SOURCES = \
identity_api.c \
identity_api_lookup.c \
@@ -46,9 +32,6 @@ libgnunetidentity_la_LDFLAGS = \
-lsodium \
-version-info 1:0:0
-bin_PROGRAMS = \
- gnunet-identity
-
libexec_PROGRAMS = \
gnunet-service-identity
@@ -61,20 +44,9 @@ gnunet_service_identity_LDADD = \
$(GN_LIBINTL)
-gnunet_identity_SOURCES = \
- gnunet-identity.c
-gnunet_identity_LDADD = \
- libgnunetidentity.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
check_PROGRAMS = \
test_identity
-check_SCRIPTS = \
- test_identity_messages.sh
-
# if ENABLE_TEST_RUN
# AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
# TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
diff --git a/src/identity/gnunet-service-identity.c
b/src/service/identity/gnunet-service-identity.c
similarity index 100%
rename from src/identity/gnunet-service-identity.c
rename to src/service/identity/gnunet-service-identity.c
diff --git a/src/identity/identity.conf.in
b/src/service/identity/identity.conf.in
similarity index 100%
rename from src/identity/identity.conf.in
rename to src/service/identity/identity.conf.in
diff --git a/src/identity/identity.h b/src/service/identity/identity.h
similarity index 100%
rename from src/identity/identity.h
rename to src/service/identity/identity.h
diff --git a/src/identity/identity_api.c b/src/service/identity/identity_api.c
similarity index 100%
rename from src/identity/identity_api.c
rename to src/service/identity/identity_api.c
diff --git a/src/identity/identity_api_lookup.c
b/src/service/identity/identity_api_lookup.c
similarity index 100%
rename from src/identity/identity_api_lookup.c
rename to src/service/identity/identity_api_lookup.c
diff --git a/src/identity/identity_api_suffix_lookup.c
b/src/service/identity/identity_api_suffix_lookup.c
similarity index 100%
rename from src/identity/identity_api_suffix_lookup.c
rename to src/service/identity/identity_api_suffix_lookup.c
diff --git a/src/identity/meson.build b/src/service/identity/meson.build
similarity index 100%
rename from src/identity/meson.build
rename to src/service/identity/meson.build
diff --git a/src/identity/test_identity.c b/src/service/identity/test_identity.c
similarity index 100%
rename from src/identity/test_identity.c
rename to src/service/identity/test_identity.c
diff --git a/src/identity/test_identity.conf
b/src/service/identity/test_identity.conf
similarity index 100%
rename from src/identity/test_identity.conf
rename to src/service/identity/test_identity.conf
diff --git a/src/identity/test_identity_messages.sh
b/src/service/identity/test_identity_messages.sh
similarity index 100%
rename from src/identity/test_identity_messages.sh
rename to src/service/identity/test_identity_messages.sh
diff --git a/src/identity/test_plugin_rest_identity.sh
b/src/service/identity/test_plugin_rest_identity.sh
similarity index 100%
rename from src/identity/test_plugin_rest_identity.sh
rename to src/service/identity/test_plugin_rest_identity.sh
diff --git a/src/identity/test_plugin_rest_identity_signature.sh
b/src/service/identity/test_plugin_rest_identity_signature.sh
similarity index 100%
rename from src/identity/test_plugin_rest_identity_signature.sh
rename to src/service/identity/test_plugin_rest_identity_signature.sh
diff --git a/src/rest/.gitignore b/src/service/rest/.gitignore
similarity index 100%
rename from src/rest/.gitignore
rename to src/service/rest/.gitignore
diff --git a/src/rest/Makefile.am b/src/service/rest/Makefile.am
similarity index 52%
rename from src/rest/Makefile.am
rename to src/service/rest/Makefile.am
index e3952a45e..401be36f4 100644
--- a/src/rest/Makefile.am
+++ b/src/service/rest/Makefile.am
@@ -21,35 +21,9 @@ lib_LTLIBRARIES = \
libexec_PROGRAMS = \
gnunet-rest-server
-plugin_LTLIBRARIES = \
- libgnunet_plugin_rest_copying.la \
- libgnunet_plugin_rest_config.la
-
EXTRA_DIST = \
rest.conf
-libgnunet_plugin_rest_copying_la_SOURCES = \
- plugin_rest_copying.c
-libgnunet_plugin_rest_copying_la_LIBADD = \
- libgnunetrest.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) $(MHD_LIBS)
-libgnunet_plugin_rest_copying_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_copying_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-libgnunet_plugin_rest_config_la_SOURCES = \
- plugin_rest_config.c
-libgnunet_plugin_rest_config_la_LIBADD = \
- libgnunetrest.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
- $(LTLIBINTL) $(MHD_LIBS) -ljansson
-libgnunet_plugin_rest_config_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_config_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-
-
gnunet_rest_server_SOURCES = \
gnunet-rest-server.c
gnunet_rest_server_LDADD = \
diff --git a/src/rest/gnunet-rest-server.c
b/src/service/rest/gnunet-rest-server.c
similarity index 100%
rename from src/rest/gnunet-rest-server.c
rename to src/service/rest/gnunet-rest-server.c
diff --git a/src/rest/meson.build b/src/service/rest/meson.build
similarity index 100%
rename from src/rest/meson.build
rename to src/service/rest/meson.build
diff --git a/src/rest/rest.c b/src/service/rest/rest.c
similarity index 100%
rename from src/rest/rest.c
rename to src/service/rest/rest.c
diff --git a/src/rest/rest.conf b/src/service/rest/rest.conf
similarity index 100%
rename from src/rest/rest.conf
rename to src/service/rest/rest.conf
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am
index 3a3b150e2..b5fcb9d7b 100644
--- a/src/zonemaster/Makefile.am
+++ b/src/zonemaster/Makefile.am
@@ -23,7 +23,7 @@ gnunet_service_zonemaster_SOURCES = \
gnunet_service_zonemaster_LDADD = \
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (9ef4abad6 -> 65dbd214b), gnunet, 2023/10/18
- [gnunet] 01/10: BUILD: Move curl to lib, gnunet, 2023/10/18
- [gnunet] 02/10: BUILD: Move json to lib, gnunet, 2023/10/18
- [gnunet] 03/10: BUILD: Move pq/sq to lib, gnunet, 2023/10/18
- [gnunet] 05/10: BUILD: Move dhtu to plugin, gnunet, 2023/10/18
- [gnunet] 07/10: BUILD: Fix error code copy file, gnunet, 2023/10/18
- [gnunet] 04/10: BUILD: Move testing to lib, gnunet, 2023/10/18
- [gnunet] 06/10: BUILD: Move arm to service/cli, gnunet, 2023/10/18
- [gnunet] 10/10: BUILD: Move identity/rest components to service/rest-plugin,
gnunet <=
- [gnunet] 08/10: BUILD: Move core to service/cli, gnunet, 2023/10/18
- [gnunet] 09/10: BUILD: Move experimental components to contrib, gnunet, 2023/10/18