BUILD: Move core to service/cli

53 files changed, 45 insertions, 30 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 88bb59a8e..2ac40e4cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,6 @@ SUBDIRS = \
   nat \
   nat-auto \
   transport \
-  core \
   nse \
   dht \
   hostlist \
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index 1b56df350..d366ecd95 100644
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -62,7 +62,7 @@ gnunet_service_cadet_SOURCES = \
  gnunet-service-cadet_peer.c gnunet-service-cadet_peer.h
 gnunet_service_cadet_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/core/libgnunetcore.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 \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 88a8507b7..218e68671 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -1,3 +1,4 @@
 SUBDIRS = \
         util \
-        arm
+        arm \
+        core
diff --git a/src/cli/core/.gitignore b/src/cli/core/.gitignore
new file mode 100644
index 000000000..95169ed2b
--- /dev/null
+++ b/src/cli/core/.gitignore
@@ -0,0 +1 @@
+gnunet-core
diff --git a/src/cli/core/Makefile.am b/src/cli/core/Makefile.am
new file mode 100644
index 000000000..97abf0db2
--- /dev/null
+++ b/src/cli/core/Makefile.am
@@ -0,0 +1,24 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+plugindir = $(libdir)/gnunet
+
+libexecdir= $(pkglibdir)/libexec/
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+bin_PROGRAMS = \
+ gnunet-core
+
+gnunet_core_SOURCES = \
+ gnunet-core.c
+gnunet_core_LDADD = \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_core_LDFLAGS = \
+  $(GN_LIBINTL)
diff --git a/src/core/gnunet-core.c b/src/cli/core/gnunet-core.c
index d90c8e1f5..d90c8e1f5 100644
--- a/src/core/gnunet-core.c
+++ b/src/cli/core/gnunet-core.c
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index da075748b..8815b95c9 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -39,7 +39,7 @@ gnunet_service_consensus_SOURCES = \
  gnunet-service-consensus.c
 gnunet_service_consensus_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
   $(top_builddir)/src/set/libgnunetset.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
@@ -49,7 +49,7 @@ gnunet_service_evil_consensus_SOURCES = \
  consensus_protocol.h
 gnunet_service_evil_consensus_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
   $(top_builddir)/src/set/libgnunetset.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index dfc0d2bbf..6185d9d2c 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -61,7 +61,7 @@ gnunet_service_dht_SOURCES = \
 gnunet_service_dht_LDADD = \
   libgnunetdht.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
   $(top_builddir)/src/nse/libgnunetnse.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index b8b62c7ea..e61d2724e 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -178,7 +178,7 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/datastore/libgnunetdatastore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/cadet/libgnunetcadet.la \
