gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnunet] 08/10: BUILD: Move core to service/cli


From: gnunet
Subject: [gnunet] 08/10: BUILD: Move core to service/cli
Date: Wed, 18 Oct 2023 15:15:56 +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 2f93ff3b6d3524e1e6dc23f70966fbae3ca9d3af
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 18 14:31:24 2023 +0200

    BUILD: Move core to service/cli
---
 .gitignore                                         |  2 +-
 configure.ac                                       |  5 +++--
 po/POTFILES.in                                     | 16 +++++++--------
 src/Makefile.am                                    |  1 -
 src/cadet/Makefile.am                              |  2 +-
 src/cli/Makefile.am                                |  3 ++-
 src/cli/core/.gitignore                            |  1 +
 src/cli/core/Makefile.am                           | 24 ++++++++++++++++++++++
 src/{ => cli}/core/gnunet-core.c                   |  0
 src/consensus/Makefile.am                          |  4 ++--
 src/dht/Makefile.am                                |  2 +-
 src/fs/Makefile.am                                 |  2 +-
 src/hostlist/Makefile.am                           |  4 ++--
 src/nse/Makefile.am                                |  2 +-
 src/plugin/dhtu/Makefile.am                        |  2 +-
 src/revocation/Makefile.am                         |  2 +-
 src/rps/Makefile.am                                |  2 +-
 src/service/Makefile.am                            |  3 ++-
 src/{ => service}/core/.gitignore                  |  2 +-
 src/{ => service}/core/Makefile.am                 | 11 ----------
 src/{ => service}/core/core.conf.in                |  0
 src/{ => service}/core/core.h                      |  0
 src/{ => service}/core/core_api.c                  |  0
 .../core/core_api_cmd_connecting_peers.c           |  0
 src/{ => service}/core/core_api_monitor_peers.c    |  0
 src/{ => service}/core/gnunet-service-core.c       |  0
 src/{ => service}/core/gnunet-service-core.h       |  0
 src/{ => service}/core/gnunet-service-core_kx.c    |  0
 src/{ => service}/core/gnunet-service-core_kx.h    |  0
 .../core/gnunet-service-core_sessions.c            |  0
 .../core/gnunet-service-core_sessions.h            |  0
 .../core/gnunet-service-core_typemap.c             |  0
 .../core/gnunet-service-core_typemap.h             |  0
 src/{ => service}/core/meson.build                 |  0
 src/{ => service}/core/test_core_api.c             |  0
 src/{ => service}/core/test_core_api_data.conf     |  0
 src/{ => service}/core/test_core_api_peer1.conf    |  0
 src/{ => service}/core/test_core_api_peer2.conf    |  0
 src/{ => service}/core/test_core_api_reliability.c |  0
 .../core/test_core_api_send_to_self.c              |  0
 .../core/test_core_api_send_to_self.conf           |  0
 src/{ => service}/core/test_core_api_start_only.c  |  0
 src/{ => service}/core/test_core_defaults.conf     |  0
 .../core/test_core_plugin_cmd_just_run.c           |  0
 ...t_core_quota_asymmetric_recv_limited_peer1.conf |  0
 ...t_core_quota_asymmetric_recv_limited_peer2.conf |  0
 ...est_core_quota_asymmetric_send_limit_peer1.conf |  0
 ...est_core_quota_asymmetric_send_limit_peer2.conf |  0
 .../core/test_core_quota_compliance.c              |  0
 src/{ => service}/core/test_core_quota_peer1.conf  |  0
 src/{ => service}/core/test_core_quota_peer2.conf  |  0
 src/{ => service}/core/test_core_start_testcase.sh |  0
 src/set/Makefile.am                                |  2 +-
 src/seti/Makefile.am                               |  2 +-
 src/setu/Makefile.am                               |  2 +-
 src/topology/Makefile.am                           |  2 +-
 56 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ac75efce..cfb634b8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ lynXified.*
 missing
 po/*.gmo
 pkgconfig/*.pc
-src/*/*.conf
+src/**/*.conf
 stamp-h1
 test-driver
 INSTALL
diff --git a/configure.ac b/configure.ac
index 87543d15f..48a33c6c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1246,14 +1246,15 @@ src/plugin/gnsrecord/Makefile
 src/service/Makefile
 src/service/arm/Makefile
 src/service/arm/arm.conf
+src/service/core/Makefile
+src/service/core/core.conf
 src/service/util/Makefile
 src/cli/Makefile
 src/cli/arm/Makefile
+src/cli/core/Makefile
 src/cli/util/Makefile
 src/cadet/Makefile
 src/cadet/cadet.conf
