diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2024-02-23 19:04:25 +0100 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2024-02-23 19:04:25 +0100 |
commit | 4f89162cec7f1ff6d2bed11438e8202a516a6f19 (patch) | |
tree | bc5b248a048cfeadc9e63e51bb3cb9f055992ad6 | |
parent | bab98b5e47604f3c0213d9e775a689c0e03a0456 (diff) | |
download | gnunet-4f89162cec7f1ff6d2bed11438e8202a516a6f19.tar.gz gnunet-4f89162cec7f1ff6d2bed11438e8202a516a6f19.zip |
DHTU: Purge DHTU directory
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/service/dhtu/.gitignore | 1 | ||||
-rw-r--r-- | src/service/dhtu/Makefile.am | 81 | ||||
-rw-r--r-- | src/service/dhtu/meson.build | 61 |
4 files changed, 0 insertions, 144 deletions
diff --git a/configure.ac b/configure.ac index beeac3aeb..316257f97 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1265,7 +1265,6 @@ src/service/datastore/Makefile | |||
1265 | src/service/datastore/datastore.conf | 1265 | src/service/datastore/datastore.conf |
1266 | src/service/dht/Makefile | 1266 | src/service/dht/Makefile |
1267 | src/service/dht/dht.conf | 1267 | src/service/dht/dht.conf |
1268 | src/service/dhtu/Makefile | ||
1269 | src/service/dns/Makefile | 1268 | src/service/dns/Makefile |
1270 | src/service/dns/dns.conf | 1269 | src/service/dns/dns.conf |
1271 | src/service/exit/Makefile | 1270 | src/service/exit/Makefile |
diff --git a/src/service/dhtu/.gitignore b/src/service/dhtu/.gitignore deleted file mode 100644 index 21f1a7c9b..000000000 --- a/src/service/dhtu/.gitignore +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | test_dhtu_ip | ||
diff --git a/src/service/dhtu/Makefile.am b/src/service/dhtu/Makefile.am deleted file mode 100644 index 500d5a7b1..000000000 --- a/src/service/dhtu/Makefile.am +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | plugindir = $(libdir)/gnunet | ||
5 | |||
6 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
7 | |||
8 | if USE_COVERAGE | ||
9 | AM_CFLAGS = --coverage -O0 | ||
10 | XLIBS = -lgcov | ||
11 | endif | ||
12 | |||
13 | pkgcfg_DATA = \ | ||
14 | dhtu.conf | ||
15 | |||
16 | plugin_LTLIBRARIES = \ | ||
17 | libgnunet_plugin_dhtu_gnunet.la | ||
18 | |||
19 | if !OPENBSD | ||
20 | plugin_LTLIBRARIES += libgnunet_plugin_dhtu_ip.la | ||
21 | |||
22 | libgnunet_plugin_dhtu_ip_la_SOURCES = \ | ||
23 | plugin_dhtu_ip.c | ||
24 | libgnunet_plugin_dhtu_ip_la_LIBADD = \ | ||
25 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
26 | $(XLIBS) \ | ||
27 | $(LTLIBINTL) | ||
28 | libgnunet_plugin_dhtu_ip_la_LDFLAGS = \ | ||
29 | $(GN_PLUGIN_LDFLAGS) | ||
30 | endif | ||
31 | |||
32 | |||
33 | libgnunet_plugin_dhtu_gnunet_la_SOURCES = \ | ||
34 | plugin_dhtu_gnunet.c | ||
35 | libgnunet_plugin_dhtu_gnunet_la_LIBADD = \ | ||
36 | $(top_builddir)/src/service/core/libgnunetcore.la \ | ||
37 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ | ||
38 | $(top_builddir)/src/service/transport/libgnunettransportapplication.la \ | ||
39 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | ||
40 | $(top_builddir)/src/service/nse/libgnunetnse.la \ | ||
41 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
42 | $(XLIBS) \ | ||
43 | $(LTLIBINTL) | ||
44 | libgnunet_plugin_dhtu_gnunet_la_LDFLAGS = \ | ||
45 | $(GN_PLUGIN_LDFLAGS) | ||
46 | |||
47 | |||
48 | lib_LTLIBRARIES = \ | ||
49 | libgnunettestingdhtu.la | ||
50 | |||
51 | libgnunettestingdhtu_la_SOURCES = \ | ||
52 | testing_dhtu_cmd_send.c | ||
53 | libgnunettestingdhtu_la_LIBADD = \ | ||
54 | $(top_builddir)/src/service/testing/libgnunettesting.la \ | ||
55 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | ||
56 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
57 | $(LTLIBINTL) | ||
58 | libgnunettestingdhtu_la_LDFLAGS = \ | ||
59 | $(GN_LIB_LDFLAGS) \ | ||
60 | -version-info 0:0:0 | ||
61 | |||
62 | |||
63 | |||
64 | test_dhtu_ip_SOURCES = \ | ||
65 | test_dhtu_ip.c | ||
66 | test_dhtu_ip_LDADD = \ | ||
67 | $(top_builddir)/src/service/testing/libgnunettesting.la \ | ||
68 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | ||
69 | $(top_builddir)/src/lib/util/libgnunetutil.la | ||
70 | |||
71 | check_PROGRAMS = \ | ||
72 | test_dhtu_ip | ||
73 | |||
74 | EXTRA_DIST = \ | ||
75 | dhtu.conf | ||
76 | |||
77 | if ENABLE_TEST_RUN | ||
78 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | ||
79 | TESTS = \ | ||
80 | $(check_PROGRAMS) | ||
81 | endif | ||
diff --git a/src/service/dhtu/meson.build b/src/service/dhtu/meson.build deleted file mode 100644 index a3c5b0e0a..000000000 --- a/src/service/dhtu/meson.build +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | libgnunetplugindhtuip_src = ['plugin_dhtu_ip.c'] | ||
2 | libgnunetplugindhtugnunet_src = ['plugin_dhtu_gnunet.c'] | ||
3 | |||
4 | configure_file(input : 'dhtu.conf', | ||
5 | output : 'dhtu.conf', | ||
6 | configuration : cdata, | ||
7 | install: true, | ||
8 | install_dir: pkgcfgdir) | ||
9 | |||
10 | if get_option('monolith') | ||
11 | foreach p : libgnunetplugindhtuip_src + libgnunetplugindhtugnunet_src | ||
12 | gnunet_src += 'dhtu/' + p | ||
13 | endforeach | ||
14 | endif | ||
15 | |||
16 | libgnunettestingdhtu = library('gnunettestingdhtu', | ||
17 | ['testing_dhtu_cmd_send.c'], | ||
18 | soversion: '0', | ||
19 | version: '0.0.0', | ||
20 | dependencies: [ | ||
21 | libgnunetutil_dep, | ||
22 | libgnunetarm_dep, | ||
23 | libgnunettesting_dep | ||
24 | ], | ||
25 | include_directories: [incdir, configuration_inc], | ||
26 | install: true, | ||
27 | install_dir: get_option('libdir')) | ||
28 | libgnunettestingdhtu_dep = declare_dependency(link_with : libgnunettestingdhtu) | ||
29 | |||
30 | shared_module('gnunet_plugin_dhtu_ip', | ||
31 | libgnunetplugindhtuip_src, | ||
32 | dependencies: [libgnunetutil_dep, m_dep], | ||
33 | include_directories: [incdir, configuration_inc], | ||
34 | install: true, | ||
35 | install_dir: get_option('libdir')/'gnunet') | ||
36 | |||
37 | shared_module('gnunet_plugin_dhtu_gnunet', | ||
38 | libgnunetplugindhtugnunet_src, | ||
39 | dependencies: [libgnunetutil_dep, | ||
40 | m_dep, | ||
41 | libgnunetcore_dep, | ||
42 | libgnunethello_dep, | ||
43 | libgnunetpeerstore_dep, | ||
44 | libgnunettransportapplication_dep, | ||
45 | libgnunetnse_dep, | ||
46 | ], | ||
47 | include_directories: [incdir, configuration_inc], | ||
48 | install: true, | ||
49 | install_dir: get_option('libdir')/'gnunet') | ||
50 | |||
51 | testdhtu_ip = executable('test_dhtu_ip', | ||
52 | ['test_dhtu_ip.c'], | ||
53 | dependencies: [libgnunetutil_dep, | ||
54 | libgnunettesting_dep], | ||
55 | include_directories: [incdir, configuration_inc], | ||
56 | install: false) | ||
57 | |||
58 | test('test_dhtu_ip', testdhtu_ip, suite: 'dhtu', | ||
59 | workdir: meson.current_build_dir()) | ||
60 | |||
61 | |||