- $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/service/core/libgnunetcore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
  $(GN_LIBINTL) -lm
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index c03e5bab2..9cf72142a 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -26,7 +26,7 @@ gnunet_daemon_hostlist_SOURCES = \
  $(HOSTLIST_SERVER_SOURCES)
 
 gnunet_daemon_hostlist_LDADD = \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(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 \
@@ -67,7 +67,7 @@ endif
 # test_gnunet_daemon_hostlist_learning.c
 #test_gnunet_daemon_hostlist_learning_LDADD = \
 #  $(top_builddir)/src/transport/libgnunettransport.la \
-#  $(top_builddir)/src/core/libgnunetcore.la \
+#  $(top_builddir)/src/service/core/libgnunetcore.la \
 #  $(top_builddir)/src/statistics/libgnunetstatistics.la \
 #  $(top_builddir)/src/lib/util/libgnunetutil.la
 
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index d028ba19d..053995c9a 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -55,7 +55,7 @@ gnunet_service_nse_SOURCES = \
 gnunet_service_nse_LDADD = \
   libgnunetnse.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(LIBGCRYPT_LIBS) \
   -lm -lgcrypt \
diff --git a/src/plugin/dhtu/Makefile.am b/src/plugin/dhtu/Makefile.am
index 872e8f41f..26e706e36 100644
--- a/src/plugin/dhtu/Makefile.am
+++ b/src/plugin/dhtu/Makefile.am
@@ -33,7 +33,7 @@ endif
 libgnunet_plugin_dhtu_gnunet_la_SOURCES = \
   plugin_dhtu_gnunet.c
 libgnunet_plugin_dhtu_gnunet_la_LIBADD = \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index 38d14f65e..631ebbf95 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -81,7 +81,7 @@ gnunet_service_revocation_SOURCES = \
  gnunet-service-revocation.c
 gnunet_service_revocation_LDADD = \
   libgnunetrevocation.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(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  \
diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am
index bf34a29d7..2ee315d11 100644
--- a/src/rps/Makefile.am
+++ b/src/rps/Makefile.am
@@ -65,7 +65,7 @@ gnunet_service_rps_LDADD = \
   $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/nse/libgnunetnse.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
   $(LIBGCRYPT_LIBS) \
   -lm -lgcrypt \
   $(GN_LIBINTL)
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 88a8507b7..218e68671 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -1,3 +1,4 @@
 SUBDIRS = \
         util \
-        arm
+        arm \
+        core
diff --git a/src/core/.gitignore b/src/service/core/.gitignore
index cdd1f93c2..e985f5ff4 100644
--- a/src/core/.gitignore
+++ b/src/service/core/.gitignore
@@ -1,5 +1,5 @@
 gnunet-service-core
-gnunet-core
+core.conf
 test_core_api
 test_core_api_reliability
 test_core_api_send_to_self
diff --git a/src/core/Makefile.am b/src/service/core/Makefile.am
index b1d932ace..9ce8cf8b5 100644
--- a/src/core/Makefile.am
+++ b/src/service/core/Makefile.am
@@ -68,9 +68,6 @@ libgnunetcoretesting_la_LDFLAGS = \
 libexec_PROGRAMS = \
  gnunet-service-core
 
-bin_PROGRAMS = \
- gnunet-core
-
 gnunet_service_core_SOURCES = \
  gnunet-service-core.c gnunet-service-core.h \
  gnunet-service-core_kx.c gnunet-service-core_kx.h \
@@ -84,14 +81,6 @@ gnunet_service_core_LDADD = \
   $(GN_LIBINTL) $(Z_LIBS)
 
 
-gnunet_core_SOURCES = \
- gnunet-core.c
-gnunet_core_LDADD = \
-  libgnunetcore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_core_LDFLAGS = \
-  $(GN_LIBINTL)
-
 TESTING_TESTS = \
   test_core_api_send_to_self
 
diff --git a/src/core/core.conf.in b/src/service/core/core.conf.in
index 00faf6079..00faf6079 100644
--- a/src/core/core.conf.in
+++ b/src/service/core/core.conf.in
diff --git a/src/core/core.h b/src/service/core/core.h
index d4596f038..d4596f038 100644
--- a/src/core/core.h
+++ b/src/service/core/core.h
diff --git a/src/core/core_api.c b/src/service/core/core_api.c
index 2e0bb1785..2e0bb1785 100644
--- a/src/core/core_api.c
+++ b/src/service/core/core_api.c
diff --git a/src/core/core_api_cmd_connecting_peers.c b/src/service/core/core_api_cmd_connecting_peers.c
index ce2184a3c..ce2184a3c 100644
--- a/src/core/core_api_cmd_connecting_peers.c
+++ b/src/service/core/core_api_cmd_connecting_peers.c
diff --git a/src/core/core_api_monitor_peers.c b/src/service/core/core_api_monitor_peers.c
index 3be8e3859..3be8e3859 100644
--- a/src/core/core_api_monitor_peers.c
+++ b/src/service/core/core_api_monitor_peers.c
diff --git a/src/core/gnunet-service-core.c b/src/service/core/gnunet-service-core.c
index e387fecc9..e387fecc9 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/service/core/gnunet-service-core.c
diff --git a/src/core/gnunet-service-core.h b/src/service/core/gnunet-service-core.h
index 0f71f221a..0f71f221a 100644
--- a/src/core/gnunet-service-core.h
+++ b/src/service/core/gnunet-service-core.h
diff --git a/src/core/gnunet-service-core_kx.c b/src/service/core/gnunet-service-core_kx.c
index ca7bccbd9..ca7bccbd9 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/service/core/gnunet-service-core_kx.c
diff --git a/src/core/gnunet-service-core_kx.h b/src/service/core/gnunet-service-core_kx.h
index 8bcac3f68..8bcac3f68 100644
--- a/src/core/gnunet-service-core_kx.h
+++ b/src/service/core/gnunet-service-core_kx.h
diff --git a/src/core/gnunet-service-core_sessions.c b/src/service/core/gnunet-service-core_sessions.c
index e103c89f5..e103c89f5 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/service/core/gnunet-service-core_sessions.c
diff --git a/src/core/gnunet-service-core_sessions.h b/src/service/core/gnunet-service-core_sessions.h
index fda2cc32c..fda2cc32c 100644
--- a/src/core/gnunet-service-core_sessions.h
+++ b/src/service/core/gnunet-service-core_sessions.h
diff --git a/src/core/gnunet-service-core_typemap.c b/src/service/core/gnunet-service-core_typemap.c
index 200a84b23..200a84b23 100644
--- a/src/core/gnunet-service-core_typemap.c
+++ b/src/service/core/gnunet-service-core_typemap.c
diff --git a/src/core/gnunet-service-core_typemap.h b/src/service/core/gnunet-service-core_typemap.h
index de41f4220..de41f4220 100644
--- a/src/core/gnunet-service-core_typemap.h
+++ b/src/service/core/gnunet-service-core_typemap.h
diff --git a/src/core/meson.build b/src/service/core/meson.build
index 2e3e958af..2e3e958af 100644
--- a/src/core/meson.build
+++ b/src/service/core/meson.build
diff --git a/src/core/test_core_api.c b/src/service/core/test_core_api.c
index 653ce1aa0..653ce1aa0 100644
--- a/src/core/test_core_api.c
+++ b/src/service/core/test_core_api.c
diff --git a/src/core/test_core_api_data.conf b/src/service/core/test_core_api_data.conf
index 420849ba9..420849ba9 100644
--- a/src/core/test_core_api_data.conf
+++ b/src/service/core/test_core_api_data.conf
diff --git a/src/core/test_core_api_peer1.conf b/src/service/core/test_core_api_peer1.conf
index 28463effe..28463effe 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/service/core/test_core_api_peer1.conf
diff --git a/src/core/test_core_api_peer2.conf b/src/service/core/test_core_api_peer2.conf
index 819d58d17..819d58d17 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/service/core/test_core_api_peer2.conf
diff --git a/src/core/test_core_api_reliability.c b/src/service/core/test_core_api_reliability.c
index d4b55a6b8..d4b55a6b8 100644
--- a/src/core/test_core_api_reliability.c
+++ b/src/service/core/test_core_api_reliability.c
diff --git a/src/core/test_core_api_send_to_self.c b/src/service/core/test_core_api_send_to_self.c
index c2e39cd26..c2e39cd26 100644
--- a/src/core/test_core_api_send_to_self.c
+++ b/src/service/core/test_core_api_send_to_self.c
diff --git a/src/core/test_core_api_send_to_self.conf b/src/service/core/test_core_api_send_to_self.conf
index fe8e69999..fe8e69999 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/service/core/test_core_api_send_to_self.conf
diff --git a/src/core/test_core_api_start_only.c b/src/service/core/test_core_api_start_only.c
index e50d3b2ec..e50d3b2ec 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/service/core/test_core_api_start_only.c
diff --git a/src/core/test_core_defaults.conf b/src/service/core/test_core_defaults.conf
index 7c7dad99e..7c7dad99e 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/service/core/test_core_defaults.conf
diff --git a/src/core/test_core_plugin_cmd_just_run.c b/src/service/core/test_core_plugin_cmd_just_run.c
index 176d055c8..176d055c8 100644
--- a/src/core/test_core_plugin_cmd_just_run.c
+++ b/src/service/core/test_core_plugin_cmd_just_run.c
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/service/core/test_core_quota_asymmetric_recv_limited_peer1.conf
index 766a2e73b..766a2e73b 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
+++ b/src/service/core/test_core_quota_asymmetric_recv_limited_peer1.conf
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/service/core/test_core_quota_asymmetric_recv_limited_peer2.conf
index 30c0bb81f..30c0bb81f 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/service/core/test_core_quota_asymmetric_recv_limited_peer2.conf
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/service/core/test_core_quota_asymmetric_send_limit_peer1.conf
index 4a9f483d6..4a9f483d6 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
+++ b/src/service/core/test_core_quota_asymmetric_send_limit_peer1.conf
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/service/core/test_core_quota_asymmetric_send_limit_peer2.conf
index 36434461c..36434461c 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
+++ b/src/service/core/test_core_quota_asymmetric_send_limit_peer2.conf
diff --git a/src/core/test_core_quota_compliance.c b/src/service/core/test_core_quota_compliance.c
index 099c6fa3b..099c6fa3b 100644
--- a/src/core/test_core_quota_compliance.c
+++ b/src/service/core/test_core_quota_compliance.c
diff --git a/src/core/test_core_quota_peer1.conf b/src/service/core/test_core_quota_peer1.conf
index ec592f778..ec592f778 100644
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/service/core/test_core_quota_peer1.conf
diff --git a/src/core/test_core_quota_peer2.conf b/src/service/core/test_core_quota_peer2.conf
index 65d0710bb..65d0710bb 100644
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/service/core/test_core_quota_peer2.conf
diff --git a/src/core/test_core_start_testcase.sh b/src/service/core/test_core_start_testcase.sh
index 78e67dbf5..78e67dbf5 100755
--- a/src/core/test_core_start_testcase.sh
+++ b/src/service/core/test_core_start_testcase.sh
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index cd65b66e6..d8c47f45d 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -51,7 +51,7 @@ gnunet_service_set_SOURCES = \
 gnunet_service_set_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
   $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/lib/block/libgnunetblock.la \
   libgnunetset.la \
diff --git a/src/seti/Makefile.am b/src/seti/Makefile.am
index 681cde703..96adf377d 100644
--- a/src/seti/Makefile.am
+++ b/src/seti/Makefile.am
@@ -39,7 +39,7 @@ gnunet_service_seti_SOURCES = \
 gnunet_service_seti_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
   $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/lib/block/libgnunetblock.la \
   libgnunetseti.la \
diff --git a/src/setu/Makefile.am b/src/setu/Makefile.am
index c2a87f7a9..3ecd8f32a 100644
--- a/src/setu/Makefile.am
+++ b/src/setu/Makefile.am
@@ -49,7 +49,7 @@ gnunet_service_setu_SOURCES = \
 gnunet_service_setu_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
   $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/lib/block/libgnunetblock.la \
   libgnunetsetu.la \
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
index c8086b74d..620d51d9a 100644
--- a/src/topology/Makefile.am
+++ b/src/topology/Makefile.am
@@ -19,7 +19,7 @@ libexec_PROGRAMS = \
 gnunet_daemon_topology_SOURCES = \
  gnunet-daemon-topology.c
 gnunet_daemon_topology_LDADD = \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  $(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 \