-src/core/Makefile
-src/core/core.conf
 src/consensus/Makefile
 src/consensus/consensus.conf
 src/conversation/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b152a6f19..9807a8e2e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,6 +28,7 @@ src/cadet/gnunet-service-cadet_paths.c
 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/util/gnunet-base32.c
 src/cli/util/gnunet-config-diff.c
 src/cli/util/gnunet-config.c
@@ -55,14 +56,6 @@ src/conversation/gnunet_gst_test.c
 src/conversation/microphone.c
 src/conversation/plugin_gnsrecord_conversation.c
 src/conversation/speaker.c
-src/core/core_api.c
-src/core/core_api_cmd_connecting_peers.c
-src/core/core_api_monitor_peers.c
-src/core/gnunet-core.c
-src/core/gnunet-service-core.c
-src/core/gnunet-service-core_kx.c
-src/core/gnunet-service-core_sessions.c
-src/core/gnunet-service-core_typemap.c
 src/datacache/datacache.c
 src/datacache/plugin_datacache_heap.c
 src/datacache/plugin_datacache_postgres.c
@@ -438,6 +431,13 @@ src/service/arm/arm_api.c
 src/service/arm/arm_monitor_api.c
 src/service/arm/gnunet-service-arm.c
 src/service/arm/mockup-service.c
+src/service/core/core_api.c
+src/service/core/core_api_cmd_connecting_peers.c
+src/service/core/core_api_monitor_peers.c
+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/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 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
similarity index 100%
rename from src/core/gnunet-core.c
rename to 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
similarity index 95%
rename from src/core/.gitignore
rename to 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
similarity index 95%
rename from src/core/Makefile.am
rename to 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
similarity index 100%
rename from src/core/core.conf.in
rename to src/service/core/core.conf.in
diff --git a/src/core/core.h b/src/service/core/core.h
similarity index 100%
rename from src/core/core.h
rename to src/service/core/core.h
diff --git a/src/core/core_api.c b/src/service/core/core_api.c
similarity index 100%
rename from src/core/core_api.c
rename to 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
similarity index 100%
rename from src/core/core_api_cmd_connecting_peers.c
rename to 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
similarity index 100%
rename from src/core/core_api_monitor_peers.c
rename to 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
similarity index 100%
rename from src/core/gnunet-service-core.c
rename to src/service/core/gnunet-service-core.c
diff --git a/src/core/gnunet-service-core.h 
b/src/service/core/gnunet-service-core.h
similarity index 100%
rename from src/core/gnunet-service-core.h
rename to 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
similarity index 100%
rename from src/core/gnunet-service-core_kx.c
rename to 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
similarity index 100%
rename from src/core/gnunet-service-core_kx.h
rename to 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
similarity index 100%
rename from src/core/gnunet-service-core_sessions.c
rename to 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
similarity index 100%
rename from src/core/gnunet-service-core_sessions.h
rename to 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
similarity index 100%
rename from src/core/gnunet-service-core_typemap.c
rename to 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
similarity index 100%
rename from src/core/gnunet-service-core_typemap.h
rename to src/service/core/gnunet-service-core_typemap.h
diff --git a/src/core/meson.build b/src/service/core/meson.build
similarity index 100%
rename from src/core/meson.build
rename to src/service/core/meson.build
diff --git a/src/core/test_core_api.c b/src/service/core/test_core_api.c
similarity index 100%
rename from src/core/test_core_api.c
rename to 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
similarity index 100%
rename from src/core/test_core_api_data.conf
rename to 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
similarity index 100%
rename from src/core/test_core_api_peer1.conf
rename to 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
similarity index 100%
rename from src/core/test_core_api_peer2.conf
rename to 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
similarity index 100%
rename from src/core/test_core_api_reliability.c
rename to 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
similarity index 100%
rename from src/core/test_core_api_send_to_self.c
rename to 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
similarity index 100%
rename from src/core/test_core_api_send_to_self.conf
rename to 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
similarity index 100%
rename from src/core/test_core_api_start_only.c
rename to 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
similarity index 100%
rename from src/core/test_core_defaults.conf
rename to 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
similarity index 100%
rename from src/core/test_core_plugin_cmd_just_run.c
rename to 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
similarity index 100%
rename from src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
rename to 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
similarity index 100%
rename from src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
rename to 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
similarity index 100%
rename from src/core/test_core_quota_asymmetric_send_limit_peer1.conf
rename to 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
similarity index 100%
rename from src/core/test_core_quota_asymmetric_send_limit_peer2.conf
rename to 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
similarity index 100%
rename from src/core/test_core_quota_compliance.c
rename to 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
similarity index 100%
rename from src/core/test_core_quota_peer1.conf
rename to 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
similarity index 100%
rename from src/core/test_core_quota_peer2.conf
rename to 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
similarity index 100%
rename from src/core/test_core_start_testcase.sh
rename to 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 \

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]