diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2023-10-18 19:35:11 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2023-10-18 19:35:11 +0200 |
commit | ddfee3f564bff9c5d5719af3132d7869b8783ec4 (patch) | |
tree | e6fd7801fe6808797f3418bf081ab68d5a5ec27b | |
parent | 852718c2473e41bc01ada0d53ad93c7da78e6ec8 (diff) | |
download | gnunet-ddfee3f564bff9c5d5719af3132d7869b8783ec4.tar.gz gnunet-ddfee3f564bff9c5d5719af3132d7869b8783ec4.zip |
BUILD: more more components into new structure; ftbfs fix
-rw-r--r-- | configure.ac | 23 | ||||
-rw-r--r-- | po/POTFILES.in | 92 | ||||
-rw-r--r-- | src/Makefile.am | 5 | ||||
-rw-r--r-- | src/cadet/Makefile.am | 8 | ||||
-rw-r--r-- | src/cli/Makefile.am | 5 | ||||
-rw-r--r-- | src/cli/identity/Makefile.am | 2 | ||||
-rw-r--r-- | src/cli/nat/.gitignore | 1 | ||||
-rw-r--r-- | src/cli/nat/Makefile.am | 17 | ||||
-rw-r--r-- | src/cli/nat/gnunet-nat.c (renamed from src/nat/gnunet-nat.c) | 0 | ||||
-rw-r--r-- | src/cli/nse/.gitignore | 1 | ||||
-rw-r--r-- | src/cli/nse/Makefile.am | 19 | ||||
-rw-r--r-- | src/cli/nse/gnunet-nse.c (renamed from src/nse/gnunet-nse.c) | 0 | ||||
-rw-r--r-- | src/cli/statistics/.gitignore | 1 | ||||
-rw-r--r-- | src/cli/statistics/Makefile.am | 40 | ||||
-rw-r--r-- | src/cli/statistics/gnunet-statistics.c (renamed from src/statistics/gnunet-statistics.c) | 2 | ||||
-rw-r--r-- | src/consensus/Makefile.am | 6 | ||||
-rw-r--r-- | src/contrib/service/abd/Makefile.am | 2 | ||||
-rw-r--r-- | src/contrib/service/rps/Makefile.am | 12 | ||||
-rw-r--r-- | src/conversation/Makefile.am | 6 | ||||
-rw-r--r-- | src/datacache/Makefile.am | 20 | ||||
-rw-r--r-- | src/datastore/Makefile.am | 38 | ||||
-rw-r--r-- | src/dht/Makefile.am | 8 | ||||
-rw-r--r-- | src/dns/Makefile.am | 2 | ||||
-rw-r--r-- | src/exit/Makefile.am | 2 | ||||
-rw-r--r-- | src/fs/Makefile.am | 48 | ||||
-rw-r--r-- | src/gns/Makefile.am | 2 | ||||
-rw-r--r-- | src/hostlist/Makefile.am | 12 | ||||
-rw-r--r-- | src/lib/gnsrecord/Makefile.am | 10 | ||||
-rw-r--r-- | src/messenger/Makefile.am | 4 | ||||
-rw-r--r-- | src/namecache/Makefile.am | 16 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 76 | ||||
-rw-r--r-- | src/nat-auto/Makefile.am | 8 | ||||
-rw-r--r-- | src/plugin/dhtu/Makefile.am | 10 | ||||
-rw-r--r-- | src/pt/Makefile.am | 12 | ||||
-rw-r--r-- | src/reclaim/Makefile.am | 2 | ||||
-rw-r--r-- | src/regex/Makefile.am | 20 | ||||
-rw-r--r-- | src/revocation/Makefile.am | 4 | ||||
-rw-r--r-- | src/scalarproduct/Makefile.am | 2 | ||||
-rw-r--r-- | src/secretsharing/Makefile.am | 4 | ||||
-rw-r--r-- | src/service/Makefile.am | 7 | ||||
-rw-r--r-- | src/service/core/Makefile.am | 26 | ||||
-rw-r--r-- | src/service/identity/Makefile.am | 4 | ||||
-rw-r--r-- | src/service/nat/.gitignore (renamed from src/nat/.gitignore) | 0 | ||||
-rw-r--r-- | src/service/nat/Makefile.am (renamed from src/nat/Makefile.am) | 14 | ||||
-rw-r--r-- | src/service/nat/gnunet-helper-nat-client.c (renamed from src/nat/gnunet-helper-nat-client.c) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-helper-nat-server.c (renamed from src/nat/gnunet-helper-nat-server.c) | 0 | ||||
-rwxr-xr-x | src/service/nat/gnunet-nat-client-script.sh (renamed from src/nat/gnunet-nat-client-script.sh) | 0 | ||||
-rwxr-xr-x | src/service/nat/gnunet-nat-server-script.sh (renamed from src/nat/gnunet-nat-server-script.sh) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-service-nat.c (renamed from src/nat/gnunet-service-nat.c) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-service-nat.h (renamed from src/nat/gnunet-service-nat.h) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-service-nat_externalip.c (renamed from src/nat/gnunet-service-nat_externalip.c) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-service-nat_externalip.h (renamed from src/nat/gnunet-service-nat_externalip.h) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-service-nat_helper.c (renamed from src/nat/gnunet-service-nat_helper.c) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-service-nat_helper.h (renamed from src/nat/gnunet-service-nat_helper.h) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-service-nat_mini.c (renamed from src/nat/gnunet-service-nat_mini.c) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-service-nat_mini.h (renamed from src/nat/gnunet-service-nat_mini.h) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-service-nat_stun.c (renamed from src/nat/gnunet-service-nat_stun.c) | 0 | ||||
-rw-r--r-- | src/service/nat/gnunet-service-nat_stun.h (renamed from src/nat/gnunet-service-nat_stun.h) | 0 | ||||
-rw-r--r-- | src/service/nat/meson.build (renamed from src/nat/meson.build) | 0 | ||||
-rw-r--r-- | src/service/nat/nat.conf.in (renamed from src/nat/nat.conf.in) | 0 | ||||
-rw-r--r-- | src/service/nat/nat.h (renamed from src/nat/nat.h) | 0 | ||||
-rw-r--r-- | src/service/nat/nat_api.c (renamed from src/nat/nat_api.c) | 0 | ||||
-rw-r--r-- | src/service/nat/nat_api_stun.c (renamed from src/nat/nat_api_stun.c) | 0 | ||||
-rw-r--r-- | src/service/nat/nat_stun.h (renamed from src/nat/nat_stun.h) | 0 | ||||
-rw-r--r-- | src/service/nat/test_nat.c (renamed from src/nat/test_nat.c) | 0 | ||||
-rw-r--r-- | src/service/nat/test_nat_data.conf (renamed from src/nat/test_nat_data.conf) | 0 | ||||
-rw-r--r-- | src/service/nat/test_nat_mini.c (renamed from src/nat/test_nat_mini.c) | 0 | ||||
-rw-r--r-- | src/service/nat/test_nat_test.c (renamed from src/nat/test_nat_test.c) | 0 | ||||
-rw-r--r-- | src/service/nat/test_nat_test_data.conf (renamed from src/nat/test_nat_test_data.conf) | 0 | ||||
-rw-r--r-- | src/service/nat/test_stun.c (renamed from src/nat/test_stun.c) | 0 | ||||
-rw-r--r-- | src/service/nat/test_stun.conf (renamed from src/nat/test_stun.conf) | 0 | ||||
-rw-r--r-- | src/service/nse/.gitignore (renamed from src/nse/.gitignore) | 0 | ||||
-rw-r--r-- | src/service/nse/Makefile.am (renamed from src/nse/Makefile.am) | 16 | ||||
-rw-r--r-- | src/service/nse/gnunet-nse-profiler.c (renamed from src/nse/gnunet-nse-profiler.c) | 0 | ||||
-rw-r--r-- | src/service/nse/gnunet-service-nse.c (renamed from src/nse/gnunet-service-nse.c) | 0 | ||||
-rw-r--r-- | src/service/nse/hostkeys.dat (renamed from src/nse/hostkeys.dat) | bin | 10389438 -> 10389438 bytes | |||
-rw-r--r-- | src/service/nse/meson.build (renamed from src/nse/meson.build) | 0 | ||||
-rw-r--r-- | src/service/nse/nse.conf.in (renamed from src/nse/nse.conf.in) | 0 | ||||
-rw-r--r-- | src/service/nse/nse.h (renamed from src/nse/nse.h) | 0 | ||||
-rw-r--r-- | src/service/nse/nse_api.c (renamed from src/nse/nse_api.c) | 0 | ||||
-rw-r--r-- | src/service/nse/nse_infiniband.conf (renamed from src/nse/nse_infiniband.conf) | 0 | ||||
-rw-r--r-- | src/service/nse/nse_profiler_test.conf (renamed from src/nse/nse_profiler_test.conf) | 0 | ||||
-rw-r--r-- | src/service/nse/perf_kdf.c (renamed from src/nse/perf_kdf.c) | 0 | ||||
-rw-r--r-- | src/service/nse/test_nse.conf (renamed from src/nse/test_nse.conf) | 0 | ||||
-rw-r--r-- | src/service/nse/test_nse_api.c (renamed from src/nse/test_nse_api.c) | 0 | ||||
-rw-r--r-- | src/service/nse/test_nse_multipeer.c (renamed from src/nse/test_nse_multipeer.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/.gitignore (renamed from src/peerstore/.gitignore) | 0 | ||||
-rw-r--r-- | src/service/peerstore/Makefile.am (renamed from src/peerstore/Makefile.am) | 14 | ||||
-rw-r--r-- | src/service/peerstore/gnunet-peerstore.c (renamed from src/peerstore/gnunet-peerstore.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/gnunet-service-peerstore.c (renamed from src/peerstore/gnunet-service-peerstore.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/meson.build (renamed from src/peerstore/meson.build) | 0 | ||||
-rw-r--r-- | src/service/peerstore/peerstore.conf.in (renamed from src/peerstore/peerstore.conf.in) | 0 | ||||
-rw-r--r-- | src/service/peerstore/peerstore.h (renamed from src/peerstore/peerstore.h) | 0 | ||||
-rw-r--r-- | src/service/peerstore/peerstore_api.c (renamed from src/peerstore/peerstore_api.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/peerstore_common.c (renamed from src/peerstore/peerstore_common.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/peerstore_common.h (renamed from src/peerstore/peerstore_common.h) | 0 | ||||
-rw-r--r-- | src/service/peerstore/perf_peerstore_store.c (renamed from src/peerstore/perf_peerstore_store.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/plugin_peerstore_flat.c (renamed from src/peerstore/plugin_peerstore_flat.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/plugin_peerstore_sqlite.c (renamed from src/peerstore/plugin_peerstore_sqlite.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/test_peerstore_api_data.conf (renamed from src/peerstore/test_peerstore_api_data.conf) | 0 | ||||
-rw-r--r-- | src/service/peerstore/test_peerstore_api_iterate.c (renamed from src/peerstore/test_peerstore_api_iterate.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/test_peerstore_api_store.c (renamed from src/peerstore/test_peerstore_api_store.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/test_peerstore_api_sync.c (renamed from src/peerstore/test_peerstore_api_sync.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/test_peerstore_api_watch.c (renamed from src/peerstore/test_peerstore_api_watch.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/test_plugin_peerstore.c (renamed from src/peerstore/test_plugin_peerstore.c) | 0 | ||||
-rw-r--r-- | src/service/peerstore/test_plugin_peerstore_flat.conf (renamed from src/peerstore/test_plugin_peerstore_flat.conf) | 0 | ||||
-rw-r--r-- | src/service/peerstore/test_plugin_peerstore_sqlite.conf (renamed from src/peerstore/test_plugin_peerstore_sqlite.conf) | 0 | ||||
-rw-r--r-- | src/service/statistics/.gitignore (renamed from src/statistics/.gitignore) | 0 | ||||
-rw-r--r-- | src/service/statistics/Makefile.am (renamed from src/statistics/Makefile.am) | 45 | ||||
-rw-r--r-- | src/service/statistics/gnunet-service-statistics.c (renamed from src/statistics/gnunet-service-statistics.c) | 0 | ||||
-rw-r--r-- | src/service/statistics/meson.build (renamed from src/statistics/meson.build) | 0 | ||||
-rw-r--r-- | src/service/statistics/statistics.conf.in (renamed from src/statistics/statistics.conf.in) | 0 | ||||
-rw-r--r-- | src/service/statistics/statistics.h (renamed from src/statistics/statistics.h) | 0 | ||||
-rw-r--r-- | src/service/statistics/statistics_api.c (renamed from src/statistics/statistics_api.c) | 0 | ||||
-rw-r--r-- | src/service/statistics/test_gnunet_statistics.py.in (renamed from src/statistics/test_gnunet_statistics.py.in) | 0 | ||||
-rw-r--r-- | src/service/statistics/test_statistics_api.c (renamed from src/statistics/test_statistics_api.c) | 0 | ||||
-rw-r--r-- | src/service/statistics/test_statistics_api_data.conf (renamed from src/statistics/test_statistics_api_data.conf) | 0 | ||||
-rw-r--r-- | src/service/statistics/test_statistics_api_loop.c (renamed from src/statistics/test_statistics_api_loop.c) | 0 | ||||
-rw-r--r-- | src/service/statistics/test_statistics_api_watch.c (renamed from src/statistics/test_statistics_api_watch.c) | 0 | ||||
-rw-r--r-- | src/service/statistics/test_statistics_api_watch_zero_value.c (renamed from src/statistics/test_statistics_api_watch_zero_value.c) | 0 | ||||
-rw-r--r-- | src/service/transport/.gitignore (renamed from src/transport/.gitignore) | 0 | ||||
-rw-r--r-- | src/service/transport/Makefile.am (renamed from src/transport/Makefile.am) | 96 | ||||
-rw-r--r-- | src/service/transport/NOTES (renamed from src/transport/NOTES) | 0 | ||||
-rwxr-xr-x | src/service/transport/benchmark.sh (renamed from src/transport/benchmark.sh) | 0 | ||||
-rw-r--r-- | src/service/transport/communicator.h (renamed from src/transport/communicator.h) | 0 | ||||
-rw-r--r-- | src/service/transport/gnunet-communicator-quic.c (renamed from src/transport/gnunet-communicator-quic.c) | 0 | ||||
-rw-r--r-- | src/service/transport/gnunet-communicator-tcp.c (renamed from src/transport/gnunet-communicator-tcp.c) | 0 | ||||
-rw-r--r-- | src/service/transport/gnunet-communicator-udp.c (renamed from src/transport/gnunet-communicator-udp.c) | 0 | ||||
-rw-r--r-- | src/service/transport/gnunet-communicator-unix.c (renamed from src/transport/gnunet-communicator-unix.c) | 0 | ||||
-rw-r--r-- | src/service/transport/gnunet-service-transport.c (renamed from src/transport/gnunet-service-transport.c) | 0 | ||||
-rw-r--r-- | src/service/transport/gnunet-service-transport.h (renamed from src/transport/gnunet-service-transport.h) | 0 | ||||
-rw-r--r-- | src/service/transport/gnunet-transport-certificate-creation.in (renamed from src/transport/gnunet-transport-certificate-creation.in) | 0 | ||||
-rw-r--r-- | src/service/transport/gnunet-transport.c (renamed from src/transport/gnunet-transport.c) | 0 | ||||
-rw-r--r-- | src/service/transport/ieee80211_radiotap.h (renamed from src/transport/ieee80211_radiotap.h) | 0 | ||||
-rw-r--r-- | src/service/transport/meson.build (renamed from src/transport/meson.build) | 0 | ||||
-rw-r--r-- | src/service/transport/template_cfg_peer1.conf (renamed from src/transport/template_cfg_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/template_cfg_peer2.conf (renamed from src/transport/template_cfg_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/template_tng_cfg_peer1.conf (renamed from src/transport/template_tng_cfg_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_basic.c (renamed from src/transport/test_communicator_basic.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_quic_basic_peer1.conf (renamed from src/transport/test_communicator_quic_basic_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_quic_basic_peer2.conf (renamed from src/transport/test_communicator_quic_basic_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_tcp_basic_peer1.conf (renamed from src/transport/test_communicator_tcp_basic_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_tcp_basic_peer2.conf (renamed from src/transport/test_communicator_tcp_basic_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_tcp_bidirect_peer1.conf (renamed from src/transport/test_communicator_tcp_bidirect_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_tcp_bidirect_peer2.conf (renamed from src/transport/test_communicator_tcp_bidirect_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_tcp_rekey_peer1.conf (renamed from src/transport/test_communicator_tcp_rekey_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_tcp_rekey_peer2.conf (renamed from src/transport/test_communicator_tcp_rekey_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_udp_backchannel_peer1.conf (renamed from src/transport/test_communicator_udp_backchannel_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_udp_backchannel_peer2.conf (renamed from src/transport/test_communicator_udp_backchannel_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_udp_basic_peer1.conf (renamed from src/transport/test_communicator_udp_basic_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_udp_basic_peer2.conf (renamed from src/transport/test_communicator_udp_basic_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_udp_rekey_peer1.conf (renamed from src/transport/test_communicator_udp_rekey_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_udp_rekey_peer2.conf (renamed from src/transport/test_communicator_udp_rekey_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_unix_basic_peer1.conf (renamed from src/transport/test_communicator_unix_basic_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_communicator_unix_basic_peer2.conf (renamed from src/transport/test_communicator_unix_basic_peer2.conf) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_delay (renamed from src/transport/test_delay) | 0 | ||||
-rw-r--r-- | src/service/transport/test_plugin_hostkey (renamed from src/transport/test_plugin_hostkey) | bin | 915 -> 915 bytes | |||
-rw-r--r-- | src/service/transport/test_plugin_hostkey.ecc (renamed from src/transport/test_plugin_hostkey.ecc) | 0 | ||||
-rw-r--r-- | src/service/transport/test_tng_defaults.conf (renamed from src/transport/test_tng_defaults.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_address_switch.c (renamed from src/transport/test_transport_address_switch.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_address_switch_tcp_peer1.conf (renamed from src/transport/test_transport_address_switch_tcp_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_address_switch_tcp_peer2.conf (renamed from src/transport/test_transport_address_switch_tcp_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_address_switch_udp_peer1.conf (renamed from src/transport/test_transport_address_switch_udp_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_address_switch_udp_peer2.conf (renamed from src/transport/test_transport_address_switch_udp_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api.c (renamed from src/transport/test_transport_api.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api2.c (renamed from src/transport/test_transport_api2.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api2_tcp_node1.conf (renamed from src/transport/test_transport_api2_tcp_node1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api2_tcp_node2.conf (renamed from src/transport/test_transport_api2_tcp_node2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api2_tcp_peer1.conf (renamed from src/transport/test_transport_api2_tcp_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api2_tcp_peer2.conf (renamed from src/transport/test_transport_api2_tcp_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api2_tng_node.conf (renamed from src/transport/test_transport_api2_tng_node.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_data.conf (renamed from src/transport/test_transport_api_data.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_monitor_peers.c (renamed from src/transport/test_transport_api_monitor_peers.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_monitor_peers_peer1.conf (renamed from src/transport/test_transport_api_monitor_peers_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_monitor_peers_peer2.conf (renamed from src/transport/test_transport_api_monitor_peers_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_monitor_validation_peer1.conf (renamed from src/transport/test_transport_api_monitor_validation_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_monitor_validation_peer2.conf (renamed from src/transport/test_transport_api_monitor_validation_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_multi_peer1.conf (renamed from src/transport/test_transport_api_multi_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_multi_peer2.conf (renamed from src/transport/test_transport_api_multi_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_tcp_nat_peer1.conf (renamed from src/transport/test_transport_api_tcp_nat_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_tcp_nat_peer2.conf (renamed from src/transport/test_transport_api_tcp_nat_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_tcp_peer1.conf (renamed from src/transport/test_transport_api_tcp_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_tcp_peer2.conf (renamed from src/transport/test_transport_api_tcp_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_udp_nat_peer1.conf (renamed from src/transport/test_transport_api_udp_nat_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_udp_nat_peer2.conf (renamed from src/transport/test_transport_api_udp_nat_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_udp_peer1.conf (renamed from src/transport/test_transport_api_udp_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_udp_peer2.conf (renamed from src/transport/test_transport_api_udp_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_unix_peer1.conf (renamed from src/transport/test_transport_api_unix_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_api_unix_peer2.conf (renamed from src/transport/test_transport_api_unix_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_defaults.conf (renamed from src/transport/test_transport_defaults.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_distance_vector_circle_topo.conf (renamed from src/transport/test_transport_distance_vector_circle_topo.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_distance_vector_inverse_topo.conf (renamed from src/transport/test_transport_distance_vector_inverse_topo.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_distance_vector_topo.conf (renamed from src/transport/test_transport_distance_vector_topo.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_just_run_topo.conf (renamed from src/transport/test_transport_just_run_topo.conf) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_transport_nat_icmp_tcp.sh (renamed from src/transport/test_transport_nat_icmp_tcp.sh) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_nat_icmp_tcp_topo.conf (renamed from src/transport/test_transport_nat_icmp_tcp_topo.conf) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_transport_nat_upnp.sh (renamed from src/transport/test_transport_nat_upnp.sh) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_nat_upnp_topo.conf (renamed from src/transport/test_transport_nat_upnp_topo.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_plugin_cmd_just_run.c (renamed from src/transport/test_transport_plugin_cmd_just_run.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_plugin_cmd_nat_upnp.c (renamed from src/transport/test_transport_plugin_cmd_nat_upnp.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_plugin_cmd_simple_send.c (renamed from src/transport/test_transport_plugin_cmd_simple_send.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_plugin_cmd_simple_send_broadcast.c (renamed from src/transport/test_transport_plugin_cmd_simple_send_broadcast.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_plugin_cmd_simple_send_dv.c (renamed from src/transport/test_transport_plugin_cmd_simple_send_dv.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_plugin_cmd_simple_send_performance.c (renamed from src/transport/test_transport_plugin_cmd_simple_send_performance.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_plugin_cmd_udp_backchannel.c (renamed from src/transport/test_transport_plugin_cmd_udp_backchannel.c) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_transport_simple_send.sh (renamed from src/transport/test_transport_simple_send.sh) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_transport_simple_send_broadcast.sh (renamed from src/transport/test_transport_simple_send_broadcast.sh) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_simple_send_broadcast_topo.conf (renamed from src/transport/test_transport_simple_send_broadcast_topo.conf) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_transport_simple_send_dv_circle.sh (renamed from src/transport/test_transport_simple_send_dv_circle.sh) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_transport_simple_send_dv_inverse.sh (renamed from src/transport/test_transport_simple_send_dv_inverse.sh) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_transport_simple_send_performance.sh (renamed from src/transport/test_transport_simple_send_performance.sh) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_simple_send_performance_topo.conf (renamed from src/transport/test_transport_simple_send_performance_topo.conf) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_transport_simple_send_string.sh (renamed from src/transport/test_transport_simple_send_string.sh) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_simple_send_topo.conf (renamed from src/transport/test_transport_simple_send_topo.conf) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_transport_start_testcase.sh (renamed from src/transport/test_transport_start_testcase.sh) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_start_with_config.c (renamed from src/transport/test_transport_start_with_config.c) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_test_transport_address_switch_tcp_peer1.conf (renamed from src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_test_transport_address_switch_tcp_peer2.conf (renamed from src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_testing_startstop.c (renamed from src/transport/test_transport_testing_startstop.c) | 0 | ||||
-rwxr-xr-x | src/service/transport/test_transport_udp_backchannel.sh (renamed from src/transport/test_transport_udp_backchannel.sh) | 0 | ||||
-rw-r--r-- | src/service/transport/test_transport_udp_backchannel_topo.conf (renamed from src/transport/test_transport_udp_backchannel_topo.conf) | 0 | ||||
-rw-r--r-- | src/service/transport/transport-testing-cmds.h (renamed from src/transport/transport-testing-cmds.h) | 0 | ||||
-rw-r--r-- | src/service/transport/transport-testing-communicator.c (renamed from src/transport/transport-testing-communicator.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport-testing-communicator.h (renamed from src/transport/transport-testing-communicator.h) | 0 | ||||
-rw-r--r-- | src/service/transport/transport-testing-filenames2.c (renamed from src/transport/transport-testing-filenames2.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport-testing-loggers2.c (renamed from src/transport/transport-testing-loggers2.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport-testing-main2.c (renamed from src/transport/transport-testing-main2.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport-testing-send2.c (renamed from src/transport/transport-testing-send2.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport-testing2.c (renamed from src/transport/transport-testing2.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport-testing2.h (renamed from src/transport/transport-testing2.h) | 0 | ||||
-rw-r--r-- | src/service/transport/transport.conf.in (renamed from src/transport/transport.conf.in) | 0 | ||||
-rw-r--r-- | src/service/transport/transport.h (renamed from src/transport/transport.h) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api2_application.c (renamed from src/transport/transport_api2_application.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api2_communication.c (renamed from src/transport/transport_api2_communication.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api2_core.c (renamed from src/transport/transport_api2_core.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api2_monitor.c (renamed from src/transport/transport_api2_monitor.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api_cmd_backchannel_check.c (renamed from src/transport/transport_api_cmd_backchannel_check.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api_cmd_connecting_peers.c (renamed from src/transport/transport_api_cmd_connecting_peers.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api_cmd_send_simple.c (renamed from src/transport/transport_api_cmd_send_simple.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api_cmd_send_simple_performance.c (renamed from src/transport/transport_api_cmd_send_simple_performance.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api_cmd_start_peer.c (renamed from src/transport/transport_api_cmd_start_peer.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api_cmd_stop_peer.c (renamed from src/transport/transport_api_cmd_stop_peer.c) | 0 | ||||
-rw-r--r-- | src/service/transport/transport_api_traits.c (renamed from src/transport/transport_api_traits.c) | 0 | ||||
-rwxr-xr-x | src/service/transport/upnp.sh (renamed from src/transport/upnp.sh) | 0 | ||||
-rw-r--r-- | src/set/Makefile.am | 14 | ||||
-rw-r--r-- | src/seti/Makefile.am | 8 | ||||
-rw-r--r-- | src/setu/Makefile.am | 10 | ||||
-rw-r--r-- | src/topology/Makefile.am | 8 | ||||
-rw-r--r-- | src/vpn/Makefile.am | 2 | ||||
-rw-r--r-- | src/zonemaster/Makefile.am | 2 |
250 files changed, 432 insertions, 376 deletions
diff --git a/configure.ac b/configure.ac index 2004b6acc..1f6724a83 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1248,8 +1248,18 @@ src/service/core/Makefile | |||
1248 | src/service/core/core.conf | 1248 | src/service/core/core.conf |
1249 | src/service/identity/Makefile | 1249 | src/service/identity/Makefile |
1250 | src/service/identity/identity.conf | 1250 | src/service/identity/identity.conf |
1251 | src/service/nat/Makefile | ||
1252 | src/service/nat/nat.conf | ||
1253 | src/service/nse/Makefile | ||
1254 | src/service/nse/nse.conf | ||
1255 | src/service/peerstore/Makefile | ||
1256 | src/service/peerstore/peerstore.conf | ||
1251 | src/service/rest/Makefile | 1257 | src/service/rest/Makefile |
1258 | src/service/statistics/Makefile | ||
1259 | src/service/statistics/statistics.conf | ||
1252 | src/service/testing/Makefile | 1260 | src/service/testing/Makefile |
1261 | src/service/transport/Makefile | ||
1262 | src/service/transport/transport.conf | ||
1253 | src/service/util/Makefile | 1263 | src/service/util/Makefile |
1254 | src/rest-plugin/Makefile | 1264 | src/rest-plugin/Makefile |
1255 | src/rest-plugin/identity/Makefile | 1265 | src/rest-plugin/identity/Makefile |
@@ -1257,6 +1267,9 @@ src/rest-plugin/rest/Makefile | |||
1257 | src/cli/Makefile | 1267 | src/cli/Makefile |
1258 | src/cli/arm/Makefile | 1268 | src/cli/arm/Makefile |
1259 | src/cli/core/Makefile | 1269 | src/cli/core/Makefile |
1270 | src/cli/nat/Makefile | ||
1271 | src/cli/nse/Makefile | ||
1272 | src/cli/statistics/Makefile | ||
1260 | src/cli/util/Makefile | 1273 | src/cli/util/Makefile |
1261 | src/contrib/Makefile | 1274 | src/contrib/Makefile |
1262 | src/contrib/service/Makefile | 1275 | src/contrib/service/Makefile |
@@ -1292,14 +1305,8 @@ src/namecache/Makefile | |||
1292 | src/namecache/namecache.conf | 1305 | src/namecache/namecache.conf |
1293 | src/namestore/Makefile | 1306 | src/namestore/Makefile |
1294 | src/namestore/namestore.conf | 1307 | src/namestore/namestore.conf |
1295 | src/nat/Makefile | ||
1296 | src/nat/nat.conf | ||
1297 | src/nat-auto/Makefile | 1308 | src/nat-auto/Makefile |
1298 | src/nat-auto/nat-auto.conf | 1309 | src/nat-auto/nat-auto.conf |
1299 | src/nse/Makefile | ||
1300 | src/nse/nse.conf | ||
1301 | src/peerstore/Makefile | ||
1302 | src/peerstore/peerstore.conf | ||
1303 | src/pt/Makefile | 1310 | src/pt/Makefile |
1304 | src/regex/Makefile | 1311 | src/regex/Makefile |
1305 | src/regex/regex.conf | 1312 | src/regex/regex.conf |
@@ -1315,12 +1322,8 @@ src/seti/Makefile | |||
1315 | src/seti/seti.conf | 1322 | src/seti/seti.conf |
1316 | src/setu/Makefile | 1323 | src/setu/Makefile |
1317 | src/setu/setu.conf | 1324 | src/setu/setu.conf |
1318 | src/statistics/Makefile | ||
1319 | src/statistics/statistics.conf | ||
1320 | src/template/Makefile | 1325 | src/template/Makefile |
1321 | src/topology/Makefile | 1326 | src/topology/Makefile |
1322 | src/transport/Makefile | ||
1323 | src/transport/transport.conf | ||
1324 | src/vpn/Makefile | 1327 | src/vpn/Makefile |
1325 | src/vpn/vpn.conf | 1328 | src/vpn/vpn.conf |
1326 | src/zonemaster/Makefile | 1329 | src/zonemaster/Makefile |
diff --git a/po/POTFILES.in b/po/POTFILES.in index e2a94ed63..847b756c2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -20,6 +20,8 @@ src/cadet/gnunet-service-cadet_tunnels.c | |||
20 | src/cli/arm/gnunet-arm.c | 20 | src/cli/arm/gnunet-arm.c |
21 | src/cli/core/gnunet-core.c | 21 | src/cli/core/gnunet-core.c |
22 | src/cli/identity/gnunet-identity.c | 22 | src/cli/identity/gnunet-identity.c |
23 | src/cli/nat/gnunet-nat.c | ||
24 | src/cli/nse/gnunet-nse.c | ||
23 | src/cli/util/gnunet-base32.c | 25 | src/cli/util/gnunet-base32.c |
24 | src/cli/util/gnunet-config-diff.c | 26 | src/cli/util/gnunet-config-diff.c |
25 | src/cli/util/gnunet-config.c | 27 | src/cli/util/gnunet-config.c |
@@ -320,26 +322,6 @@ src/nat-auto/gnunet-service-nat-auto.c | |||
320 | src/nat-auto/gnunet-service-nat-auto_legacy.c | 322 | src/nat-auto/gnunet-service-nat-auto_legacy.c |
321 | src/nat-auto/nat_auto_api.c | 323 | src/nat-auto/nat_auto_api.c |
322 | src/nat-auto/nat_auto_api_test.c | 324 | src/nat-auto/nat_auto_api_test.c |
323 | src/nat/gnunet-helper-nat-client.c | ||
324 | src/nat/gnunet-helper-nat-server.c | ||
325 | src/nat/gnunet-nat.c | ||
326 | src/nat/gnunet-service-nat.c | ||
327 | src/nat/gnunet-service-nat_externalip.c | ||
328 | src/nat/gnunet-service-nat_helper.c | ||
329 | src/nat/gnunet-service-nat_mini.c | ||
330 | src/nat/gnunet-service-nat_stun.c | ||
331 | src/nat/nat_api.c | ||
332 | src/nat/nat_api_stun.c | ||
333 | src/nse/gnunet-nse-profiler.c | ||
334 | src/nse/gnunet-nse.c | ||
335 | src/nse/gnunet-service-nse.c | ||
336 | src/nse/nse_api.c | ||
337 | src/peerstore/gnunet-peerstore.c | ||
338 | src/peerstore/gnunet-service-peerstore.c | ||
339 | src/peerstore/peerstore_api.c | ||
340 | src/peerstore/peerstore_common.c | ||
341 | src/peerstore/plugin_peerstore_flat.c | ||
342 | src/peerstore/plugin_peerstore_sqlite.c | ||
343 | src/plugin/block/plugin_block_template.c | 325 | src/plugin/block/plugin_block_template.c |
344 | src/plugin/block/plugin_block_test.c | 326 | src/plugin/block/plugin_block_test.c |
345 | src/plugin/dhtu/plugin_dhtu_gnunet.c | 327 | src/plugin/dhtu/plugin_dhtu_gnunet.c |
@@ -414,8 +396,29 @@ src/service/identity/gnunet-service-identity.c | |||
414 | src/service/identity/identity_api.c | 396 | src/service/identity/identity_api.c |
415 | src/service/identity/identity_api_lookup.c | 397 | src/service/identity/identity_api_lookup.c |
416 | src/service/identity/identity_api_suffix_lookup.c | 398 | src/service/identity/identity_api_suffix_lookup.c |
399 | src/service/nat/gnunet-helper-nat-client.c | ||
400 | src/service/nat/gnunet-helper-nat-server.c | ||
401 | src/service/nat/gnunet-service-nat.c | ||
402 | src/service/nat/gnunet-service-nat_externalip.c | ||
403 | src/service/nat/gnunet-service-nat_helper.c | ||
404 | src/service/nat/gnunet-service-nat_mini.c | ||
405 | src/service/nat/gnunet-service-nat_stun.c | ||
406 | src/service/nat/nat_api.c | ||
407 | src/service/nat/nat_api_stun.c | ||
408 | src/service/nse/gnunet-nse-profiler.c | ||
409 | src/service/nse/gnunet-service-nse.c | ||
410 | src/service/nse/nse_api.c | ||
411 | src/service/peerstore/gnunet-peerstore.c | ||
412 | src/service/peerstore/gnunet-service-peerstore.c | ||
413 | src/service/peerstore/peerstore_api.c | ||
414 | src/service/peerstore/peerstore_common.c | ||
415 | src/service/peerstore/plugin_peerstore_flat.c | ||
416 | src/service/peerstore/plugin_peerstore_sqlite.c | ||
417 | src/service/rest/gnunet-rest-server.c | 417 | src/service/rest/gnunet-rest-server.c |
418 | src/service/rest/rest.c | 418 | src/service/rest/rest.c |
419 | src/service/statistics/gnunet-service-statistics.c | ||
420 | src/service/statistics/gnunet-statistics.c | ||
421 | src/service/statistics/statistics_api.c | ||
419 | src/service/testing/gnunet-cmds-helper.c | 422 | src/service/testing/gnunet-cmds-helper.c |
420 | src/service/testing/gnunet-testing.c | 423 | src/service/testing/gnunet-testing.c |
421 | src/service/testing/list-keys.c | 424 | src/service/testing/list-keys.c |
@@ -438,6 +441,29 @@ src/service/testing/testing_api_cmd_system_create.c | |||
438 | src/service/testing/testing_api_cmd_system_destroy.c | 441 | src/service/testing/testing_api_cmd_system_destroy.c |
439 | src/service/testing/testing_api_loop.c | 442 | src/service/testing/testing_api_loop.c |
440 | src/service/testing/testing_api_traits.c | 443 | src/service/testing/testing_api_traits.c |
444 | src/service/transport/gnunet-communicator-quic.c | ||
445 | src/service/transport/gnunet-communicator-tcp.c | ||
446 | src/service/transport/gnunet-communicator-udp.c | ||
447 | src/service/transport/gnunet-communicator-unix.c | ||
448 | src/service/transport/gnunet-service-transport.c | ||
449 | src/service/transport/gnunet-transport.c | ||
450 | src/service/transport/transport-testing-communicator.c | ||
451 | src/service/transport/transport-testing-filenames2.c | ||
452 | src/service/transport/transport-testing-loggers2.c | ||
453 | src/service/transport/transport-testing-main2.c | ||
454 | src/service/transport/transport-testing-send2.c | ||
455 | src/service/transport/transport-testing2.c | ||
456 | src/service/transport/transport_api2_application.c | ||
457 | src/service/transport/transport_api2_communication.c | ||
458 | src/service/transport/transport_api2_core.c | ||
459 | src/service/transport/transport_api2_monitor.c | ||
460 | src/service/transport/transport_api_cmd_backchannel_check.c | ||
461 | src/service/transport/transport_api_cmd_connecting_peers.c | ||
462 | src/service/transport/transport_api_cmd_send_simple.c | ||
463 | src/service/transport/transport_api_cmd_send_simple_performance.c | ||
464 | src/service/transport/transport_api_cmd_start_peer.c | ||
465 | src/service/transport/transport_api_cmd_stop_peer.c | ||
466 | src/service/transport/transport_api_traits.c | ||
441 | src/service/util/gnunet-service-resolver.c | 467 | src/service/util/gnunet-service-resolver.c |
442 | src/set/gnunet-service-set.c | 468 | src/set/gnunet-service-set.c |
443 | src/set/gnunet-service-set_intersection.c | 469 | src/set/gnunet-service-set_intersection.c |
@@ -461,9 +487,6 @@ src/setu/ibf.c | |||
461 | src/setu/ibf_sim.c | 487 | src/setu/ibf_sim.c |
462 | src/setu/plugin_block_setu_test.c | 488 | src/setu/plugin_block_setu_test.c |
463 | src/setu/setu_api.c | 489 | src/setu/setu_api.c |
464 | src/statistics/gnunet-service-statistics.c | ||
465 | src/statistics/gnunet-statistics.c | ||
466 | src/statistics/statistics_api.c | ||
467 | src/template/gnunet-service-template.c | 490 | src/template/gnunet-service-template.c |
468 | src/template/gnunet-template.c | 491 | src/template/gnunet-template.c |
469 | src/test/dhtu/testing_dhtu_cmd_send.c | 492 | src/test/dhtu/testing_dhtu_cmd_send.c |
@@ -490,29 +513,6 @@ src/test/testing/testing_api_cmd_system_destroy.c | |||
490 | src/test/testing/testing_api_loop.c | 513 | src/test/testing/testing_api_loop.c |
491 | src/test/testing/testing_api_traits.c | 514 | src/test/testing/testing_api_traits.c |
492 | src/topology/gnunet-daemon-topology.c | 515 | src/topology/gnunet-daemon-topology.c |
493 | src/transport/gnunet-communicator-quic.c | ||
494 | src/transport/gnunet-communicator-tcp.c | ||
495 | src/transport/gnunet-communicator-udp.c | ||
496 | src/transport/gnunet-communicator-unix.c | ||
497 | src/transport/gnunet-service-transport.c | ||
498 | src/transport/gnunet-transport.c | ||
499 | src/transport/transport-testing-communicator.c | ||
500 | src/transport/transport-testing-filenames2.c | ||
501 | src/transport/transport-testing-loggers2.c | ||
502 | src/transport/transport-testing-main2.c | ||
503 | src/transport/transport-testing-send2.c | ||
504 | src/transport/transport-testing2.c | ||
505 | src/transport/transport_api2_application.c | ||
506 | src/transport/transport_api2_communication.c | ||
507 | src/transport/transport_api2_core.c | ||
508 | src/transport/transport_api2_monitor.c | ||
509 | src/transport/transport_api_cmd_backchannel_check.c | ||
510 | src/transport/transport_api_cmd_connecting_peers.c | ||
511 | src/transport/transport_api_cmd_send_simple.c | ||
512 | src/transport/transport_api_cmd_send_simple_performance.c | ||
513 | src/transport/transport_api_cmd_start_peer.c | ||
514 | src/transport/transport_api_cmd_stop_peer.c | ||
515 | src/transport/transport_api_traits.c | ||
516 | src/vpn/gnunet-helper-vpn.c | 516 | src/vpn/gnunet-helper-vpn.c |
517 | src/vpn/gnunet-service-vpn.c | 517 | src/vpn/gnunet-service-vpn.c |
518 | src/vpn/gnunet-vpn.c | 518 | src/vpn/gnunet-vpn.c |
diff --git a/src/Makefile.am b/src/Makefile.am index 9b7f9c367..c7d7b562a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -17,15 +17,10 @@ SUBDIRS = \ | |||
17 | rest-plugin \ | 17 | rest-plugin \ |
18 | cli \ | 18 | cli \ |
19 | contrib \ | 19 | contrib \ |
20 | statistics \ | ||
21 | datacache \ | 20 | datacache \ |
22 | datastore \ | 21 | datastore \ |
23 | template \ | 22 | template \ |
24 | peerstore \ | ||
25 | nat \ | ||
26 | nat-auto \ | 23 | nat-auto \ |
27 | transport \ | ||
28 | nse \ | ||
29 | dht \ | 24 | dht \ |
30 | hostlist \ | 25 | hostlist \ |
31 | topology \ | 26 | topology \ |
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am index d366ecd95..217c4847e 100644 --- a/src/cadet/Makefile.am +++ b/src/cadet/Makefile.am | |||
@@ -64,9 +64,9 @@ gnunet_service_cadet_LDADD = \ | |||
64 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 64 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
65 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 65 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
66 | $(top_builddir)/src/dht/libgnunetdht.la \ | 66 | $(top_builddir)/src/dht/libgnunetdht.la \ |
67 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 67 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
68 | $(top_builddir)/src/transport/libgnunettransportapplication.la \ | 68 | $(top_builddir)/src/service/transport/libgnunettransportapplication.la \ |
69 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 69 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
70 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 70 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
71 | $(top_builddir)/src/lib/block/libgnunetblock.la | 71 | $(top_builddir)/src/lib/block/libgnunetblock.la |
72 | if LINUX | 72 | if LINUX |
@@ -79,7 +79,7 @@ test_cadet_local_mq_SOURCES = \ | |||
79 | test_cadet_local_mq.c | 79 | test_cadet_local_mq.c |
80 | test_cadet_local_mq_LDADD = \ | 80 | test_cadet_local_mq_LDADD = \ |
81 | libgnunetcadet.la \ | 81 | libgnunetcadet.la \ |
82 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 82 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
83 | $(top_builddir)/src/lib/util/libgnunetutil.la | 83 | $(top_builddir)/src/lib/util/libgnunetutil.la |
84 | 84 | ||
85 | if ENABLE_TEST_RUN | 85 | if ENABLE_TEST_RUN |
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index 218e68671..aac883508 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am | |||
@@ -1,4 +1,7 @@ | |||
1 | SUBDIRS = \ | 1 | SUBDIRS = \ |
2 | util \ | 2 | util \ |
3 | arm \ | 3 | arm \ |
4 | core | 4 | statistics \ |
5 | core \ | ||
6 | nat \ | ||
7 | nse | ||
diff --git a/src/cli/identity/Makefile.am b/src/cli/identity/Makefile.am index be2c2f1c6..d748c19ea 100644 --- a/src/cli/identity/Makefile.am +++ b/src/cli/identity/Makefile.am | |||
@@ -17,7 +17,7 @@ gnunet_identity_SOURCES = \ | |||
17 | gnunet-identity.c | 17 | gnunet-identity.c |
18 | gnunet_identity_LDADD = \ | 18 | gnunet_identity_LDADD = \ |
19 | $(top_builddir)/src/service/libgnunetidentity.la \ | 19 | $(top_builddir)/src/service/libgnunetidentity.la \ |
20 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 20 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
21 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 21 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
22 | $(GN_LIBINTL) | 22 | $(GN_LIBINTL) |
23 | 23 | ||
diff --git a/src/cli/nat/.gitignore b/src/cli/nat/.gitignore new file mode 100644 index 000000000..89e635e9f --- /dev/null +++ b/src/cli/nat/.gitignore | |||
@@ -0,0 +1 @@ | |||
gnunet-nat | |||
diff --git a/src/cli/nat/Makefile.am b/src/cli/nat/Makefile.am new file mode 100644 index 000000000..8c1a3109c --- /dev/null +++ b/src/cli/nat/Makefile.am | |||
@@ -0,0 +1,17 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | libexecdir= $(pkglibdir)/libexec/ | ||
5 | |||
6 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
7 | |||
8 | bin_PROGRAMS = \ | ||
9 | gnunet-nat | ||
10 | |||
11 | gnunet_nat_SOURCES = \ | ||
12 | gnunet-nat.c nat.h | ||
13 | gnunet_nat_LDADD = \ | ||
14 | $(top_builddir)/src/service/nat/libgnunetnatnew.la \ | ||
15 | $(top_builddir)/src/lib/util/libgnunetutil.la | ||
16 | gnunet_nat_LDFLAGS = \ | ||
17 | $(GN_LIBINTL) | ||
diff --git a/src/nat/gnunet-nat.c b/src/cli/nat/gnunet-nat.c index fd85549d6..fd85549d6 100644 --- a/src/nat/gnunet-nat.c +++ b/src/cli/nat/gnunet-nat.c | |||
diff --git a/src/cli/nse/.gitignore b/src/cli/nse/.gitignore new file mode 100644 index 000000000..ec3c6a9cf --- /dev/null +++ b/src/cli/nse/.gitignore | |||
@@ -0,0 +1 @@ | |||
gnunet-nse | |||
diff --git a/src/cli/nse/Makefile.am b/src/cli/nse/Makefile.am new file mode 100644 index 000000000..e724a22d3 --- /dev/null +++ b/src/cli/nse/Makefile.am | |||
@@ -0,0 +1,19 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | if USE_COVERAGE | ||
5 | AM_CFLAGS = --coverage -O0 | ||
6 | XLIB = -lgcov | ||
7 | endif | ||
8 | |||
9 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
10 | |||
11 | libexecdir= $(pkglibdir)/libexec/ | ||
12 | |||
13 | bin_PROGRAMS = gnunet-nse | ||
14 | |||
15 | gnunet_nse_SOURCES = gnunet-nse.c | ||
16 | gnunet_nse_LDADD = \ | ||
17 | $(top_builddir)/src/service/nse/libgnunetnse.la \ | ||
18 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
19 | $(XLIB) $(GN_LIBINTL) | ||
diff --git a/src/nse/gnunet-nse.c b/src/cli/nse/gnunet-nse.c index edb73c0fc..edb73c0fc 100644 --- a/src/nse/gnunet-nse.c +++ b/src/cli/nse/gnunet-nse.c | |||
diff --git a/src/cli/statistics/.gitignore b/src/cli/statistics/.gitignore new file mode 100644 index 000000000..2a7218e76 --- /dev/null +++ b/src/cli/statistics/.gitignore | |||
@@ -0,0 +1 @@ | |||
gnunet-statistics | |||
diff --git a/src/cli/statistics/Makefile.am b/src/cli/statistics/Makefile.am new file mode 100644 index 000000000..f4a572ff2 --- /dev/null +++ b/src/cli/statistics/Makefile.am | |||
@@ -0,0 +1,40 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | if USE_COVERAGE | ||
5 | AM_CFLAGS = --coverage -O0 | ||
6 | XLIB = -lgcov | ||
7 | endif | ||
8 | |||
9 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
10 | |||
11 | libexecdir= $(pkglibdir)/libexec/ | ||
12 | |||
13 | bin_PROGRAMS = \ | ||
14 | gnunet-statistics | ||
15 | |||
16 | gnunet_statistics_SOURCES = \ | ||
17 | gnunet-statistics.c | ||
18 | gnunet_statistics_LDADD = \ | ||
19 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ | ||
20 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
21 | $(GN_LIBINTL) | ||
22 | |||
23 | # Config file still in service folder | ||
24 | #if HAVE_PYTHON | ||
25 | #check_SCRIPTS = \ | ||
26 | # test_gnunet_statistics.py | ||
27 | #endif | ||
28 | # | ||
29 | #SUFFIXES = .py.in .py | ||
30 | #.py.in.py: | ||
31 | # $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/$< > $@ | ||
32 | # chmod +x $@ | ||
33 | # | ||
34 | #test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile | ||
35 | # $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py | ||
36 | # chmod +x test_gnunet_statistics.py | ||
37 | # | ||
38 | #EXTRA_DIST = \ | ||
39 | # test_statistics_api_data.conf \ | ||
40 | # test_gnunet_statistics.py.in | ||
diff --git a/src/statistics/gnunet-statistics.c b/src/cli/statistics/gnunet-statistics.c index 5894ef68c..3336980d1 100644 --- a/src/statistics/gnunet-statistics.c +++ b/src/cli/statistics/gnunet-statistics.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
29 | #include "gnunet_statistics_service.h" | 29 | #include "gnunet_statistics_service.h" |
30 | #include "statistics.h" | 30 | #include "../../service/statistics/statistics.h" |
31 | 31 | ||
32 | 32 | ||
33 | /** | 33 | /** |
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am index 8815b95c9..a578a62cc 100644 --- a/src/consensus/Makefile.am +++ b/src/consensus/Makefile.am | |||
@@ -41,7 +41,7 @@ gnunet_service_consensus_LDADD = \ | |||
41 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 41 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
42 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 42 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
43 | $(top_builddir)/src/set/libgnunetset.la \ | 43 | $(top_builddir)/src/set/libgnunetset.la \ |
44 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 44 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
45 | $(GN_LIBINTL) | 45 | $(GN_LIBINTL) |
46 | 46 | ||
47 | gnunet_service_evil_consensus_SOURCES = \ | 47 | gnunet_service_evil_consensus_SOURCES = \ |
@@ -51,7 +51,7 @@ gnunet_service_evil_consensus_LDADD = \ | |||
51 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 51 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
52 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 52 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
53 | $(top_builddir)/src/set/libgnunetset.la \ | 53 | $(top_builddir)/src/set/libgnunetset.la \ |
54 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 54 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
55 | $(GN_LIBINTL) | 55 | $(GN_LIBINTL) |
56 | gnunet_service_evil_consensus_CFLAGS = -DEVIL | 56 | gnunet_service_evil_consensus_CFLAGS = -DEVIL |
57 | 57 | ||
@@ -92,7 +92,7 @@ test_consensus_api_SOURCES = \ | |||
92 | test_consensus_api.c | 92 | test_consensus_api.c |
93 | test_consensus_api_LDADD = \ | 93 | test_consensus_api_LDADD = \ |
94 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 94 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
95 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 95 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
96 | libgnunetconsensus.la | 96 | libgnunetconsensus.la |
97 | 97 | ||
98 | noinst_SCRIPTS = \ | 98 | noinst_SCRIPTS = \ |
diff --git a/src/contrib/service/abd/Makefile.am b/src/contrib/service/abd/Makefile.am index 669c00d19..6eff980f4 100644 --- a/src/contrib/service/abd/Makefile.am +++ b/src/contrib/service/abd/Makefile.am | |||
@@ -68,7 +68,7 @@ gnunet_service_abd_LDADD = \ | |||
68 | $(top_builddir)/src/gns/libgnunetgns.la \ | 68 | $(top_builddir)/src/gns/libgnunetgns.la \ |
69 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 69 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
70 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 70 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
71 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 71 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
72 | $(GN_LIBINTL) | 72 | $(GN_LIBINTL) |
73 | 73 | ||
74 | 74 | ||
diff --git a/src/contrib/service/rps/Makefile.am b/src/contrib/service/rps/Makefile.am index 2ee315d11..34532d67c 100644 --- a/src/contrib/service/rps/Makefile.am +++ b/src/contrib/service/rps/Makefile.am | |||
@@ -32,7 +32,7 @@ libgnunetrps_la_SOURCES = \ | |||
32 | rps-sampler_client.h rps-sampler_client.c \ | 32 | rps-sampler_client.h rps-sampler_client.c \ |
33 | rps_api.c rps.h | 33 | rps_api.c rps.h |
34 | libgnunetrps_la_LIBADD = \ | 34 | libgnunetrps_la_LIBADD = \ |
35 | $(top_builddir)/src/nse/libgnunetnse.la \ | 35 | $(top_builddir)/src/service/nse/libgnunetnse.la \ |
36 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 36 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
37 | $(GN_LIBINTL) $(XLIB) | 37 | $(GN_LIBINTL) $(XLIB) |
38 | libgnunetrps_la_LDFLAGS = \ | 38 | libgnunetrps_la_LDFLAGS = \ |
@@ -61,10 +61,10 @@ gnunet_service_rps_SOURCES = \ | |||
61 | gnunet_service_rps_LDADD = \ | 61 | gnunet_service_rps_LDADD = \ |
62 | libgnunetrps.la \ | 62 | libgnunetrps.la \ |
63 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 63 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
64 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 64 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
65 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 65 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
66 | $(top_builddir)/src/nse/libgnunetnse.la \ | 66 | $(top_builddir)/src/service/nse/libgnunetnse.la \ |
67 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 67 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
68 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 68 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
69 | $(LIBGCRYPT_LIBS) \ | 69 | $(LIBGCRYPT_LIBS) \ |
70 | -lm -lgcrypt \ | 70 | -lm -lgcrypt \ |
@@ -96,7 +96,7 @@ rps_test_src = \ | |||
96 | #ld_rps_test_lib = \ | 96 | #ld_rps_test_lib = \ |
97 | # libgnunetrps.la \ | 97 | # libgnunetrps.la \ |
98 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ | 98 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ |
99 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 99 | # $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
100 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ | 100 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ |
101 | # -lm | 101 | # -lm |
102 | 102 | ||
@@ -156,7 +156,7 @@ test_service_rps_sampler_elem_LDADD = $(top_builddir)/src/lib/util/libgnunetutil | |||
156 | # rps-test_util.h rps-test_util.c \ | 156 | # rps-test_util.h rps-test_util.c \ |
157 | # gnunet-rps-profiler.c | 157 | # gnunet-rps-profiler.c |
158 | #gnunet_rps_profiler_LDADD = \ | 158 | #gnunet_rps_profiler_LDADD = \ |
159 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 159 | # $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
160 | # libgnunetrps.la \ | 160 | # libgnunetrps.la \ |
161 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ | 161 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ |
162 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ | 162 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ |
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index 5aa79a0e0..366c4a199 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am | |||
@@ -225,7 +225,7 @@ test_conversation_api_LDADD = \ | |||
225 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 225 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
226 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 226 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
227 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 227 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
228 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 228 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
229 | $(top_builddir)/src/lib/util/libgnunetutil.la | 229 | $(top_builddir)/src/lib/util/libgnunetutil.la |
230 | test_conversation_api_LDFLAGS = \ | 230 | test_conversation_api_LDFLAGS = \ |
231 | -export-dynamic | 231 | -export-dynamic |
@@ -239,7 +239,7 @@ test_conversation_api_twocalls_LDADD = \ | |||
239 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 239 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
240 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 240 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
241 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 241 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
242 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 242 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
243 | $(top_builddir)/src/lib/util/libgnunetutil.la | 243 | $(top_builddir)/src/lib/util/libgnunetutil.la |
244 | test_conversation_api_twocalls_LDFLAGS = \ | 244 | test_conversation_api_twocalls_LDFLAGS = \ |
245 | -export-dynamic | 245 | -export-dynamic |
@@ -253,7 +253,7 @@ test_conversation_api_reject_LDADD = \ | |||
253 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 253 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
254 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 254 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
255 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 255 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
256 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 256 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
257 | $(top_builddir)/src/lib/util/libgnunetutil.la | 257 | $(top_builddir)/src/lib/util/libgnunetutil.la |
258 | test_conversation_api_reject_LDFLAGS = \ | 258 | test_conversation_api_reject_LDFLAGS = \ |
259 | -export-dynamic | 259 | -export-dynamic |
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index 16359945a..9caeac543 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am | |||
@@ -33,7 +33,7 @@ lib_LTLIBRARIES = \ | |||
33 | libgnunetdatacache_la_SOURCES = \ | 33 | libgnunetdatacache_la_SOURCES = \ |
34 | datacache.c | 34 | datacache.c |
35 | libgnunetdatacache_la_LIBADD = \ | 35 | libgnunetdatacache_la_LIBADD = \ |
36 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 36 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
37 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 37 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
38 | $(GN_LIBINTL) | 38 | $(GN_LIBINTL) |
39 | libgnunetdatacache_la_LDFLAGS = \ | 39 | libgnunetdatacache_la_LDFLAGS = \ |
@@ -55,7 +55,7 @@ noinst_LTLIBRARIES = \ | |||
55 | libgnunet_plugin_datacache_sqlite_la_SOURCES = \ | 55 | libgnunet_plugin_datacache_sqlite_la_SOURCES = \ |
56 | plugin_datacache_sqlite.c | 56 | plugin_datacache_sqlite.c |
57 | libgnunet_plugin_datacache_sqlite_la_LIBADD = \ | 57 | libgnunet_plugin_datacache_sqlite_la_LIBADD = \ |
58 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 58 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
59 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ | 59 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ |
60 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ | 60 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ |
61 | $(LTLIBINTL) | 61 | $(LTLIBINTL) |
@@ -65,7 +65,7 @@ libgnunet_plugin_datacache_sqlite_la_LDFLAGS = \ | |||
65 | libgnunet_plugin_datacache_heap_la_SOURCES = \ | 65 | libgnunet_plugin_datacache_heap_la_SOURCES = \ |
66 | plugin_datacache_heap.c | 66 | plugin_datacache_heap.c |
67 | libgnunet_plugin_datacache_heap_la_LIBADD = \ | 67 | libgnunet_plugin_datacache_heap_la_LIBADD = \ |
68 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 68 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
69 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | 69 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ |
70 | $(LTLIBINTL) | 70 | $(LTLIBINTL) |
71 | libgnunet_plugin_datacache_heap_la_LDFLAGS = \ | 71 | libgnunet_plugin_datacache_heap_la_LDFLAGS = \ |
@@ -75,7 +75,7 @@ libgnunet_plugin_datacache_postgres_la_SOURCES = \ | |||
75 | plugin_datacache_postgres.c | 75 | plugin_datacache_postgres.c |
76 | libgnunet_plugin_datacache_postgres_la_LIBADD = \ | 76 | libgnunet_plugin_datacache_postgres_la_LIBADD = \ |
77 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ | 77 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ |
78 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 78 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
79 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 79 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
80 | $(GN_PLUGIN_LDFLAGS) -lpq | 80 | $(GN_PLUGIN_LDFLAGS) -lpq |
81 | libgnunet_plugin_datacache_postgres_la_CPPFLAGS = \ | 81 | libgnunet_plugin_datacache_postgres_la_CPPFLAGS = \ |
@@ -124,42 +124,42 @@ endif | |||
124 | test_datacache_sqlite_SOURCES = \ | 124 | test_datacache_sqlite_SOURCES = \ |
125 | test_datacache.c | 125 | test_datacache.c |
126 | test_datacache_sqlite_LDADD = \ | 126 | test_datacache_sqlite_LDADD = \ |
127 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 127 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
128 | libgnunetdatacache.la \ | 128 | libgnunetdatacache.la \ |
129 | $(top_builddir)/src/lib/util/libgnunetutil.la | 129 | $(top_builddir)/src/lib/util/libgnunetutil.la |
130 | 130 | ||
131 | test_datacache_quota_sqlite_SOURCES = \ | 131 | test_datacache_quota_sqlite_SOURCES = \ |
132 | test_datacache_quota.c | 132 | test_datacache_quota.c |
133 | test_datacache_quota_sqlite_LDADD = \ | 133 | test_datacache_quota_sqlite_LDADD = \ |
134 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 134 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
135 | libgnunetdatacache.la \ | 135 | libgnunetdatacache.la \ |
136 | $(top_builddir)/src/lib/util/libgnunetutil.la | 136 | $(top_builddir)/src/lib/util/libgnunetutil.la |
137 | 137 | ||
138 | test_datacache_heap_SOURCES = \ | 138 | test_datacache_heap_SOURCES = \ |
139 | test_datacache.c | 139 | test_datacache.c |
140 | test_datacache_heap_LDADD = \ | 140 | test_datacache_heap_LDADD = \ |
141 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 141 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
142 | libgnunetdatacache.la \ | 142 | libgnunetdatacache.la \ |
143 | $(top_builddir)/src/lib/util/libgnunetutil.la | 143 | $(top_builddir)/src/lib/util/libgnunetutil.la |
144 | 144 | ||
145 | test_datacache_quota_heap_SOURCES = \ | 145 | test_datacache_quota_heap_SOURCES = \ |
146 | test_datacache_quota.c | 146 | test_datacache_quota.c |
147 | test_datacache_quota_heap_LDADD = \ | 147 | test_datacache_quota_heap_LDADD = \ |
148 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 148 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
149 | libgnunetdatacache.la \ | 149 | libgnunetdatacache.la \ |
150 | $(top_builddir)/src/lib/util/libgnunetutil.la | 150 | $(top_builddir)/src/lib/util/libgnunetutil.la |
151 | 151 | ||
152 | test_datacache_postgres_SOURCES = \ | 152 | test_datacache_postgres_SOURCES = \ |
153 | test_datacache.c | 153 | test_datacache.c |
154 | test_datacache_postgres_LDADD = \ | 154 | test_datacache_postgres_LDADD = \ |
155 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 155 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
156 | libgnunetdatacache.la \ | 156 | libgnunetdatacache.la \ |
157 | $(top_builddir)/src/lib/util/libgnunetutil.la | 157 | $(top_builddir)/src/lib/util/libgnunetutil.la |
158 | 158 | ||
159 | test_datacache_quota_postgres_SOURCES = \ | 159 | test_datacache_quota_postgres_SOURCES = \ |
160 | test_datacache_quota.c | 160 | test_datacache_quota.c |
161 | test_datacache_quota_postgres_LDADD = \ | 161 | test_datacache_quota_postgres_LDADD = \ |
162 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 162 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
163 | libgnunetdatacache.la \ | 163 | libgnunetdatacache.la \ |
164 | $(top_builddir)/src/lib/util/libgnunetutil.la | 164 | $(top_builddir)/src/lib/util/libgnunetutil.la |
165 | 165 | ||
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index fc7b71bcc..5a49b173d 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am | |||
@@ -28,7 +28,7 @@ lib_LTLIBRARIES = \ | |||
28 | libgnunetdatastore_la_SOURCES = \ | 28 | libgnunetdatastore_la_SOURCES = \ |
29 | datastore_api.c datastore.h | 29 | datastore_api.c datastore.h |
30 | libgnunetdatastore_la_LIBADD = \ | 30 | libgnunetdatastore_la_LIBADD = \ |
31 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 31 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
32 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 32 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
33 | $(GN_LIBINTL) | 33 | $(GN_LIBINTL) |
34 | libgnunetdatastore_la_LDFLAGS = \ | 34 | libgnunetdatastore_la_LDFLAGS = \ |
@@ -44,7 +44,7 @@ libexec_PROGRAMS = \ | |||
44 | gnunet_service_datastore_SOURCES = \ | 44 | gnunet_service_datastore_SOURCES = \ |
45 | gnunet-service-datastore.c | 45 | gnunet-service-datastore.c |
46 | gnunet_service_datastore_LDADD = \ | 46 | gnunet_service_datastore_LDADD = \ |
47 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 47 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
48 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 48 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
49 | $(GN_LIBINTL) | 49 | $(GN_LIBINTL) |
50 | 50 | ||
@@ -98,7 +98,7 @@ libgnunet_plugin_datastore_sqlite_la_SOURCES = \ | |||
98 | plugin_datastore_sqlite.c | 98 | plugin_datastore_sqlite.c |
99 | libgnunet_plugin_datastore_sqlite_la_LIBADD = \ | 99 | libgnunet_plugin_datastore_sqlite_la_LIBADD = \ |
100 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ | 100 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ |
101 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 101 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
102 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ | 102 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ |
103 | $(LTLIBINTL) | 103 | $(LTLIBINTL) |
104 | libgnunet_plugin_datastore_sqlite_la_LDFLAGS = \ | 104 | libgnunet_plugin_datastore_sqlite_la_LDFLAGS = \ |
@@ -117,7 +117,7 @@ libgnunet_plugin_datastore_heap_la_LDFLAGS = \ | |||
117 | libgnunet_plugin_datastore_postgres_la_SOURCES = \ | 117 | libgnunet_plugin_datastore_postgres_la_SOURCES = \ |
118 | plugin_datastore_postgres.c | 118 | plugin_datastore_postgres.c |
119 | libgnunet_plugin_datastore_postgres_la_LIBADD = \ | 119 | libgnunet_plugin_datastore_postgres_la_LIBADD = \ |
120 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 120 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
121 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ | 121 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ |
122 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq | 122 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq |
123 | libgnunet_plugin_datastore_postgres_la_LDFLAGS = \ | 123 | libgnunet_plugin_datastore_postgres_la_LDFLAGS = \ |
@@ -151,102 +151,102 @@ endif | |||
151 | test_datastore_api_heap_SOURCES = \ | 151 | test_datastore_api_heap_SOURCES = \ |
152 | test_datastore_api.c | 152 | test_datastore_api.c |
153 | test_datastore_api_heap_LDADD = \ | 153 | test_datastore_api_heap_LDADD = \ |
154 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 154 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
155 | libgnunetdatastore.la \ | 155 | libgnunetdatastore.la \ |
156 | $(top_builddir)/src/lib/util/libgnunetutil.la | 156 | $(top_builddir)/src/lib/util/libgnunetutil.la |
157 | 157 | ||
158 | test_datastore_api_management_heap_SOURCES = \ | 158 | test_datastore_api_management_heap_SOURCES = \ |
159 | test_datastore_api_management.c | 159 | test_datastore_api_management.c |
160 | test_datastore_api_management_heap_LDADD = \ | 160 | test_datastore_api_management_heap_LDADD = \ |
161 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 161 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
162 | libgnunetdatastore.la \ | 162 | libgnunetdatastore.la \ |
163 | $(top_builddir)/src/lib/util/libgnunetutil.la | 163 | $(top_builddir)/src/lib/util/libgnunetutil.la |
164 | 164 | ||
165 | perf_datastore_api_heap_SOURCES = \ | 165 | perf_datastore_api_heap_SOURCES = \ |
166 | perf_datastore_api.c | 166 | perf_datastore_api.c |
167 | perf_datastore_api_heap_LDADD = \ | 167 | perf_datastore_api_heap_LDADD = \ |
168 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 168 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
169 | libgnunetdatastore.la \ | 169 | libgnunetdatastore.la \ |
170 | $(top_builddir)/src/lib/util/libgnunetutil.la | 170 | $(top_builddir)/src/lib/util/libgnunetutil.la |
171 | 171 | ||
172 | perf_plugin_datastore_heap_SOURCES = \ | 172 | perf_plugin_datastore_heap_SOURCES = \ |
173 | perf_plugin_datastore.c | 173 | perf_plugin_datastore.c |
174 | perf_plugin_datastore_heap_LDADD = \ | 174 | perf_plugin_datastore_heap_LDADD = \ |
175 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 175 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
176 | $(top_builddir)/src/lib/util/libgnunetutil.la | 176 | $(top_builddir)/src/lib/util/libgnunetutil.la |
177 | 177 | ||
178 | test_plugin_datastore_heap_SOURCES = \ | 178 | test_plugin_datastore_heap_SOURCES = \ |
179 | test_plugin_datastore.c | 179 | test_plugin_datastore.c |
180 | test_plugin_datastore_heap_LDADD = \ | 180 | test_plugin_datastore_heap_LDADD = \ |
181 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 181 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
182 | $(top_builddir)/src/lib/util/libgnunetutil.la | 182 | $(top_builddir)/src/lib/util/libgnunetutil.la |
183 | 183 | ||
184 | 184 | ||
185 | test_datastore_api_sqlite_SOURCES = \ | 185 | test_datastore_api_sqlite_SOURCES = \ |
186 | test_datastore_api.c | 186 | test_datastore_api.c |
187 | test_datastore_api_sqlite_LDADD = \ | 187 | test_datastore_api_sqlite_LDADD = \ |
188 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 188 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
189 | libgnunetdatastore.la \ | 189 | libgnunetdatastore.la \ |
190 | $(top_builddir)/src/lib/util/libgnunetutil.la | 190 | $(top_builddir)/src/lib/util/libgnunetutil.la |
191 | 191 | ||
192 | test_datastore_api_management_sqlite_SOURCES = \ | 192 | test_datastore_api_management_sqlite_SOURCES = \ |
193 | test_datastore_api_management.c | 193 | test_datastore_api_management.c |
194 | test_datastore_api_management_sqlite_LDADD = \ | 194 | test_datastore_api_management_sqlite_LDADD = \ |
195 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 195 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
196 | libgnunetdatastore.la \ | 196 | libgnunetdatastore.la \ |
197 | $(top_builddir)/src/lib/util/libgnunetutil.la | 197 | $(top_builddir)/src/lib/util/libgnunetutil.la |
198 | 198 | ||
199 | perf_datastore_api_sqlite_SOURCES = \ | 199 | perf_datastore_api_sqlite_SOURCES = \ |
200 | perf_datastore_api.c | 200 | perf_datastore_api.c |
201 | perf_datastore_api_sqlite_LDADD = \ | 201 | perf_datastore_api_sqlite_LDADD = \ |
202 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 202 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
203 | libgnunetdatastore.la \ | 203 | libgnunetdatastore.la \ |
204 | $(top_builddir)/src/lib/util/libgnunetutil.la | 204 | $(top_builddir)/src/lib/util/libgnunetutil.la |
205 | 205 | ||
206 | perf_plugin_datastore_sqlite_SOURCES = \ | 206 | perf_plugin_datastore_sqlite_SOURCES = \ |
207 | perf_plugin_datastore.c | 207 | perf_plugin_datastore.c |
208 | perf_plugin_datastore_sqlite_LDADD = \ | 208 | perf_plugin_datastore_sqlite_LDADD = \ |
209 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 209 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
210 | $(top_builddir)/src/lib/util/libgnunetutil.la | 210 | $(top_builddir)/src/lib/util/libgnunetutil.la |
211 | 211 | ||
212 | test_plugin_datastore_sqlite_SOURCES = \ | 212 | test_plugin_datastore_sqlite_SOURCES = \ |
213 | test_plugin_datastore.c | 213 | test_plugin_datastore.c |
214 | test_plugin_datastore_sqlite_LDADD = \ | 214 | test_plugin_datastore_sqlite_LDADD = \ |
215 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 215 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
216 | $(top_builddir)/src/lib/util/libgnunetutil.la | 216 | $(top_builddir)/src/lib/util/libgnunetutil.la |
217 | 217 | ||
218 | 218 | ||
219 | test_datastore_api_postgres_SOURCES = \ | 219 | test_datastore_api_postgres_SOURCES = \ |
220 | test_datastore_api.c | 220 | test_datastore_api.c |
221 | test_datastore_api_postgres_LDADD = \ | 221 | test_datastore_api_postgres_LDADD = \ |
222 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 222 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
223 | libgnunetdatastore.la \ | 223 | libgnunetdatastore.la \ |
224 | $(top_builddir)/src/lib/util/libgnunetutil.la | 224 | $(top_builddir)/src/lib/util/libgnunetutil.la |
225 | 225 | ||
226 | test_datastore_api_management_postgres_SOURCES = \ | 226 | test_datastore_api_management_postgres_SOURCES = \ |
227 | test_datastore_api_management.c | 227 | test_datastore_api_management.c |
228 | test_datastore_api_management_postgres_LDADD = \ | 228 | test_datastore_api_management_postgres_LDADD = \ |
229 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 229 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
230 | libgnunetdatastore.la \ | 230 | libgnunetdatastore.la \ |
231 | $(top_builddir)/src/lib/util/libgnunetutil.la | 231 | $(top_builddir)/src/lib/util/libgnunetutil.la |
232 | 232 | ||
233 | perf_datastore_api_postgres_SOURCES = \ | 233 | perf_datastore_api_postgres_SOURCES = \ |
234 | perf_datastore_api.c | 234 | perf_datastore_api.c |
235 | perf_datastore_api_postgres_LDADD = \ | 235 | perf_datastore_api_postgres_LDADD = \ |
236 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 236 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
237 | libgnunetdatastore.la \ | 237 | libgnunetdatastore.la \ |
238 | $(top_builddir)/src/lib/util/libgnunetutil.la | 238 | $(top_builddir)/src/lib/util/libgnunetutil.la |
239 | 239 | ||
240 | test_plugin_datastore_postgres_SOURCES = \ | 240 | test_plugin_datastore_postgres_SOURCES = \ |
241 | test_plugin_datastore.c | 241 | test_plugin_datastore.c |
242 | test_plugin_datastore_postgres_LDADD = \ | 242 | test_plugin_datastore_postgres_LDADD = \ |
243 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 243 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
244 | $(top_builddir)/src/lib/util/libgnunetutil.la | 244 | $(top_builddir)/src/lib/util/libgnunetutil.la |
245 | 245 | ||
246 | perf_plugin_datastore_postgres_SOURCES = \ | 246 | perf_plugin_datastore_postgres_SOURCES = \ |
247 | perf_plugin_datastore.c | 247 | perf_plugin_datastore.c |
248 | perf_plugin_datastore_postgres_LDADD = \ | 248 | perf_plugin_datastore_postgres_LDADD = \ |
249 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 249 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
250 | $(top_builddir)/src/lib/util/libgnunetutil.la | 250 | $(top_builddir)/src/lib/util/libgnunetutil.la |
251 | 251 | ||
252 | 252 | ||
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 6185d9d2c..8449d4825 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am | |||
@@ -60,10 +60,10 @@ gnunet_service_dht_SOURCES = \ | |||
60 | gnunet-service-dht_routing.c gnunet-service-dht_routing.h | 60 | gnunet-service-dht_routing.c gnunet-service-dht_routing.h |
61 | gnunet_service_dht_LDADD = \ | 61 | gnunet_service_dht_LDADD = \ |
62 | libgnunetdht.la \ | 62 | libgnunetdht.la \ |
63 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 63 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
64 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 64 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
65 | $(top_builddir)/src/nse/libgnunetnse.la \ | 65 | $(top_builddir)/src/service/nse/libgnunetnse.la \ |
66 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 66 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
67 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 67 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
68 | $(top_builddir)/src/lib/block/libgnunetblock.la \ | 68 | $(top_builddir)/src/lib/block/libgnunetblock.la \ |
69 | $(top_builddir)/src/lib/block/libgnunetblockgroup.la \ | 69 | $(top_builddir)/src/lib/block/libgnunetblockgroup.la \ |
@@ -113,7 +113,7 @@ test_dht_api_SOURCES = \ | |||
113 | test_dht_api.c | 113 | test_dht_api.c |
114 | test_dht_api_LDADD = \ | 114 | test_dht_api_LDADD = \ |
115 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 115 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
116 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 116 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
117 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 117 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
118 | libgnunetdht.la | 118 | libgnunetdht.la |
119 | 119 | ||
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 6c7462d9a..38ee78c3a 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am | |||
@@ -64,7 +64,7 @@ gnunet_dns_redirector_LDADD = \ | |||
64 | gnunet_service_dns_SOURCES = \ | 64 | gnunet_service_dns_SOURCES = \ |
65 | gnunet-service-dns.c | 65 | gnunet-service-dns.c |
66 | gnunet_service_dns_LDADD = \ | 66 | gnunet_service_dns_LDADD = \ |
67 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 67 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
68 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 68 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
69 | $(GN_LIBINTL) | 69 | $(GN_LIBINTL) |
70 | 70 | ||
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am index 9e36a5064..c2dba0927 100644 --- a/src/exit/Makefile.am +++ b/src/exit/Makefile.am | |||
@@ -31,7 +31,7 @@ gnunet_daemon_exit_SOURCES = \ | |||
31 | gnunet-daemon-exit.c exit.h | 31 | gnunet-daemon-exit.c exit.h |
32 | gnunet_daemon_exit_LDADD = \ | 32 | gnunet_daemon_exit_LDADD = \ |
33 | $(top_builddir)/src/dht/libgnunetdht.la \ | 33 | $(top_builddir)/src/dht/libgnunetdht.la \ |
34 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 34 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
35 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 35 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
36 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 36 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
37 | $(top_builddir)/src/regex/libgnunetregex.la \ | 37 | $(top_builddir)/src/regex/libgnunetregex.la \ |
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index b6083ea06..8616c0474 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -43,7 +43,7 @@ libgnunetfs_la_SOURCES = \ | |||
43 | 43 | ||
44 | libgnunetfs_la_LIBADD = \ | 44 | libgnunetfs_la_LIBADD = \ |
45 | $(top_builddir)/src/datastore/libgnunetdatastore.la \ | 45 | $(top_builddir)/src/datastore/libgnunetdatastore.la \ |
46 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 46 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
47 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 47 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
48 | $(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring | 48 | $(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring |
49 | 49 | ||
@@ -157,7 +157,7 @@ gnunet_daemon_fsprofiler_SOURCES = \ | |||
157 | gnunet-daemon-fsprofiler.c | 157 | gnunet-daemon-fsprofiler.c |
158 | gnunet_daemon_fsprofiler_LDADD = \ | 158 | gnunet_daemon_fsprofiler_LDADD = \ |
159 | libgnunetfs.la \ | 159 | libgnunetfs.la \ |
160 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 160 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
161 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 161 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
162 | $(GN_LIBINTL) | 162 | $(GN_LIBINTL) |
163 | 163 | ||
@@ -176,11 +176,11 @@ gnunet_service_fs_LDADD = \ | |||
176 | $(top_builddir)/src/dht/libgnunetdht.la \ | 176 | $(top_builddir)/src/dht/libgnunetdht.la \ |
177 | $(top_builddir)/src/lib/block/libgnunetblock.la \ | 177 | $(top_builddir)/src/lib/block/libgnunetblock.la \ |
178 | $(top_builddir)/src/datastore/libgnunetdatastore.la \ | 178 | $(top_builddir)/src/datastore/libgnunetdatastore.la \ |
179 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 179 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
180 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 180 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
181 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 181 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
182 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 182 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
183 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 183 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
184 | $(GN_LIBINTL) -lm | 184 | $(GN_LIBINTL) -lm |
185 | 185 | ||
186 | gnunet_unindex_SOURCES = \ | 186 | gnunet_unindex_SOURCES = \ |
@@ -278,28 +278,28 @@ endif | |||
278 | test_fs_download_SOURCES = \ | 278 | test_fs_download_SOURCES = \ |
279 | test_fs_download.c | 279 | test_fs_download.c |
280 | test_fs_download_LDADD = \ | 280 | test_fs_download_LDADD = \ |
281 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 281 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
282 | libgnunetfs.la \ | 282 | libgnunetfs.la \ |
283 | $(top_builddir)/src/lib/util/libgnunetutil.la | 283 | $(top_builddir)/src/lib/util/libgnunetutil.la |
284 | 284 | ||
285 | test_fs_download_indexed_SOURCES = \ | 285 | test_fs_download_indexed_SOURCES = \ |
286 | test_fs_download.c | 286 | test_fs_download.c |
287 | test_fs_download_indexed_LDADD = \ | 287 | test_fs_download_indexed_LDADD = \ |
288 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 288 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
289 | libgnunetfs.la \ | 289 | libgnunetfs.la \ |
290 | $(top_builddir)/src/lib/util/libgnunetutil.la | 290 | $(top_builddir)/src/lib/util/libgnunetutil.la |
291 | 291 | ||
292 | test_fs_download_cadet_SOURCES = \ | 292 | test_fs_download_cadet_SOURCES = \ |
293 | test_fs_download.c | 293 | test_fs_download.c |
294 | test_fs_download_cadet_LDADD = \ | 294 | test_fs_download_cadet_LDADD = \ |
295 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 295 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
296 | libgnunetfs.la \ | 296 | libgnunetfs.la \ |
297 | $(top_builddir)/src/lib/util/libgnunetutil.la | 297 | $(top_builddir)/src/lib/util/libgnunetutil.la |
298 | 298 | ||
299 | test_fs_download_persistence_SOURCES = \ | 299 | test_fs_download_persistence_SOURCES = \ |
300 | test_fs_download_persistence.c | 300 | test_fs_download_persistence.c |
301 | test_fs_download_persistence_LDADD = \ | 301 | test_fs_download_persistence_LDADD = \ |
302 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 302 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
303 | libgnunetfs.la \ | 303 | libgnunetfs.la \ |
304 | $(top_builddir)/src/lib/util/libgnunetutil.la | 304 | $(top_builddir)/src/lib/util/libgnunetutil.la |
305 | 305 | ||
@@ -324,84 +324,84 @@ test_fs_getopt_LDADD = \ | |||
324 | test_fs_list_indexed_SOURCES = \ | 324 | test_fs_list_indexed_SOURCES = \ |
325 | test_fs_list_indexed.c | 325 | test_fs_list_indexed.c |
326 | test_fs_list_indexed_LDADD = \ | 326 | test_fs_list_indexed_LDADD = \ |
327 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 327 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
328 | libgnunetfs.la \ | 328 | libgnunetfs.la \ |
329 | $(top_builddir)/src/lib/util/libgnunetutil.la | 329 | $(top_builddir)/src/lib/util/libgnunetutil.la |
330 | 330 | ||
331 | test_fs_namespace_SOURCES = \ | 331 | test_fs_namespace_SOURCES = \ |
332 | test_fs_namespace.c | 332 | test_fs_namespace.c |
333 | test_fs_namespace_LDADD = \ | 333 | test_fs_namespace_LDADD = \ |
334 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 334 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
335 | libgnunetfs.la \ | 335 | libgnunetfs.la \ |
336 | $(top_builddir)/src/lib/util/libgnunetutil.la | 336 | $(top_builddir)/src/lib/util/libgnunetutil.la |
337 | 337 | ||
338 | test_fs_namespace_list_updateable_SOURCES = \ | 338 | test_fs_namespace_list_updateable_SOURCES = \ |
339 | test_fs_namespace_list_updateable.c | 339 | test_fs_namespace_list_updateable.c |
340 | test_fs_namespace_list_updateable_LDADD = \ | 340 | test_fs_namespace_list_updateable_LDADD = \ |
341 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 341 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
342 | libgnunetfs.la \ | 342 | libgnunetfs.la \ |
343 | $(top_builddir)/src/lib/util/libgnunetutil.la | 343 | $(top_builddir)/src/lib/util/libgnunetutil.la |
344 | 344 | ||
345 | test_fs_publish_SOURCES = \ | 345 | test_fs_publish_SOURCES = \ |
346 | test_fs_publish.c | 346 | test_fs_publish.c |
347 | test_fs_publish_LDADD = \ | 347 | test_fs_publish_LDADD = \ |
348 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 348 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
349 | libgnunetfs.la \ | 349 | libgnunetfs.la \ |
350 | $(top_builddir)/src/lib/util/libgnunetutil.la | 350 | $(top_builddir)/src/lib/util/libgnunetutil.la |
351 | 351 | ||
352 | test_fs_publish_persistence_SOURCES = \ | 352 | test_fs_publish_persistence_SOURCES = \ |
353 | test_fs_publish_persistence.c | 353 | test_fs_publish_persistence.c |
354 | test_fs_publish_persistence_LDADD = \ | 354 | test_fs_publish_persistence_LDADD = \ |
355 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 355 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
356 | libgnunetfs.la \ | 356 | libgnunetfs.la \ |
357 | $(top_builddir)/src/lib/util/libgnunetutil.la | 357 | $(top_builddir)/src/lib/util/libgnunetutil.la |
358 | 358 | ||
359 | test_fs_search_SOURCES = \ | 359 | test_fs_search_SOURCES = \ |
360 | test_fs_search.c | 360 | test_fs_search.c |
361 | test_fs_search_LDADD = \ | 361 | test_fs_search_LDADD = \ |
362 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 362 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
363 | libgnunetfs.la \ | 363 | libgnunetfs.la \ |
364 | $(top_builddir)/src/lib/util/libgnunetutil.la | 364 | $(top_builddir)/src/lib/util/libgnunetutil.la |
365 | 365 | ||
366 | test_fs_search_with_and_SOURCES = \ | 366 | test_fs_search_with_and_SOURCES = \ |
367 | test_fs_search_with_and.c | 367 | test_fs_search_with_and.c |
368 | test_fs_search_with_and_LDADD = \ | 368 | test_fs_search_with_and_LDADD = \ |
369 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 369 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
370 | libgnunetfs.la \ | 370 | libgnunetfs.la \ |
371 | $(top_builddir)/src/lib/util/libgnunetutil.la | 371 | $(top_builddir)/src/lib/util/libgnunetutil.la |
372 | 372 | ||
373 | test_fs_search_probes_SOURCES = \ | 373 | test_fs_search_probes_SOURCES = \ |
374 | test_fs_search_probes.c | 374 | test_fs_search_probes.c |
375 | test_fs_search_probes_LDADD = \ | 375 | test_fs_search_probes_LDADD = \ |
376 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 376 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
377 | libgnunetfs.la \ | 377 | libgnunetfs.la \ |
378 | $(top_builddir)/src/lib/util/libgnunetutil.la | 378 | $(top_builddir)/src/lib/util/libgnunetutil.la |
379 | 379 | ||
380 | test_fs_search_persistence_SOURCES = \ | 380 | test_fs_search_persistence_SOURCES = \ |
381 | test_fs_search_persistence.c | 381 | test_fs_search_persistence.c |
382 | test_fs_search_persistence_LDADD = \ | 382 | test_fs_search_persistence_LDADD = \ |
383 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 383 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
384 | libgnunetfs.la \ | 384 | libgnunetfs.la \ |
385 | $(top_builddir)/src/lib/util/libgnunetutil.la | 385 | $(top_builddir)/src/lib/util/libgnunetutil.la |
386 | 386 | ||
387 | test_fs_start_stop_SOURCES = \ | 387 | test_fs_start_stop_SOURCES = \ |
388 | test_fs_start_stop.c | 388 | test_fs_start_stop.c |
389 | test_fs_start_stop_LDADD = \ | 389 | test_fs_start_stop_LDADD = \ |
390 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 390 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
391 | libgnunetfs.la \ | 391 | libgnunetfs.la \ |
392 | $(top_builddir)/src/lib/util/libgnunetutil.la | 392 | $(top_builddir)/src/lib/util/libgnunetutil.la |
393 | 393 | ||
394 | test_fs_unindex_SOURCES = \ | 394 | test_fs_unindex_SOURCES = \ |
395 | test_fs_unindex.c | 395 | test_fs_unindex.c |
396 | test_fs_unindex_LDADD = \ | 396 | test_fs_unindex_LDADD = \ |
397 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 397 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
398 | libgnunetfs.la \ | 398 | libgnunetfs.la \ |
399 | $(top_builddir)/src/lib/util/libgnunetutil.la | 399 | $(top_builddir)/src/lib/util/libgnunetutil.la |
400 | 400 | ||
401 | test_fs_unindex_persistence_SOURCES = \ | 401 | test_fs_unindex_persistence_SOURCES = \ |
402 | test_fs_unindex_persistence.c | 402 | test_fs_unindex_persistence.c |
403 | test_fs_unindex_persistence_LDADD = \ | 403 | test_fs_unindex_persistence_LDADD = \ |
404 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 404 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
405 | libgnunetfs.la \ | 405 | libgnunetfs.la \ |
406 | $(top_builddir)/src/lib/util/libgnunetutil.la | 406 | $(top_builddir)/src/lib/util/libgnunetutil.la |
407 | 407 | ||
@@ -455,7 +455,7 @@ test_fs_uri_LDADD = \ | |||
455 | # perf_gnunet_service_fs_p2p.c | 455 | # perf_gnunet_service_fs_p2p.c |
456 | #perf_gnunet_service_fs_p2p_LDADD = \ | 456 | #perf_gnunet_service_fs_p2p_LDADD = \ |
457 | # libgnunetfstest.a \ | 457 | # libgnunetfstest.a \ |
458 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 458 | # $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
459 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ | 459 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ |
460 | # libgnunetfs.la \ | 460 | # libgnunetfs.la \ |
461 | # $(top_builddir)/src/lib/util/libgnunetutil.la | 461 | # $(top_builddir)/src/lib/util/libgnunetutil.la |
@@ -464,7 +464,7 @@ test_fs_uri_LDADD = \ | |||
464 | # perf_gnunet_service_fs_p2p.c | 464 | # perf_gnunet_service_fs_p2p.c |
465 | #perf_gnunet_service_fs_p2p_index_LDADD = \ | 465 | #perf_gnunet_service_fs_p2p_index_LDADD = \ |
466 | # libgnunetfstest.a \ | 466 | # libgnunetfstest.a \ |
467 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 467 | # $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
468 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ | 468 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ |
469 | # libgnunetfs.la \ | 469 | # libgnunetfs.la \ |
470 | # $(top_builddir)/src/lib/util/libgnunetutil.la | 470 | # $(top_builddir)/src/lib/util/libgnunetutil.la |
@@ -473,7 +473,7 @@ test_fs_uri_LDADD = \ | |||
473 | # perf_gnunet_service_fs_p2p.c | 473 | # perf_gnunet_service_fs_p2p.c |
474 | #perf_gnunet_service_fs_p2p_dht_LDADD = \ | 474 | #perf_gnunet_service_fs_p2p_dht_LDADD = \ |
475 | # libgnunetfstest.a \ | 475 | # libgnunetfstest.a \ |
476 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 476 | # $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
477 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ | 477 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ |
478 | # libgnunetfs.la \ | 478 | # libgnunetfs.la \ |
479 | # $(top_builddir)/src/lib/util/libgnunetutil.la | 479 | # $(top_builddir)/src/lib/util/libgnunetutil.la |
@@ -482,7 +482,7 @@ test_fs_uri_LDADD = \ | |||
482 | # perf_gnunet_service_fs_p2p_respect.c | 482 | # perf_gnunet_service_fs_p2p_respect.c |
483 | #perf_gnunet_service_fs_p2p_respect_LDADD = \ | 483 | #perf_gnunet_service_fs_p2p_respect_LDADD = \ |
484 | # libgnunetfstest.a \ | 484 | # libgnunetfstest.a \ |
485 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 485 | # $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
486 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ | 486 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ |
487 | # libgnunetfs.la \ | 487 | # libgnunetfs.la \ |
488 | # $(top_builddir)/src/lib/util/libgnunetutil.la | 488 | # $(top_builddir)/src/lib/util/libgnunetutil.la |
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 191103088..d739f8131 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -201,7 +201,7 @@ gnunet_service_gns_LDADD = \ | |||
201 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 201 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
202 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 202 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
203 | $(top_builddir)/src/revocation/libgnunetrevocation.la \ | 203 | $(top_builddir)/src/revocation/libgnunetrevocation.la \ |
204 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 204 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
205 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 205 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
206 | $(top_builddir)/src/dns/libgnunetdns.la \ | 206 | $(top_builddir)/src/dns/libgnunetdns.la \ |
207 | $(top_builddir)/src/dht/libgnunetdht.la \ | 207 | $(top_builddir)/src/dht/libgnunetdht.la \ |
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index 9cf72142a..fc9952aa6 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am | |||
@@ -28,8 +28,8 @@ gnunet_daemon_hostlist_SOURCES = \ | |||
28 | gnunet_daemon_hostlist_LDADD = \ | 28 | gnunet_daemon_hostlist_LDADD = \ |
29 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 29 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
30 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 30 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
31 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 31 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
32 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 32 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
33 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 33 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
34 | $(GN_LIBMHD) \ | 34 | $(GN_LIBMHD) \ |
35 | @LIBCURL@ \ | 35 | @LIBCURL@ \ |
@@ -54,21 +54,21 @@ endif | |||
54 | #test_gnunet_daemon_hostlist_SOURCES = \ | 54 | #test_gnunet_daemon_hostlist_SOURCES = \ |
55 | # test_gnunet_daemon_hostlist.c | 55 | # test_gnunet_daemon_hostlist.c |
56 | #test_gnunet_daemon_hostlist_LDADD = \ | 56 | #test_gnunet_daemon_hostlist_LDADD = \ |
57 | # $(top_builddir)/src/transport/libgnunettransport.la \ | 57 | # $(top_builddir)/src/service/transport/libgnunettransport.la \ |
58 | # $(top_builddir)/src/lib/util/libgnunetutil.la | 58 | # $(top_builddir)/src/lib/util/libgnunetutil.la |
59 | # | 59 | # |
60 | #test_gnunet_daemon_hostlist_reconnect_SOURCES = \ | 60 | #test_gnunet_daemon_hostlist_reconnect_SOURCES = \ |
61 | # test_gnunet_daemon_hostlist_reconnect.c | 61 | # test_gnunet_daemon_hostlist_reconnect.c |
62 | #test_gnunet_daemon_hostlist_reconnect_LDADD = \ | 62 | #test_gnunet_daemon_hostlist_reconnect_LDADD = \ |
63 | # $(top_builddir)/src/transport/libgnunettransport.la \ | 63 | # $(top_builddir)/src/service/transport/libgnunettransport.la \ |
64 | # $(top_builddir)/src/lib/util/libgnunetutil.la | 64 | # $(top_builddir)/src/lib/util/libgnunetutil.la |
65 | # | 65 | # |
66 | #test_gnunet_daemon_hostlist_learning_SOURCES = \ | 66 | #test_gnunet_daemon_hostlist_learning_SOURCES = \ |
67 | # test_gnunet_daemon_hostlist_learning.c | 67 | # test_gnunet_daemon_hostlist_learning.c |
68 | #test_gnunet_daemon_hostlist_learning_LDADD = \ | 68 | #test_gnunet_daemon_hostlist_learning_LDADD = \ |
69 | # $(top_builddir)/src/transport/libgnunettransport.la \ | 69 | # $(top_builddir)/src/service/transport/libgnunettransport.la \ |
70 | # $(top_builddir)/src/service/core/libgnunetcore.la \ | 70 | # $(top_builddir)/src/service/core/libgnunetcore.la \ |
71 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 71 | # $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
72 | # $(top_builddir)/src/lib/util/libgnunetutil.la | 72 | # $(top_builddir)/src/lib/util/libgnunetutil.la |
73 | 73 | ||
74 | EXTRA_DIST = \ | 74 | EXTRA_DIST = \ |
diff --git a/src/lib/gnsrecord/Makefile.am b/src/lib/gnsrecord/Makefile.am index 27d14a972..57b004847 100644 --- a/src/lib/gnsrecord/Makefile.am +++ b/src/lib/gnsrecord/Makefile.am | |||
@@ -74,7 +74,7 @@ EXTRA_DIST = \ | |||
74 | test_gnsrecord_lsd0001testvectors_SOURCES = \ | 74 | test_gnsrecord_lsd0001testvectors_SOURCES = \ |
75 | test_gnsrecord_testvectors.c | 75 | test_gnsrecord_testvectors.c |
76 | test_gnsrecord_lsd0001testvectors_LDADD = \ | 76 | test_gnsrecord_lsd0001testvectors_LDADD = \ |
77 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 77 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
78 | libgnunetgnsrecord.la \ | 78 | libgnunetgnsrecord.la \ |
79 | $(top_builddir)/src/lib/util/libgnunetutil.la | 79 | $(top_builddir)/src/lib/util/libgnunetutil.la |
80 | 80 | ||
@@ -82,14 +82,14 @@ test_gnsrecord_lsd0001testvectors_LDADD = \ | |||
82 | test_gnsrecord_serialization_SOURCES = \ | 82 | test_gnsrecord_serialization_SOURCES = \ |
83 | test_gnsrecord_serialization.c | 83 | test_gnsrecord_serialization.c |
84 | test_gnsrecord_serialization_LDADD = \ | 84 | test_gnsrecord_serialization_LDADD = \ |
85 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 85 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
86 | libgnunetgnsrecord.la \ | 86 | libgnunetgnsrecord.la \ |
87 | $(top_builddir)/src/lib/util/libgnunetutil.la | 87 | $(top_builddir)/src/lib/util/libgnunetutil.la |
88 | 88 | ||
89 | test_gnsrecord_block_expiration_SOURCES = \ | 89 | test_gnsrecord_block_expiration_SOURCES = \ |
90 | test_gnsrecord_block_expiration.c | 90 | test_gnsrecord_block_expiration.c |
91 | test_gnsrecord_block_expiration_LDADD = \ | 91 | test_gnsrecord_block_expiration_LDADD = \ |
92 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 92 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
93 | libgnunetgnsrecord.la \ | 93 | libgnunetgnsrecord.la \ |
94 | $(top_builddir)/src/lib/util/libgnunetutil.la | 94 | $(top_builddir)/src/lib/util/libgnunetutil.la |
95 | 95 | ||
@@ -97,7 +97,7 @@ test_gnsrecord_block_expiration_LDADD = \ | |||
97 | test_gnsrecord_crypto_SOURCES = \ | 97 | test_gnsrecord_crypto_SOURCES = \ |
98 | test_gnsrecord_crypto.c | 98 | test_gnsrecord_crypto.c |
99 | test_gnsrecord_crypto_LDADD = \ | 99 | test_gnsrecord_crypto_LDADD = \ |
100 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 100 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
101 | libgnunetgnsrecord.la \ | 101 | libgnunetgnsrecord.la \ |
102 | $(top_builddir)/src/lib/util/libgnunetutil.la | 102 | $(top_builddir)/src/lib/util/libgnunetutil.la |
103 | 103 | ||
@@ -105,6 +105,6 @@ test_gnsrecord_crypto_LDADD = \ | |||
105 | perf_gnsrecord_crypto_SOURCES = \ | 105 | perf_gnsrecord_crypto_SOURCES = \ |
106 | perf_gnsrecord_crypto.c | 106 | perf_gnsrecord_crypto.c |
107 | perf_gnsrecord_crypto_LDADD = \ | 107 | perf_gnsrecord_crypto_LDADD = \ |
108 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 108 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
109 | libgnunetgnsrecord.la \ | 109 | libgnunetgnsrecord.la \ |
110 | $(top_builddir)/src/lib/util/libgnunetutil.la | 110 | $(top_builddir)/src/lib/util/libgnunetutil.la |
diff --git a/src/messenger/Makefile.am b/src/messenger/Makefile.am index d464261df..60b2314ac 100644 --- a/src/messenger/Makefile.am +++ b/src/messenger/Makefile.am | |||
@@ -109,14 +109,14 @@ test_messenger_api_SOURCES = \ | |||
109 | test_messenger.c | 109 | test_messenger.c |
110 | test_messenger_api_LDADD = \ | 110 | test_messenger_api_LDADD = \ |
111 | libgnunetmessenger.la \ | 111 | libgnunetmessenger.la \ |
112 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 112 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
113 | $(top_builddir)/src/lib/util/libgnunetutil.la | 113 | $(top_builddir)/src/lib/util/libgnunetutil.la |
114 | 114 | ||
115 | test_messenger_anonymous_SOURCES = \ | 115 | test_messenger_anonymous_SOURCES = \ |
116 | test_messenger_anonymous.c | 116 | test_messenger_anonymous.c |
117 | test_messenger_anonymous_LDADD = \ | 117 | test_messenger_anonymous_LDADD = \ |
118 | libgnunetmessenger.la \ | 118 | libgnunetmessenger.la \ |
119 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 119 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
120 | $(top_builddir)/src/lib/util/libgnunetutil.la | 120 | $(top_builddir)/src/lib/util/libgnunetutil.la |
121 | 121 | ||
122 | EXTRA_DIST = \ | 122 | EXTRA_DIST = \ |
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am index 9be5a4fce..36e70813a 100644 --- a/src/namecache/Makefile.am +++ b/src/namecache/Makefile.am | |||
@@ -93,7 +93,7 @@ gnunet_service_namecache_SOURCES = \ | |||
93 | gnunet_service_namecache_LDADD = \ | 93 | gnunet_service_namecache_LDADD = \ |
94 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 94 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
95 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 95 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
96 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 96 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
97 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 97 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
98 | libgnunetnamecache.la \ | 98 | libgnunetnamecache.la \ |
99 | $(GN_LIBINTL) | 99 | $(GN_LIBINTL) |
@@ -108,7 +108,7 @@ libgnunet_plugin_namecache_flat_la_SOURCES = \ | |||
108 | plugin_namecache_flat.c | 108 | plugin_namecache_flat.c |
109 | libgnunet_plugin_namecache_flat_la_LIBADD = \ | 109 | libgnunet_plugin_namecache_flat_la_LIBADD = \ |
110 | libgnunetnamecache.la \ | 110 | libgnunetnamecache.la \ |
111 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 111 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
112 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 112 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
113 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 113 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
114 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ | 114 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \ |
@@ -121,7 +121,7 @@ libgnunet_plugin_namecache_sqlite_la_SOURCES = \ | |||
121 | libgnunet_plugin_namecache_sqlite_la_LIBADD = \ | 121 | libgnunet_plugin_namecache_sqlite_la_LIBADD = \ |
122 | libgnunetnamecache.la \ | 122 | libgnunetnamecache.la \ |
123 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ | 123 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ |
124 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 124 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
125 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 125 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
126 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 126 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
127 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ | 127 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ |
@@ -135,7 +135,7 @@ libgnunet_plugin_namecache_postgres_la_SOURCES = \ | |||
135 | libgnunet_plugin_namecache_postgres_la_LIBADD = \ | 135 | libgnunet_plugin_namecache_postgres_la_LIBADD = \ |
136 | libgnunetnamecache.la \ | 136 | libgnunetnamecache.la \ |
137 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ | 137 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ |
138 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 138 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
139 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 139 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
140 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 140 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
141 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \ | 141 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \ |
@@ -149,26 +149,26 @@ test_namecache_api_cache_block_LDADD = \ | |||
149 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 149 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
150 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 150 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
151 | libgnunetnamecache.la \ | 151 | libgnunetnamecache.la \ |
152 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 152 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
153 | $(top_builddir)/src/lib/util/libgnunetutil.la | 153 | $(top_builddir)/src/lib/util/libgnunetutil.la |
154 | 154 | ||
155 | 155 | ||
156 | test_plugin_namecache_flat_SOURCES = \ | 156 | test_plugin_namecache_flat_SOURCES = \ |
157 | test_plugin_namecache.c | 157 | test_plugin_namecache.c |
158 | test_plugin_namecache_flat_LDADD = \ | 158 | test_plugin_namecache_flat_LDADD = \ |
159 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 159 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
160 | $(top_builddir)/src/lib/util/libgnunetutil.la | 160 | $(top_builddir)/src/lib/util/libgnunetutil.la |
161 | 161 | ||
162 | test_plugin_namecache_sqlite_SOURCES = \ | 162 | test_plugin_namecache_sqlite_SOURCES = \ |
163 | test_plugin_namecache.c | 163 | test_plugin_namecache.c |
164 | test_plugin_namecache_sqlite_LDADD = \ | 164 | test_plugin_namecache_sqlite_LDADD = \ |
165 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 165 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
166 | $(top_builddir)/src/lib/util/libgnunetutil.la | 166 | $(top_builddir)/src/lib/util/libgnunetutil.la |
167 | 167 | ||
168 | test_plugin_namecache_postgres_SOURCES = \ | 168 | test_plugin_namecache_postgres_SOURCES = \ |
169 | test_plugin_namecache.c | 169 | test_plugin_namecache.c |
170 | test_plugin_namecache_postgres_LDADD = \ | 170 | test_plugin_namecache_postgres_LDADD = \ |
171 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 171 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
172 | $(top_builddir)/src/lib/util/libgnunetutil.la | 172 | $(top_builddir)/src/lib/util/libgnunetutil.la |
173 | 173 | ||
174 | EXTRA_DIST = \ | 174 | EXTRA_DIST = \ |
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 2bdc25d56..3dbec4a25 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -127,7 +127,7 @@ libgnunetnamestore_la_SOURCES = \ | |||
127 | libgnunetnamestore_la_LIBADD = \ | 127 | libgnunetnamestore_la_LIBADD = \ |
128 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 128 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
129 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 129 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
130 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 130 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
131 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 131 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
132 | $(GN_LIBINTL) | 132 | $(GN_LIBINTL) |
133 | libgnunetnamestore_la_LDFLAGS = \ | 133 | libgnunetnamestore_la_LDFLAGS = \ |
@@ -147,7 +147,7 @@ gnunet_zoneimport_SOURCES = \ | |||
147 | gnunet-zoneimport.c | 147 | gnunet-zoneimport.c |
148 | gnunet_zoneimport_LDADD = \ | 148 | gnunet_zoneimport_LDADD = \ |
149 | libgnunetnamestore.la \ | 149 | libgnunetnamestore.la \ |
150 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 150 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
151 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 151 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
152 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 152 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
153 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 153 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
@@ -189,7 +189,7 @@ gnunet_service_namestore_LDADD = \ | |||
189 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 189 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |
190 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 190 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
191 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 191 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
192 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 192 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
193 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 193 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
194 | libgnunetnamestore.la \ | 194 | libgnunetnamestore.la \ |
195 | $(GN_LIBINTL) | 195 | $(GN_LIBINTL) |
@@ -202,7 +202,7 @@ libgnunet_plugin_namestore_sqlite_la_LIBADD = \ | |||
202 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 202 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
203 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 203 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
204 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ | 204 | $(top_builddir)/src/lib/sq/libgnunetsq.la \ |
205 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 205 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
206 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ | 206 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ |
207 | $(LTLIBINTL) | 207 | $(LTLIBINTL) |
208 | libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \ | 208 | libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \ |
@@ -214,7 +214,7 @@ libgnunet_plugin_namestore_postgres_la_LIBADD = \ | |||
214 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 214 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
215 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 215 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
216 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ | 216 | $(top_builddir)/src/lib/pq/libgnunetpq.la \ |
217 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 217 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
218 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \ | 218 | $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \ |
219 | $(LTLIBINTL) | 219 | $(LTLIBINTL) |
220 | libgnunet_plugin_namestore_postgres_la_LDFLAGS = \ | 220 | libgnunet_plugin_namestore_postgres_la_LDFLAGS = \ |
@@ -223,7 +223,7 @@ libgnunet_plugin_namestore_postgres_la_LDFLAGS = \ | |||
223 | test_namestore_api_store_sqlite_SOURCES = \ | 223 | test_namestore_api_store_sqlite_SOURCES = \ |
224 | test_namestore_api_store.c | 224 | test_namestore_api_store.c |
225 | test_namestore_api_store_sqlite_LDADD = \ | 225 | test_namestore_api_store_sqlite_LDADD = \ |
226 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 226 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
227 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 227 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
228 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 228 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
229 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 229 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
@@ -232,7 +232,7 @@ test_namestore_api_store_sqlite_LDADD = \ | |||
232 | test_namestore_api_store_postgres_SOURCES = \ | 232 | test_namestore_api_store_postgres_SOURCES = \ |
233 | test_namestore_api_store.c | 233 | test_namestore_api_store.c |
234 | test_namestore_api_store_postgres_LDADD = \ | 234 | test_namestore_api_store_postgres_LDADD = \ |
235 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 235 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
236 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 236 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
237 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 237 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
238 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 238 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
@@ -241,7 +241,7 @@ test_namestore_api_store_postgres_LDADD = \ | |||
241 | test_namestore_api_store_update_sqlite_SOURCES = \ | 241 | test_namestore_api_store_update_sqlite_SOURCES = \ |
242 | test_namestore_api_store_update.c | 242 | test_namestore_api_store_update.c |
243 | test_namestore_api_store_update_sqlite_LDADD = \ | 243 | test_namestore_api_store_update_sqlite_LDADD = \ |
244 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 244 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
245 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 245 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
246 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 246 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
247 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 247 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -251,7 +251,7 @@ test_namestore_api_store_update_sqlite_LDADD = \ | |||
251 | test_namestore_api_store_update_postgres_SOURCES = \ | 251 | test_namestore_api_store_update_postgres_SOURCES = \ |
252 | test_namestore_api_store_update.c | 252 | test_namestore_api_store_update.c |
253 | test_namestore_api_store_update_postgres_LDADD = \ | 253 | test_namestore_api_store_update_postgres_LDADD = \ |
254 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 254 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
255 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 255 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
256 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 256 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
257 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 257 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -261,7 +261,7 @@ test_namestore_api_store_update_postgres_LDADD = \ | |||
261 | test_namestore_api_lookup_nick_sqlite_SOURCES = \ | 261 | test_namestore_api_lookup_nick_sqlite_SOURCES = \ |
262 | test_namestore_api_lookup_nick.c | 262 | test_namestore_api_lookup_nick.c |
263 | test_namestore_api_lookup_nick_sqlite_LDADD = \ | 263 | test_namestore_api_lookup_nick_sqlite_LDADD = \ |
264 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 264 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
265 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 265 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
266 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 266 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
267 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 267 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -271,7 +271,7 @@ test_namestore_api_lookup_nick_sqlite_LDADD = \ | |||
271 | test_namestore_api_lookup_nick_postgres_SOURCES = \ | 271 | test_namestore_api_lookup_nick_postgres_SOURCES = \ |
272 | test_namestore_api_lookup_nick.c | 272 | test_namestore_api_lookup_nick.c |
273 | test_namestore_api_lookup_nick_postgres_LDADD = \ | 273 | test_namestore_api_lookup_nick_postgres_LDADD = \ |
274 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 274 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
275 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 275 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
276 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 276 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
277 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 277 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -282,7 +282,7 @@ test_namestore_api_remove_sqlite_SOURCES = \ | |||
282 | test_namestore_api_remove.c | 282 | test_namestore_api_remove.c |
283 | test_namestore_api_remove_sqlite_LDADD = \ | 283 | test_namestore_api_remove_sqlite_LDADD = \ |
284 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 284 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
285 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 285 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
286 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 286 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
287 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 287 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
288 | libgnunetnamestore.la | 288 | libgnunetnamestore.la |
@@ -291,7 +291,7 @@ test_namestore_api_remove_postgres_SOURCES = \ | |||
291 | test_namestore_api_remove.c | 291 | test_namestore_api_remove.c |
292 | test_namestore_api_remove_postgres_LDADD = \ | 292 | test_namestore_api_remove_postgres_LDADD = \ |
293 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 293 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
294 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 294 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
295 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 295 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
296 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 296 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
297 | libgnunetnamestore.la | 297 | libgnunetnamestore.la |
@@ -299,7 +299,7 @@ test_namestore_api_remove_postgres_LDADD = \ | |||
299 | test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \ | 299 | test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \ |
300 | test_namestore_api_remove_not_existing_record.c | 300 | test_namestore_api_remove_not_existing_record.c |
301 | test_namestore_api_remove_not_existing_record_sqlite_LDADD = \ | 301 | test_namestore_api_remove_not_existing_record_sqlite_LDADD = \ |
302 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 302 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
303 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 303 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
304 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 304 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
305 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 305 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -308,7 +308,7 @@ test_namestore_api_remove_not_existing_record_sqlite_LDADD = \ | |||
308 | test_namestore_api_remove_not_existing_record_postgres_SOURCES = \ | 308 | test_namestore_api_remove_not_existing_record_postgres_SOURCES = \ |
309 | test_namestore_api_remove_not_existing_record.c | 309 | test_namestore_api_remove_not_existing_record.c |
310 | test_namestore_api_remove_not_existing_record_postgres_LDADD = \ | 310 | test_namestore_api_remove_not_existing_record_postgres_LDADD = \ |
311 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 311 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
312 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 312 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
313 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 313 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
314 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 314 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -318,7 +318,7 @@ test_namestore_api_zone_to_name_sqlite_SOURCES = \ | |||
318 | test_namestore_api_zone_to_name.c | 318 | test_namestore_api_zone_to_name.c |
319 | test_namestore_api_zone_to_name_sqlite_LDADD = \ | 319 | test_namestore_api_zone_to_name_sqlite_LDADD = \ |
320 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 320 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
321 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 321 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
322 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 322 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
323 | libgnunetnamestore.la | 323 | libgnunetnamestore.la |
324 | 324 | ||
@@ -326,7 +326,7 @@ test_namestore_api_zone_to_name_postgres_SOURCES = \ | |||
326 | test_namestore_api_zone_to_name.c | 326 | test_namestore_api_zone_to_name.c |
327 | test_namestore_api_zone_to_name_postgres_LDADD = \ | 327 | test_namestore_api_zone_to_name_postgres_LDADD = \ |
328 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 328 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
329 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 329 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
330 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 330 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
331 | libgnunetnamestore.la | 331 | libgnunetnamestore.la |
332 | 332 | ||
@@ -334,7 +334,7 @@ test_namestore_api_monitoring_sqlite_SOURCES = \ | |||
334 | test_namestore_api_monitoring.c | 334 | test_namestore_api_monitoring.c |
335 | test_namestore_api_monitoring_sqlite_LDADD = \ | 335 | test_namestore_api_monitoring_sqlite_LDADD = \ |
336 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 336 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
337 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 337 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
338 | libgnunetnamestore.la \ | 338 | libgnunetnamestore.la \ |
339 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 339 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
340 | $(top_builddir)/src/lib/util/libgnunetutil.la | 340 | $(top_builddir)/src/lib/util/libgnunetutil.la |
@@ -342,7 +342,7 @@ test_namestore_api_monitoring_sqlite_LDADD = \ | |||
342 | test_namestore_api_monitoring_postgres_SOURCES = \ | 342 | test_namestore_api_monitoring_postgres_SOURCES = \ |
343 | test_namestore_api_monitoring.c | 343 | test_namestore_api_monitoring.c |
344 | test_namestore_api_monitoring_postgres_LDADD = \ | 344 | test_namestore_api_monitoring_postgres_LDADD = \ |
345 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 345 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
346 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 346 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
347 | libgnunetnamestore.la \ | 347 | libgnunetnamestore.la \ |
348 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 348 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -351,7 +351,7 @@ test_namestore_api_monitoring_postgres_LDADD = \ | |||
351 | test_namestore_api_monitoring_existing_sqlite_SOURCES = \ | 351 | test_namestore_api_monitoring_existing_sqlite_SOURCES = \ |
352 | test_namestore_api_monitoring_existing.c | 352 | test_namestore_api_monitoring_existing.c |
353 | test_namestore_api_monitoring_existing_sqlite_LDADD = \ | 353 | test_namestore_api_monitoring_existing_sqlite_LDADD = \ |
354 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 354 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
355 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 355 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
356 | libgnunetnamestore.la \ | 356 | libgnunetnamestore.la \ |
357 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 357 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -360,7 +360,7 @@ test_namestore_api_monitoring_existing_sqlite_LDADD = \ | |||
360 | test_namestore_api_monitoring_existing_postgres_SOURCES = \ | 360 | test_namestore_api_monitoring_existing_postgres_SOURCES = \ |
361 | test_namestore_api_monitoring_existing.c | 361 | test_namestore_api_monitoring_existing.c |
362 | test_namestore_api_monitoring_existing_postgres_LDADD = \ | 362 | test_namestore_api_monitoring_existing_postgres_LDADD = \ |
363 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 363 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
364 | libgnunetnamestore.la \ | 364 | libgnunetnamestore.la \ |
365 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 365 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
366 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 366 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
@@ -369,7 +369,7 @@ test_namestore_api_monitoring_existing_postgres_LDADD = \ | |||
369 | test_namestore_api_tx_rollback_sqlite_SOURCES = \ | 369 | test_namestore_api_tx_rollback_sqlite_SOURCES = \ |
370 | test_namestore_api_tx_rollback.c | 370 | test_namestore_api_tx_rollback.c |
371 | test_namestore_api_tx_rollback_sqlite_LDADD = \ | 371 | test_namestore_api_tx_rollback_sqlite_LDADD = \ |
372 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 372 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
373 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 373 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
374 | libgnunetnamestore.la \ | 374 | libgnunetnamestore.la \ |
375 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 375 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -378,7 +378,7 @@ test_namestore_api_tx_rollback_sqlite_LDADD = \ | |||
378 | test_namestore_api_tx_rollback_postgres_SOURCES = \ | 378 | test_namestore_api_tx_rollback_postgres_SOURCES = \ |
379 | test_namestore_api_tx_rollback.c | 379 | test_namestore_api_tx_rollback.c |
380 | test_namestore_api_tx_rollback_postgres_LDADD = \ | 380 | test_namestore_api_tx_rollback_postgres_LDADD = \ |
381 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 381 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
382 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 382 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
383 | libgnunetnamestore.la \ | 383 | libgnunetnamestore.la \ |
384 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 384 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -388,7 +388,7 @@ if HAVE_EXPERIMENTAL | |||
388 | test_namestore_api_edit_records_postgres_SOURCES = \ | 388 | test_namestore_api_edit_records_postgres_SOURCES = \ |
389 | test_namestore_api_edit_records.c | 389 | test_namestore_api_edit_records.c |
390 | test_namestore_api_edit_records_postgres_LDADD = \ | 390 | test_namestore_api_edit_records_postgres_LDADD = \ |
391 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 391 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
392 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 392 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
393 | libgnunetnamestore.la \ | 393 | libgnunetnamestore.la \ |
394 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 394 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -398,7 +398,7 @@ endif | |||
398 | test_namestore_api_zone_iteration_sqlite_SOURCES = \ | 398 | test_namestore_api_zone_iteration_sqlite_SOURCES = \ |
399 | test_namestore_api_zone_iteration.c | 399 | test_namestore_api_zone_iteration.c |
400 | test_namestore_api_zone_iteration_sqlite_LDADD = \ | 400 | test_namestore_api_zone_iteration_sqlite_LDADD = \ |
401 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 401 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
402 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 402 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
403 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 403 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
404 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 404 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -407,7 +407,7 @@ test_namestore_api_zone_iteration_sqlite_LDADD = \ | |||
407 | test_namestore_api_zone_iteration_postgres_SOURCES = \ | 407 | test_namestore_api_zone_iteration_postgres_SOURCES = \ |
408 | test_namestore_api_zone_iteration.c | 408 | test_namestore_api_zone_iteration.c |
409 | test_namestore_api_zone_iteration_postgres_LDADD = \ | 409 | test_namestore_api_zone_iteration_postgres_LDADD = \ |
410 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 410 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
411 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 411 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
412 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 412 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
413 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 413 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -416,7 +416,7 @@ test_namestore_api_zone_iteration_postgres_LDADD = \ | |||
416 | perf_namestore_api_zone_iteration_postgres_SOURCES = \ | 416 | perf_namestore_api_zone_iteration_postgres_SOURCES = \ |
417 | perf_namestore_api_zone_iteration.c | 417 | perf_namestore_api_zone_iteration.c |
418 | perf_namestore_api_zone_iteration_postgres_LDADD = \ | 418 | perf_namestore_api_zone_iteration_postgres_LDADD = \ |
419 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 419 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
420 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 420 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
421 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 421 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
422 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 422 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -425,7 +425,7 @@ perf_namestore_api_zone_iteration_postgres_LDADD = \ | |||
425 | perf_namestore_api_import_sqlite_SOURCES = \ | 425 | perf_namestore_api_import_sqlite_SOURCES = \ |
426 | perf_namestore_api_import.c | 426 | perf_namestore_api_import.c |
427 | perf_namestore_api_import_sqlite_LDADD = \ | 427 | perf_namestore_api_import_sqlite_LDADD = \ |
428 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 428 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
429 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 429 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
430 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 430 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
431 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 431 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -434,7 +434,7 @@ perf_namestore_api_import_sqlite_LDADD = \ | |||
434 | perf_namestore_api_import_postgres_SOURCES = \ | 434 | perf_namestore_api_import_postgres_SOURCES = \ |
435 | perf_namestore_api_import.c | 435 | perf_namestore_api_import.c |
436 | perf_namestore_api_import_postgres_LDADD = \ | 436 | perf_namestore_api_import_postgres_LDADD = \ |
437 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 437 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
438 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 438 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
439 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 439 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
440 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 440 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -444,7 +444,7 @@ perf_namestore_api_import_postgres_LDADD = \ | |||
444 | perf_namestore_api_zone_iteration_sqlite_SOURCES = \ | 444 | perf_namestore_api_zone_iteration_sqlite_SOURCES = \ |
445 | perf_namestore_api_zone_iteration.c | 445 | perf_namestore_api_zone_iteration.c |
446 | perf_namestore_api_zone_iteration_sqlite_LDADD = \ | 446 | perf_namestore_api_zone_iteration_sqlite_LDADD = \ |
447 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 447 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
448 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 448 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
449 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 449 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
450 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 450 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -453,7 +453,7 @@ perf_namestore_api_zone_iteration_sqlite_LDADD = \ | |||
453 | test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \ | 453 | test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \ |
454 | test_namestore_api_zone_iteration_nick.c | 454 | test_namestore_api_zone_iteration_nick.c |
455 | test_namestore_api_zone_iteration_nick_sqlite_LDADD = \ | 455 | test_namestore_api_zone_iteration_nick_sqlite_LDADD = \ |
456 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 456 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
457 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 457 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
458 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 458 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
459 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 459 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -462,7 +462,7 @@ test_namestore_api_zone_iteration_nick_sqlite_LDADD = \ | |||
462 | test_namestore_api_zone_iteration_nick_postgres_SOURCES = \ | 462 | test_namestore_api_zone_iteration_nick_postgres_SOURCES = \ |
463 | test_namestore_api_zone_iteration_nick.c | 463 | test_namestore_api_zone_iteration_nick.c |
464 | test_namestore_api_zone_iteration_nick_postgres_LDADD = \ | 464 | test_namestore_api_zone_iteration_nick_postgres_LDADD = \ |
465 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 465 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
466 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 466 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
467 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 467 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
468 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 468 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -471,7 +471,7 @@ test_namestore_api_zone_iteration_nick_postgres_LDADD = \ | |||
471 | test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \ | 471 | test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \ |
472 | test_namestore_api_zone_iteration_specific_zone.c | 472 | test_namestore_api_zone_iteration_specific_zone.c |
473 | test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \ | 473 | test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \ |
474 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 474 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
475 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 475 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
476 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 476 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
477 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 477 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -480,7 +480,7 @@ test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \ | |||
480 | test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \ | 480 | test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \ |
481 | test_namestore_api_zone_iteration_specific_zone.c | 481 | test_namestore_api_zone_iteration_specific_zone.c |
482 | test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \ | 482 | test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \ |
483 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 483 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
484 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 484 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
485 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 485 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
486 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 486 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -489,7 +489,7 @@ test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \ | |||
489 | test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \ | 489 | test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \ |
490 | test_namestore_api_zone_iteration_stop.c | 490 | test_namestore_api_zone_iteration_stop.c |
491 | test_namestore_api_zone_iteration_stop_sqlite_LDADD = \ | 491 | test_namestore_api_zone_iteration_stop_sqlite_LDADD = \ |
492 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 492 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
493 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 493 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
494 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 494 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
495 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 495 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -498,7 +498,7 @@ test_namestore_api_zone_iteration_stop_sqlite_LDADD = \ | |||
498 | test_namestore_api_zone_iteration_stop_postgres_SOURCES = \ | 498 | test_namestore_api_zone_iteration_stop_postgres_SOURCES = \ |
499 | test_namestore_api_zone_iteration_stop.c | 499 | test_namestore_api_zone_iteration_stop.c |
500 | test_namestore_api_zone_iteration_stop_postgres_LDADD = \ | 500 | test_namestore_api_zone_iteration_stop_postgres_LDADD = \ |
501 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 501 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
502 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 502 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
503 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 503 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
504 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 504 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
@@ -507,7 +507,7 @@ test_namestore_api_zone_iteration_stop_postgres_LDADD = \ | |||
507 | test_plugin_namestore_sqlite_SOURCES = \ | 507 | test_plugin_namestore_sqlite_SOURCES = \ |
508 | test_plugin_namestore.c | 508 | test_plugin_namestore.c |
509 | test_plugin_namestore_sqlite_LDADD = \ | 509 | test_plugin_namestore_sqlite_LDADD = \ |
510 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 510 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
511 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 511 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
512 | $(top_builddir)/src/lib/util/libgnunetutil.la | 512 | $(top_builddir)/src/lib/util/libgnunetutil.la |
513 | 513 | ||
@@ -515,7 +515,7 @@ test_plugin_namestore_postgres_SOURCES = \ | |||
515 | test_plugin_namestore.c | 515 | test_plugin_namestore.c |
516 | test_plugin_namestore_postgres_LDADD = \ | 516 | test_plugin_namestore_postgres_LDADD = \ |
517 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 517 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
518 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 518 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
519 | $(top_builddir)/src/lib/util/libgnunetutil.la | 519 | $(top_builddir)/src/lib/util/libgnunetutil.la |
520 | 520 | ||
521 | check_SCRIPTS = \ | 521 | check_SCRIPTS = \ |
diff --git a/src/nat-auto/Makefile.am b/src/nat-auto/Makefile.am index 0ca5da4dc..7c3f8e11d 100644 --- a/src/nat-auto/Makefile.am +++ b/src/nat-auto/Makefile.am | |||
@@ -18,7 +18,7 @@ libexec_PROGRAMS = \ | |||
18 | gnunet_nat_server_SOURCES = \ | 18 | gnunet_nat_server_SOURCES = \ |
19 | gnunet-nat-server.c nat-auto.h | 19 | gnunet-nat-server.c nat-auto.h |
20 | gnunet_nat_server_LDADD = \ | 20 | gnunet_nat_server_LDADD = \ |
21 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | 21 | $(top_builddir)/src/service/nat/libgnunetnatnew.la \ |
22 | $(top_builddir)/src/lib/util/libgnunetutil.la | 22 | $(top_builddir)/src/lib/util/libgnunetutil.la |
23 | gnunet_nat_server_LDFLAGS = \ | 23 | gnunet_nat_server_LDFLAGS = \ |
24 | $(GN_LIBINTL) | 24 | $(GN_LIBINTL) |
@@ -42,7 +42,7 @@ libgnunetnatauto_la_SOURCES = \ | |||
42 | nat_auto_api.c \ | 42 | nat_auto_api.c \ |
43 | nat_auto_api_test.c | 43 | nat_auto_api_test.c |
44 | libgnunetnatauto_la_LIBADD = \ | 44 | libgnunetnatauto_la_LIBADD = \ |
45 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | 45 | $(top_builddir)/src/service/nat/libgnunetnatnew.la \ |
46 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 46 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
47 | $(GN_LIBINTL) @EXT_LIBS@ | 47 | $(GN_LIBINTL) @EXT_LIBS@ |
48 | libgnunetnatauto_la_LDFLAGS = \ | 48 | libgnunetnatauto_la_LDFLAGS = \ |
@@ -53,8 +53,8 @@ gnunet_service_nat_auto_SOURCES = \ | |||
53 | gnunet-service-nat-auto.c | 53 | gnunet-service-nat-auto.c |
54 | gnunet_service_nat_auto_LDADD = \ | 54 | gnunet_service_nat_auto_LDADD = \ |
55 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 55 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
56 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 56 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
57 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | 57 | $(top_builddir)/src/service/nat/libgnunetnatnew.la \ |
58 | $(LIBGCRYPT_LIBS) \ | 58 | $(LIBGCRYPT_LIBS) \ |
59 | -lgcrypt \ | 59 | -lgcrypt \ |
60 | $(GN_LIBINTL) | 60 | $(GN_LIBINTL) |
diff --git a/src/plugin/dhtu/Makefile.am b/src/plugin/dhtu/Makefile.am index 26e706e36..500d5a7b1 100644 --- a/src/plugin/dhtu/Makefile.am +++ b/src/plugin/dhtu/Makefile.am | |||
@@ -34,10 +34,10 @@ libgnunet_plugin_dhtu_gnunet_la_SOURCES = \ | |||
34 | plugin_dhtu_gnunet.c | 34 | plugin_dhtu_gnunet.c |
35 | libgnunet_plugin_dhtu_gnunet_la_LIBADD = \ | 35 | libgnunet_plugin_dhtu_gnunet_la_LIBADD = \ |
36 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 36 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
37 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 37 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
38 | $(top_builddir)/src/transport/libgnunettransportapplication.la \ | 38 | $(top_builddir)/src/service/transport/libgnunettransportapplication.la \ |
39 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 39 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
40 | $(top_builddir)/src/nse/libgnunetnse.la \ | 40 | $(top_builddir)/src/service/nse/libgnunetnse.la \ |
41 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 41 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
42 | $(XLIBS) \ | 42 | $(XLIBS) \ |
43 | $(LTLIBINTL) | 43 | $(LTLIBINTL) |
@@ -51,7 +51,7 @@ lib_LTLIBRARIES = \ | |||
51 | libgnunettestingdhtu_la_SOURCES = \ | 51 | libgnunettestingdhtu_la_SOURCES = \ |
52 | testing_dhtu_cmd_send.c | 52 | testing_dhtu_cmd_send.c |
53 | libgnunettestingdhtu_la_LIBADD = \ | 53 | libgnunettestingdhtu_la_LIBADD = \ |
54 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 54 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
55 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 55 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
56 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 56 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
57 | $(LTLIBINTL) | 57 | $(LTLIBINTL) |
@@ -64,7 +64,7 @@ libgnunettestingdhtu_la_LDFLAGS = \ | |||
64 | test_dhtu_ip_SOURCES = \ | 64 | test_dhtu_ip_SOURCES = \ |
65 | test_dhtu_ip.c | 65 | test_dhtu_ip.c |
66 | test_dhtu_ip_LDADD = \ | 66 | test_dhtu_ip_LDADD = \ |
67 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 67 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
68 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 68 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
69 | $(top_builddir)/src/lib/util/libgnunetutil.la | 69 | $(top_builddir)/src/lib/util/libgnunetutil.la |
70 | 70 | ||
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index f00d16a5c..8a171ec0e 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am | |||
@@ -24,7 +24,7 @@ gnunet_daemon_pt_LDADD = \ | |||
24 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 24 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
25 | $(top_builddir)/src/dht/libgnunetdht.la \ | 25 | $(top_builddir)/src/dht/libgnunetdht.la \ |
26 | $(top_builddir)/src/dns/libgnunetdns.la \ | 26 | $(top_builddir)/src/dns/libgnunetdns.la \ |
27 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 27 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
28 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 28 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
29 | $(GN_LIBINTL) | 29 | $(GN_LIBINTL) |
30 | 30 | ||
@@ -56,7 +56,7 @@ test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \ | |||
56 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 56 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
57 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 57 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
58 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 58 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
59 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 59 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
60 | $(top_builddir)/src/lib/util/libgnunetutil.la | 60 | $(top_builddir)/src/lib/util/libgnunetutil.la |
61 | test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) | 61 | test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) |
62 | 62 | ||
@@ -64,7 +64,7 @@ test_gnunet_vpn_4_over_SOURCES = \ | |||
64 | test_gnunet_vpn.c | 64 | test_gnunet_vpn.c |
65 | test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \ | 65 | test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \ |
66 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 66 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
67 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 67 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
68 | $(top_builddir)/src/lib/util/libgnunetutil.la | 68 | $(top_builddir)/src/lib/util/libgnunetutil.la |
69 | test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) | 69 | test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) |
70 | 70 | ||
@@ -72,7 +72,7 @@ test_gnunet_vpn_6_over_SOURCES = \ | |||
72 | test_gnunet_vpn.c | 72 | test_gnunet_vpn.c |
73 | test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \ | 73 | test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \ |
74 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 74 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
75 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 75 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
76 | $(top_builddir)/src/lib/util/libgnunetutil.la | 76 | $(top_builddir)/src/lib/util/libgnunetutil.la |
77 | test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) | 77 | test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) |
78 | 78 | ||
@@ -80,7 +80,7 @@ test_gnunet_vpn_4_to_6_SOURCES = \ | |||
80 | test_gnunet_vpn.c | 80 | test_gnunet_vpn.c |
81 | test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \ | 81 | test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \ |
82 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 82 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
83 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 83 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
84 | $(top_builddir)/src/lib/util/libgnunetutil.la | 84 | $(top_builddir)/src/lib/util/libgnunetutil.la |
85 | test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) | 85 | test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) |
86 | 86 | ||
@@ -88,6 +88,6 @@ test_gnunet_vpn_6_to_4_SOURCES = \ | |||
88 | test_gnunet_vpn.c | 88 | test_gnunet_vpn.c |
89 | test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \ | 89 | test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \ |
90 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 90 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
91 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 91 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
92 | $(top_builddir)/src/lib/util/libgnunetutil.la | 92 | $(top_builddir)/src/lib/util/libgnunetutil.la |
93 | test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) | 93 | test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) |
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am index e135f3534..c052dd2a8 100644 --- a/src/reclaim/Makefile.am +++ b/src/reclaim/Makefile.am | |||
@@ -124,7 +124,7 @@ gnunet_service_reclaim_LDADD = \ | |||
124 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 124 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
125 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 125 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
126 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 126 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
127 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 127 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
128 | libgnunetreclaim.la \ | 128 | libgnunetreclaim.la \ |
129 | $(top_builddir)/src/gns/libgnunetgns.la \ | 129 | $(top_builddir)/src/gns/libgnunetgns.la \ |
130 | $(GN_LIBINTL) | 130 | $(GN_LIBINTL) |
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index 69f341259..57f48db44 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am | |||
@@ -33,7 +33,7 @@ gnunet_service_regex_SOURCES = \ | |||
33 | gnunet_service_regex_LDADD = -lm \ | 33 | gnunet_service_regex_LDADD = -lm \ |
34 | libgnunetregexblock.la \ | 34 | libgnunetregexblock.la \ |
35 | $(top_builddir)/src/dht/libgnunetdht.la \ | 35 | $(top_builddir)/src/dht/libgnunetdht.la \ |
36 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 36 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
37 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 37 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
38 | $(GN_LIBINTL) | 38 | $(GN_LIBINTL) |
39 | 39 | ||
@@ -90,7 +90,7 @@ libgnunet_plugin_block_regex_la_LDFLAGS = \ | |||
90 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ | 90 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ |
91 | # $(top_builddir)/src/dht/libgnunetdht.la \ | 91 | # $(top_builddir)/src/dht/libgnunetdht.la \ |
92 | # $(top_builddir)/src/lib/block/libgnunetblock.la \ | 92 | # $(top_builddir)/src/lib/block/libgnunetblock.la \ |
93 | # $(top_builddir)/src/statistics/libgnunetstatistics.la | 93 | # $(top_builddir)/src/service/statistics/libgnunetstatistics.la |
94 | #endif | 94 | #endif |
95 | 95 | ||
96 | noinst_PROGRAMS = $(noinst_mysql_progs) \ | 96 | noinst_PROGRAMS = $(noinst_mysql_progs) \ |
@@ -102,7 +102,7 @@ perf_regex_LDADD = -lm \ | |||
102 | $(top_builddir)/src/dht/libgnunetdht.la \ | 102 | $(top_builddir)/src/dht/libgnunetdht.la \ |
103 | libgnunetregexblock.la \ | 103 | libgnunetregexblock.la \ |
104 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 104 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
105 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 105 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la |
106 | perf_regex_LDFLAGS = \ | 106 | perf_regex_LDFLAGS = \ |
107 | $(GN_LIBINTL) | 107 | $(GN_LIBINTL) |
108 | 108 | ||
@@ -111,7 +111,7 @@ gnunet_daemon_regexprofiler_SOURCES = \ | |||
111 | gnunet_daemon_regexprofiler_LDADD = -lm \ | 111 | gnunet_daemon_regexprofiler_LDADD = -lm \ |
112 | $(top_builddir)/src/dht/libgnunetdht.la \ | 112 | $(top_builddir)/src/dht/libgnunetdht.la \ |
113 | libgnunetregexblock.la \ | 113 | libgnunetregexblock.la \ |
114 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 114 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
115 | $(top_builddir)/src/lib/util/libgnunetutil.la | 115 | $(top_builddir)/src/lib/util/libgnunetutil.la |
116 | gnunet_daemon_regexprofiler_LDFLAGS = \ | 116 | gnunet_daemon_regexprofiler_LDFLAGS = \ |
117 | $(GN_LIBINTL) | 117 | $(GN_LIBINTL) |
@@ -134,21 +134,21 @@ test_regex_eval_api_SOURCES = \ | |||
134 | test_regex_eval_api_LDADD = -lm \ | 134 | test_regex_eval_api_LDADD = -lm \ |
135 | $(top_builddir)/src/dht/libgnunetdht.la \ | 135 | $(top_builddir)/src/dht/libgnunetdht.la \ |
136 | libgnunetregexblock.la \ | 136 | libgnunetregexblock.la \ |
137 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 137 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
138 | $(top_builddir)/src/lib/util/libgnunetutil.la | 138 | $(top_builddir)/src/lib/util/libgnunetutil.la |
139 | 139 | ||
140 | test_regex_integration_SOURCES = \ | 140 | test_regex_integration_SOURCES = \ |
141 | test_regex_integration.c | 141 | test_regex_integration.c |
142 | test_regex_integration_LDADD = -lm \ | 142 | test_regex_integration_LDADD = -lm \ |
143 | libgnunetregex.la \ | 143 | libgnunetregex.la \ |
144 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 144 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
145 | $(top_builddir)/src/lib/util/libgnunetutil.la | 145 | $(top_builddir)/src/lib/util/libgnunetutil.la |
146 | 146 | ||
147 | test_regex_api_SOURCES = \ | 147 | test_regex_api_SOURCES = \ |
148 | test_regex_api.c | 148 | test_regex_api.c |
149 | test_regex_api_LDADD = -lm \ | 149 | test_regex_api_LDADD = -lm \ |
150 | libgnunetregex.la \ | 150 | libgnunetregex.la \ |
151 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 151 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
152 | $(top_builddir)/src/lib/util/libgnunetutil.la | 152 | $(top_builddir)/src/lib/util/libgnunetutil.la |
153 | 153 | ||
154 | test_regex_iterate_api_SOURCES = \ | 154 | test_regex_iterate_api_SOURCES = \ |
@@ -156,7 +156,7 @@ test_regex_iterate_api_SOURCES = \ | |||
156 | test_regex_iterate_api_LDADD = -lm \ | 156 | test_regex_iterate_api_LDADD = -lm \ |
157 | libgnunetregexblock.la \ | 157 | libgnunetregexblock.la \ |
158 | $(top_builddir)/src/dht/libgnunetdht.la \ | 158 | $(top_builddir)/src/dht/libgnunetdht.la \ |
159 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 159 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
160 | $(top_builddir)/src/lib/util/libgnunetutil.la | 160 | $(top_builddir)/src/lib/util/libgnunetutil.la |
161 | 161 | ||
162 | test_regex_proofs_SOURCES = \ | 162 | test_regex_proofs_SOURCES = \ |
@@ -164,7 +164,7 @@ test_regex_proofs_SOURCES = \ | |||
164 | test_regex_proofs_LDADD = -lm \ | 164 | test_regex_proofs_LDADD = -lm \ |
165 | $(top_builddir)/src/dht/libgnunetdht.la \ | 165 | $(top_builddir)/src/dht/libgnunetdht.la \ |
166 | libgnunetregexblock.la \ | 166 | libgnunetregexblock.la \ |
167 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 167 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
168 | $(top_builddir)/src/lib/util/libgnunetutil.la | 168 | $(top_builddir)/src/lib/util/libgnunetutil.la |
169 | 169 | ||
170 | test_regex_graph_api_SOURCES = \ | 170 | test_regex_graph_api_SOURCES = \ |
@@ -172,7 +172,7 @@ test_regex_graph_api_SOURCES = \ | |||
172 | test_regex_graph_api_LDADD = -lm \ | 172 | test_regex_graph_api_LDADD = -lm \ |
173 | $(top_builddir)/src/dht/libgnunetdht.la \ | 173 | $(top_builddir)/src/dht/libgnunetdht.la \ |
174 | libgnunetregexblock.la \ | 174 | libgnunetregexblock.la \ |
175 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 175 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
176 | $(top_builddir)/src/lib/util/libgnunetutil.la | 176 | $(top_builddir)/src/lib/util/libgnunetutil.la |
177 | 177 | ||
178 | 178 | ||
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am index d271298a8..0684dd8f2 100644 --- a/src/revocation/Makefile.am +++ b/src/revocation/Makefile.am | |||
@@ -53,7 +53,7 @@ gnunet_revocation_tvg_LDADD = \ | |||
53 | test_revocation_lsd0001testvectors_SOURCES = \ | 53 | test_revocation_lsd0001testvectors_SOURCES = \ |
54 | test_revocation_testvectors.c | 54 | test_revocation_testvectors.c |
55 | test_revocation_lsd0001testvectors_LDADD = \ | 55 | test_revocation_lsd0001testvectors_LDADD = \ |
56 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 56 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
57 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 57 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
58 | libgnunetrevocation.la \ | 58 | libgnunetrevocation.la \ |
59 | $(top_builddir)/src/lib/util/libgnunetutil.la | 59 | $(top_builddir)/src/lib/util/libgnunetutil.la |
@@ -83,7 +83,7 @@ gnunet_service_revocation_LDADD = \ | |||
83 | libgnunetrevocation.la \ | 83 | libgnunetrevocation.la \ |
84 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 84 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
85 | $(top_builddir)/src/setu/libgnunetsetu.la \ | 85 | $(top_builddir)/src/setu/libgnunetsetu.la \ |
86 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 86 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
87 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 87 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
88 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 88 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
89 | -lm \ | 89 | -lm \ |
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am index ef9f8b245..9ad63b309 100644 --- a/src/scalarproduct/Makefile.am +++ b/src/scalarproduct/Makefile.am | |||
@@ -84,7 +84,7 @@ libgnunetscalarproduct_la_SOURCES = \ | |||
84 | scalarproduct.h | 84 | scalarproduct.h |
85 | libgnunetscalarproduct_la_LIBADD = \ | 85 | libgnunetscalarproduct_la_LIBADD = \ |
86 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 86 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
87 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 87 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
88 | $(LIBGCRYPT_LIBS) \ | 88 | $(LIBGCRYPT_LIBS) \ |
89 | -lgcrypt \ | 89 | -lgcrypt \ |
90 | $(LTLIBINTL) | 90 | $(LTLIBINTL) |
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am index 6879ef609..c22d57fea 100644 --- a/src/secretsharing/Makefile.am +++ b/src/secretsharing/Makefile.am | |||
@@ -28,7 +28,7 @@ lib_LTLIBRARIES = \ | |||
28 | # gnunet-secretsharing-profiler.c | 28 | # gnunet-secretsharing-profiler.c |
29 | #gnunet_secretsharing_profiler_LDADD = \ | 29 | #gnunet_secretsharing_profiler_LDADD = \ |
30 | # libgnunetsecretsharing.la \ | 30 | # libgnunetsecretsharing.la \ |
31 | # $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 31 | # $(top_builddir)/src/service/testing/libgnunettesting.la \ |
32 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ | 32 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ |
33 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ | 33 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ |
34 | # $(GN_LIBINTL) | 34 | # $(GN_LIBINTL) |
@@ -67,7 +67,7 @@ test_secretsharing_api_SOURCES = \ | |||
67 | test_secretsharing_api.c | 67 | test_secretsharing_api.c |
68 | test_secretsharing_api_LDADD = \ | 68 | test_secretsharing_api_LDADD = \ |
69 | libgnunetsecretsharing.la \ | 69 | libgnunetsecretsharing.la \ |
70 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 70 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
71 | $(top_builddir)/src/lib/util/libgnunetutil.la | 71 | $(top_builddir)/src/lib/util/libgnunetutil.la |
72 | 72 | ||
73 | EXTRA_DIST = \ | 73 | EXTRA_DIST = \ |
diff --git a/src/service/Makefile.am b/src/service/Makefile.am index 711b076f2..5c92e730e 100644 --- a/src/service/Makefile.am +++ b/src/service/Makefile.am | |||
@@ -1,7 +1,12 @@ | |||
1 | SUBDIRS = \ | 1 | SUBDIRS = \ |
2 | util \ | 2 | util \ |
3 | statistics \ | ||
3 | arm \ | 4 | arm \ |
4 | core \ | 5 | peerstore \ |
5 | testing \ | 6 | testing \ |
7 | nat \ | ||
8 | transport \ | ||
9 | core \ | ||
10 | nse \ | ||
6 | identity \ | 11 | identity \ |
7 | rest | 12 | rest |
diff --git a/src/service/core/Makefile.am b/src/service/core/Makefile.am index 9ce8cf8b5..482befae9 100644 --- a/src/service/core/Makefile.am +++ b/src/service/core/Makefile.am | |||
@@ -39,11 +39,11 @@ libgnunet_test_core_plugin_cmd_just_run_la_SOURCES = \ | |||
39 | test_core_plugin_cmd_just_run.c | 39 | test_core_plugin_cmd_just_run.c |
40 | libgnunet_test_core_plugin_cmd_just_run_la_LIBADD = \ | 40 | libgnunet_test_core_plugin_cmd_just_run_la_LIBADD = \ |
41 | libgnunetcoretesting.la \ | 41 | libgnunetcoretesting.la \ |
42 | $(top_builddir)/src/transport/libgnunettransportapplication.la \ | 42 | $(top_builddir)/src/service/transport/libgnunettransportapplication.la \ |
43 | $(top_builddir)/src/transport/libgnunettransportcore.la \ | 43 | $(top_builddir)/src/service/transport/libgnunettransportcore.la \ |
44 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 44 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
45 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 45 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
46 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 46 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
47 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 47 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
48 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 48 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
49 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 49 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
@@ -54,10 +54,10 @@ libgnunet_test_core_plugin_cmd_just_run_la_LDFLAGS = \ | |||
54 | libgnunetcoretesting_la_SOURCES = \ | 54 | libgnunetcoretesting_la_SOURCES = \ |
55 | core_api_cmd_connecting_peers.c | 55 | core_api_cmd_connecting_peers.c |
56 | libgnunetcoretesting_la_LIBADD = \ | 56 | libgnunetcoretesting_la_LIBADD = \ |
57 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 57 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
58 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 58 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
59 | $(top_builddir)/src/transport/libgnunettransportapplication.la \ | 59 | $(top_builddir)/src/service/transport/libgnunettransportapplication.la \ |
60 | $(top_builddir)/src/transport/libgnunettransportcore.la \ | 60 | $(top_builddir)/src/service/transport/libgnunettransportcore.la \ |
61 | $(top_builddir)/src/lib/util/libgnunetutil.la | 61 | $(top_builddir)/src/lib/util/libgnunetutil.la |
62 | libgnunetcoretesting_la_LDFLAGS = \ | 62 | libgnunetcoretesting_la_LDFLAGS = \ |
63 | $(GN_LIBINTL) \ | 63 | $(GN_LIBINTL) \ |
@@ -74,9 +74,9 @@ gnunet_service_core_SOURCES = \ | |||
74 | gnunet-service-core_sessions.c gnunet-service-core_sessions.h \ | 74 | gnunet-service-core_sessions.c gnunet-service-core_sessions.h \ |
75 | gnunet-service-core_typemap.c gnunet-service-core_typemap.h | 75 | gnunet-service-core_typemap.c gnunet-service-core_typemap.h |
76 | gnunet_service_core_LDADD = \ | 76 | gnunet_service_core_LDADD = \ |
77 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 77 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
78 | $(top_builddir)/src/transport/libgnunettransportapplication.la \ | 78 | $(top_builddir)/src/service/transport/libgnunettransportapplication.la \ |
79 | $(top_builddir)/src/transport/libgnunettransportcore.la \ | 79 | $(top_builddir)/src/service/transport/libgnunettransportcore.la \ |
80 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 80 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
81 | $(GN_LIBINTL) $(Z_LIBS) | 81 | $(GN_LIBINTL) $(Z_LIBS) |
82 | 82 | ||
@@ -102,13 +102,13 @@ test_core_api_send_to_self_SOURCES = \ | |||
102 | test_core_api_send_to_self.c | 102 | test_core_api_send_to_self.c |
103 | test_core_api_send_to_self_LDADD = \ | 103 | test_core_api_send_to_self_LDADD = \ |
104 | libgnunetcore.la \ | 104 | libgnunetcore.la \ |
105 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 105 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
106 | $(top_builddir)/src/lib/util/libgnunetutil.la | 106 | $(top_builddir)/src/lib/util/libgnunetutil.la |
107 | 107 | ||
108 | test_core_api_start_only_SOURCES = \ | 108 | test_core_api_start_only_SOURCES = \ |
109 | test_core_api_start_only.c | 109 | test_core_api_start_only.c |
110 | test_core_api_start_only_LDADD = \ | 110 | test_core_api_start_only_LDADD = \ |
111 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 111 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
112 | libgnunetcore.la \ | 112 | libgnunetcore.la \ |
113 | $(top_builddir)/src/lib/util/libgnunetutil.la | 113 | $(top_builddir)/src/lib/util/libgnunetutil.la |
114 | 114 | ||
diff --git a/src/service/identity/Makefile.am b/src/service/identity/Makefile.am index 079a9af2e..e99ef211f 100644 --- a/src/service/identity/Makefile.am +++ b/src/service/identity/Makefile.am | |||
@@ -39,7 +39,7 @@ gnunet_service_identity_SOURCES = \ | |||
39 | gnunet-service-identity.c | 39 | gnunet-service-identity.c |
40 | gnunet_service_identity_LDADD = \ | 40 | gnunet_service_identity_LDADD = \ |
41 | libgnunetidentity.la \ | 41 | libgnunetidentity.la \ |
42 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 42 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
43 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 43 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
44 | $(GN_LIBINTL) | 44 | $(GN_LIBINTL) |
45 | 45 | ||
@@ -57,7 +57,7 @@ test_identity_SOURCES = \ | |||
57 | test_identity.c | 57 | test_identity.c |
58 | test_identity_LDADD = \ | 58 | test_identity_LDADD = \ |
59 | libgnunetidentity.la \ | 59 | libgnunetidentity.la \ |
60 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 60 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
61 | $(top_builddir)/src/lib/util/libgnunetutil.la | 61 | $(top_builddir)/src/lib/util/libgnunetutil.la |
62 | 62 | ||
63 | EXTRA_DIST = \ | 63 | EXTRA_DIST = \ |
diff --git a/src/nat/.gitignore b/src/service/nat/.gitignore index 868abab4b..868abab4b 100644 --- a/src/nat/.gitignore +++ b/src/service/nat/.gitignore | |||
diff --git a/src/nat/Makefile.am b/src/service/nat/Makefile.am index 78ba9b92c..d6cbe94f1 100644 --- a/src/nat/Makefile.am +++ b/src/service/nat/Makefile.am | |||
@@ -22,9 +22,6 @@ else | |||
22 | install-exec-hook: | 22 | install-exec-hook: |
23 | endif | 23 | endif |
24 | 24 | ||
25 | bin_PROGRAMS = \ | ||
26 | gnunet-nat | ||
27 | |||
28 | libexec_PROGRAMS = \ | 25 | libexec_PROGRAMS = \ |
29 | $(NATBIN) \ | 26 | $(NATBIN) \ |
30 | gnunet-service-nat | 27 | gnunet-service-nat |
@@ -37,15 +34,6 @@ gnunet_helper_nat_client_SOURCES = \ | |||
37 | $(NATCLIENT) | 34 | $(NATCLIENT) |
38 | 35 | ||
39 | 36 | ||
40 | gnunet_nat_SOURCES = \ | ||
41 | gnunet-nat.c nat.h | ||
42 | gnunet_nat_LDADD = \ | ||
43 | libgnunetnatnew.la \ | ||
44 | $(top_builddir)/src/lib/util/libgnunetutil.la | ||
45 | gnunet_nat_LDFLAGS = \ | ||
46 | $(GN_LIBINTL) | ||
47 | |||
48 | |||
49 | if USE_COVERAGE | 37 | if USE_COVERAGE |
50 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 38 | AM_CFLAGS = -fprofile-arcs -ftest-coverage |
51 | endif | 39 | endif |
@@ -72,7 +60,7 @@ gnunet_service_nat_SOURCES = \ | |||
72 | gnunet-service-nat_helper.c gnunet-service-nat_helper.h | 60 | gnunet-service-nat_helper.c gnunet-service-nat_helper.h |
73 | gnunet_service_nat_LDADD = \ | 61 | gnunet_service_nat_LDADD = \ |
74 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 62 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
75 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 63 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
76 | $(LIBGCRYPT_LIBS) \ | 64 | $(LIBGCRYPT_LIBS) \ |
77 | -lgcrypt \ | 65 | -lgcrypt \ |
78 | $(GN_LIBINTL) | 66 | $(GN_LIBINTL) |
diff --git a/src/nat/gnunet-helper-nat-client.c b/src/service/nat/gnunet-helper-nat-client.c index 0b86aa0d2..0b86aa0d2 100644 --- a/src/nat/gnunet-helper-nat-client.c +++ b/src/service/nat/gnunet-helper-nat-client.c | |||
diff --git a/src/nat/gnunet-helper-nat-server.c b/src/service/nat/gnunet-helper-nat-server.c index d190a5dba..d190a5dba 100644 --- a/src/nat/gnunet-helper-nat-server.c +++ b/src/service/nat/gnunet-helper-nat-server.c | |||
diff --git a/src/nat/gnunet-nat-client-script.sh b/src/service/nat/gnunet-nat-client-script.sh index 4e4ccafad..4e4ccafad 100755 --- a/src/nat/gnunet-nat-client-script.sh +++ b/src/service/nat/gnunet-nat-client-script.sh | |||
diff --git a/src/nat/gnunet-nat-server-script.sh b/src/service/nat/gnunet-nat-server-script.sh index 42a8e639a..42a8e639a 100755 --- a/src/nat/gnunet-nat-server-script.sh +++ b/src/service/nat/gnunet-nat-server-script.sh | |||
diff --git a/src/nat/gnunet-service-nat.c b/src/service/nat/gnunet-service-nat.c index dde269819..dde269819 100644 --- a/src/nat/gnunet-service-nat.c +++ b/src/service/nat/gnunet-service-nat.c | |||
diff --git a/src/nat/gnunet-service-nat.h b/src/service/nat/gnunet-service-nat.h index 5717306bb..5717306bb 100644 --- a/src/nat/gnunet-service-nat.h +++ b/src/service/nat/gnunet-service-nat.h | |||
diff --git a/src/nat/gnunet-service-nat_externalip.c b/src/service/nat/gnunet-service-nat_externalip.c index c2625be2d..c2625be2d 100644 --- a/src/nat/gnunet-service-nat_externalip.c +++ b/src/service/nat/gnunet-service-nat_externalip.c | |||
diff --git a/src/nat/gnunet-service-nat_externalip.h b/src/service/nat/gnunet-service-nat_externalip.h index 6b3467fab..6b3467fab 100644 --- a/src/nat/gnunet-service-nat_externalip.h +++ b/src/service/nat/gnunet-service-nat_externalip.h | |||
diff --git a/src/nat/gnunet-service-nat_helper.c b/src/service/nat/gnunet-service-nat_helper.c index d92f5a99c..d92f5a99c 100644 --- a/src/nat/gnunet-service-nat_helper.c +++ b/src/service/nat/gnunet-service-nat_helper.c | |||
diff --git a/src/nat/gnunet-service-nat_helper.h b/src/service/nat/gnunet-service-nat_helper.h index dc6b9ae61..dc6b9ae61 100644 --- a/src/nat/gnunet-service-nat_helper.h +++ b/src/service/nat/gnunet-service-nat_helper.h | |||
diff --git a/src/nat/gnunet-service-nat_mini.c b/src/service/nat/gnunet-service-nat_mini.c index 1e13e3814..1e13e3814 100644 --- a/src/nat/gnunet-service-nat_mini.c +++ b/src/service/nat/gnunet-service-nat_mini.c | |||
diff --git a/src/nat/gnunet-service-nat_mini.h b/src/service/nat/gnunet-service-nat_mini.h index dffc9758a..dffc9758a 100644 --- a/src/nat/gnunet-service-nat_mini.h +++ b/src/service/nat/gnunet-service-nat_mini.h | |||
diff --git a/src/nat/gnunet-service-nat_stun.c b/src/service/nat/gnunet-service-nat_stun.c index 203728ebf..203728ebf 100644 --- a/src/nat/gnunet-service-nat_stun.c +++ b/src/service/nat/gnunet-service-nat_stun.c | |||
diff --git a/src/nat/gnunet-service-nat_stun.h b/src/service/nat/gnunet-service-nat_stun.h index 912fc3b46..912fc3b46 100644 --- a/src/nat/gnunet-service-nat_stun.h +++ b/src/service/nat/gnunet-service-nat_stun.h | |||
diff --git a/src/nat/meson.build b/src/service/nat/meson.build index e629f6411..e629f6411 100644 --- a/src/nat/meson.build +++ b/src/service/nat/meson.build | |||
diff --git a/src/nat/nat.conf.in b/src/service/nat/nat.conf.in index 4c068c394..4c068c394 100644 --- a/src/nat/nat.conf.in +++ b/src/service/nat/nat.conf.in | |||
diff --git a/src/nat/nat.h b/src/service/nat/nat.h index 1d8648aaf..1d8648aaf 100644 --- a/src/nat/nat.h +++ b/src/service/nat/nat.h | |||
diff --git a/src/nat/nat_api.c b/src/service/nat/nat_api.c index 31f8f388d..31f8f388d 100644 --- a/src/nat/nat_api.c +++ b/src/service/nat/nat_api.c | |||
diff --git a/src/nat/nat_api_stun.c b/src/service/nat/nat_api_stun.c index 94adc3d6c..94adc3d6c 100644 --- a/src/nat/nat_api_stun.c +++ b/src/service/nat/nat_api_stun.c | |||
diff --git a/src/nat/nat_stun.h b/src/service/nat/nat_stun.h index a31e0f8d6..a31e0f8d6 100644 --- a/src/nat/nat_stun.h +++ b/src/service/nat/nat_stun.h | |||
diff --git a/src/nat/test_nat.c b/src/service/nat/test_nat.c index a3072f712..a3072f712 100644 --- a/src/nat/test_nat.c +++ b/src/service/nat/test_nat.c | |||
diff --git a/src/nat/test_nat_data.conf b/src/service/nat/test_nat_data.conf index e139d0c05..e139d0c05 100644 --- a/src/nat/test_nat_data.conf +++ b/src/service/nat/test_nat_data.conf | |||
diff --git a/src/nat/test_nat_mini.c b/src/service/nat/test_nat_mini.c index 528815e1a..528815e1a 100644 --- a/src/nat/test_nat_mini.c +++ b/src/service/nat/test_nat_mini.c | |||
diff --git a/src/nat/test_nat_test.c b/src/service/nat/test_nat_test.c index 2abab4d5f..2abab4d5f 100644 --- a/src/nat/test_nat_test.c +++ b/src/service/nat/test_nat_test.c | |||
diff --git a/src/nat/test_nat_test_data.conf b/src/service/nat/test_nat_test_data.conf index ca78ca9f3..ca78ca9f3 100644 --- a/src/nat/test_nat_test_data.conf +++ b/src/service/nat/test_nat_test_data.conf | |||
diff --git a/src/nat/test_stun.c b/src/service/nat/test_stun.c index 75eb877b3..75eb877b3 100644 --- a/src/nat/test_stun.c +++ b/src/service/nat/test_stun.c | |||
diff --git a/src/nat/test_stun.conf b/src/service/nat/test_stun.conf index b03bbfff3..b03bbfff3 100644 --- a/src/nat/test_stun.conf +++ b/src/service/nat/test_stun.conf | |||
diff --git a/src/nse/.gitignore b/src/service/nse/.gitignore index a2575673c..a2575673c 100644 --- a/src/nse/.gitignore +++ b/src/service/nse/.gitignore | |||
diff --git a/src/nse/Makefile.am b/src/service/nse/Makefile.am index 053995c9a..7b89ef635 100644 --- a/src/nse/Makefile.am +++ b/src/service/nse/Makefile.am | |||
@@ -13,14 +13,6 @@ libexecdir= $(pkglibdir)/libexec/ | |||
13 | pkgcfg_DATA = \ | 13 | pkgcfg_DATA = \ |
14 | nse.conf | 14 | nse.conf |
15 | 15 | ||
16 | bin_PROGRAMS = gnunet-nse | ||
17 | |||
18 | gnunet_nse_SOURCES = gnunet-nse.c | ||
19 | gnunet_nse_LDADD = \ | ||
20 | libgnunetnse.la \ | ||
21 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
22 | $(XLIB) $(GN_LIBINTL) | ||
23 | |||
24 | lib_LTLIBRARIES = libgnunetnse.la | 16 | lib_LTLIBRARIES = libgnunetnse.la |
25 | 17 | ||
26 | libgnunetnse_la_SOURCES = \ | 18 | libgnunetnse_la_SOURCES = \ |
@@ -45,8 +37,8 @@ libexec_PROGRAMS = \ | |||
45 | #gnunet_nse_profiler_LDADD = -lm \ | 37 | #gnunet_nse_profiler_LDADD = -lm \ |
46 | # libgnunetnse.la \ | 38 | # libgnunetnse.la \ |
47 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ | 39 | # $(top_builddir)/src/lib/util/libgnunetutil.la \ |
48 | # $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 40 | # $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
49 | # $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 41 | # $(top_builddir)/src/service/testing/libgnunettesting.la \ |
50 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ | 42 | # $(top_builddir)/src/testbed/libgnunettestbed.la \ |
51 | # $(GN_LIBINTL) | 43 | # $(GN_LIBINTL) |
52 | 44 | ||
@@ -56,7 +48,7 @@ gnunet_service_nse_LDADD = \ | |||
56 | libgnunetnse.la \ | 48 | libgnunetnse.la \ |
57 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 49 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
58 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 50 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
59 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 51 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
60 | $(LIBGCRYPT_LIBS) \ | 52 | $(LIBGCRYPT_LIBS) \ |
61 | -lm -lgcrypt \ | 53 | -lm -lgcrypt \ |
62 | $(GN_LIBINTL) | 54 | $(GN_LIBINTL) |
@@ -84,7 +76,7 @@ test_nse_api_SOURCES = \ | |||
84 | test_nse_api.c | 76 | test_nse_api.c |
85 | test_nse_api_LDADD = \ | 77 | test_nse_api_LDADD = \ |
86 | libgnunetnse.la \ | 78 | libgnunetnse.la \ |
87 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 79 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
88 | $(top_builddir)/src/lib/util/libgnunetutil.la | 80 | $(top_builddir)/src/lib/util/libgnunetutil.la |
89 | 81 | ||
90 | test_nse_multipeer_SOURCES = \ | 82 | test_nse_multipeer_SOURCES = \ |
diff --git a/src/nse/gnunet-nse-profiler.c b/src/service/nse/gnunet-nse-profiler.c index 4b256bc52..4b256bc52 100644 --- a/src/nse/gnunet-nse-profiler.c +++ b/src/service/nse/gnunet-nse-profiler.c | |||
diff --git a/src/nse/gnunet-service-nse.c b/src/service/nse/gnunet-service-nse.c index ee1cb025f..ee1cb025f 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/service/nse/gnunet-service-nse.c | |||
diff --git a/src/nse/hostkeys.dat b/src/service/nse/hostkeys.dat index ab407c167..ab407c167 100644 --- a/src/nse/hostkeys.dat +++ b/src/service/nse/hostkeys.dat | |||
Binary files differ | |||
diff --git a/src/nse/meson.build b/src/service/nse/meson.build index 7490214a3..7490214a3 100644 --- a/src/nse/meson.build +++ b/src/service/nse/meson.build | |||
diff --git a/src/nse/nse.conf.in b/src/service/nse/nse.conf.in index 0ac5621aa..0ac5621aa 100644 --- a/src/nse/nse.conf.in +++ b/src/service/nse/nse.conf.in | |||
diff --git a/src/nse/nse.h b/src/service/nse/nse.h index 5d1fccb7e..5d1fccb7e 100644 --- a/src/nse/nse.h +++ b/src/service/nse/nse.h | |||
diff --git a/src/nse/nse_api.c b/src/service/nse/nse_api.c index 7f3e03b98..7f3e03b98 100644 --- a/src/nse/nse_api.c +++ b/src/service/nse/nse_api.c | |||
diff --git a/src/nse/nse_infiniband.conf b/src/service/nse/nse_infiniband.conf index d2c97567d..d2c97567d 100644 --- a/src/nse/nse_infiniband.conf +++ b/src/service/nse/nse_infiniband.conf | |||
diff --git a/src/nse/nse_profiler_test.conf b/src/service/nse/nse_profiler_test.conf index f702faae2..f702faae2 100644 --- a/src/nse/nse_profiler_test.conf +++ b/src/service/nse/nse_profiler_test.conf | |||
diff --git a/src/nse/perf_kdf.c b/src/service/nse/perf_kdf.c index 10207675f..10207675f 100644 --- a/src/nse/perf_kdf.c +++ b/src/service/nse/perf_kdf.c | |||
diff --git a/src/nse/test_nse.conf b/src/service/nse/test_nse.conf index 6b5aaff49..6b5aaff49 100644 --- a/src/nse/test_nse.conf +++ b/src/service/nse/test_nse.conf | |||
diff --git a/src/nse/test_nse_api.c b/src/service/nse/test_nse_api.c index f1b7c652b..f1b7c652b 100644 --- a/src/nse/test_nse_api.c +++ b/src/service/nse/test_nse_api.c | |||
diff --git a/src/nse/test_nse_multipeer.c b/src/service/nse/test_nse_multipeer.c index 6ee03b3fa..6ee03b3fa 100644 --- a/src/nse/test_nse_multipeer.c +++ b/src/service/nse/test_nse_multipeer.c | |||
diff --git a/src/peerstore/.gitignore b/src/service/peerstore/.gitignore index 7fc22bbdb..7fc22bbdb 100644 --- a/src/peerstore/.gitignore +++ b/src/service/peerstore/.gitignore | |||
diff --git a/src/peerstore/Makefile.am b/src/service/peerstore/Makefile.am index 41a082f89..28948b7db 100644 --- a/src/peerstore/Makefile.am +++ b/src/service/peerstore/Makefile.am | |||
@@ -86,13 +86,13 @@ plugin_LTLIBRARIES = \ | |||
86 | test_plugin_peerstore_sqlite_SOURCES = \ | 86 | test_plugin_peerstore_sqlite_SOURCES = \ |
87 | test_plugin_peerstore.c | 87 | test_plugin_peerstore.c |
88 | test_plugin_peerstore_sqlite_LDADD = \ | 88 | test_plugin_peerstore_sqlite_LDADD = \ |
89 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 89 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
90 | $(top_builddir)/src/lib/util/libgnunetutil.la | 90 | $(top_builddir)/src/lib/util/libgnunetutil.la |
91 | 91 | ||
92 | test_plugin_peerstore_flat_SOURCES = \ | 92 | test_plugin_peerstore_flat_SOURCES = \ |
93 | test_plugin_peerstore.c | 93 | test_plugin_peerstore.c |
94 | test_plugin_peerstore_flat_LDADD = \ | 94 | test_plugin_peerstore_flat_LDADD = \ |
95 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 95 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
96 | $(top_builddir)/src/lib/util/libgnunetutil.la | 96 | $(top_builddir)/src/lib/util/libgnunetutil.la |
97 | 97 | ||
98 | check_PROGRAMS = \ | 98 | check_PROGRAMS = \ |
@@ -118,33 +118,33 @@ test_peerstore_api_store_SOURCES = \ | |||
118 | test_peerstore_api_store.c | 118 | test_peerstore_api_store.c |
119 | test_peerstore_api_store_LDADD = \ | 119 | test_peerstore_api_store_LDADD = \ |
120 | libgnunetpeerstore.la \ | 120 | libgnunetpeerstore.la \ |
121 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 121 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
122 | $(top_builddir)/src/lib/util/libgnunetutil.la | 122 | $(top_builddir)/src/lib/util/libgnunetutil.la |
123 | 123 | ||
124 | test_peerstore_api_iterate_SOURCES = \ | 124 | test_peerstore_api_iterate_SOURCES = \ |
125 | test_peerstore_api_iterate.c | 125 | test_peerstore_api_iterate.c |
126 | test_peerstore_api_iterate_LDADD = \ | 126 | test_peerstore_api_iterate_LDADD = \ |
127 | libgnunetpeerstore.la \ | 127 | libgnunetpeerstore.la \ |
128 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 128 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
129 | $(top_builddir)/src/lib/util/libgnunetutil.la | 129 | $(top_builddir)/src/lib/util/libgnunetutil.la |
130 | 130 | ||
131 | test_peerstore_api_watch_SOURCES = \ | 131 | test_peerstore_api_watch_SOURCES = \ |
132 | test_peerstore_api_watch.c | 132 | test_peerstore_api_watch.c |
133 | test_peerstore_api_watch_LDADD = \ | 133 | test_peerstore_api_watch_LDADD = \ |
134 | libgnunetpeerstore.la \ | 134 | libgnunetpeerstore.la \ |
135 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 135 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
136 | $(top_builddir)/src/lib/util/libgnunetutil.la | 136 | $(top_builddir)/src/lib/util/libgnunetutil.la |
137 | 137 | ||
138 | test_peerstore_api_sync_SOURCES = \ | 138 | test_peerstore_api_sync_SOURCES = \ |
139 | test_peerstore_api_sync.c | 139 | test_peerstore_api_sync.c |
140 | test_peerstore_api_sync_LDADD = \ | 140 | test_peerstore_api_sync_LDADD = \ |
141 | libgnunetpeerstore.la \ | 141 | libgnunetpeerstore.la \ |
142 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 142 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
143 | $(top_builddir)/src/lib/util/libgnunetutil.la | 143 | $(top_builddir)/src/lib/util/libgnunetutil.la |
144 | 144 | ||
145 | perf_peerstore_store_SOURCES = \ | 145 | perf_peerstore_store_SOURCES = \ |
146 | perf_peerstore_store.c | 146 | perf_peerstore_store.c |
147 | perf_peerstore_store_LDADD = \ | 147 | perf_peerstore_store_LDADD = \ |
148 | libgnunetpeerstore.la \ | 148 | libgnunetpeerstore.la \ |
149 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 149 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
150 | $(top_builddir)/src/lib/util/libgnunetutil.la | 150 | $(top_builddir)/src/lib/util/libgnunetutil.la |
diff --git a/src/peerstore/gnunet-peerstore.c b/src/service/peerstore/gnunet-peerstore.c index 11313b5d3..11313b5d3 100644 --- a/src/peerstore/gnunet-peerstore.c +++ b/src/service/peerstore/gnunet-peerstore.c | |||
diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/service/peerstore/gnunet-service-peerstore.c index 514b173bb..514b173bb 100644 --- a/src/peerstore/gnunet-service-peerstore.c +++ b/src/service/peerstore/gnunet-service-peerstore.c | |||
diff --git a/src/peerstore/meson.build b/src/service/peerstore/meson.build index 6c9853852..6c9853852 100644 --- a/src/peerstore/meson.build +++ b/src/service/peerstore/meson.build | |||
diff --git a/src/peerstore/peerstore.conf.in b/src/service/peerstore/peerstore.conf.in index a3a7c672b..a3a7c672b 100644 --- a/src/peerstore/peerstore.conf.in +++ b/src/service/peerstore/peerstore.conf.in | |||
diff --git a/src/peerstore/peerstore.h b/src/service/peerstore/peerstore.h index 0dec03443..0dec03443 100644 --- a/src/peerstore/peerstore.h +++ b/src/service/peerstore/peerstore.h | |||
diff --git a/src/peerstore/peerstore_api.c b/src/service/peerstore/peerstore_api.c index 8770c36e4..8770c36e4 100644 --- a/src/peerstore/peerstore_api.c +++ b/src/service/peerstore/peerstore_api.c | |||
diff --git a/src/peerstore/peerstore_common.c b/src/service/peerstore/peerstore_common.c index e3bb77d86..e3bb77d86 100644 --- a/src/peerstore/peerstore_common.c +++ b/src/service/peerstore/peerstore_common.c | |||
diff --git a/src/peerstore/peerstore_common.h b/src/service/peerstore/peerstore_common.h index f5352f5a5..f5352f5a5 100644 --- a/src/peerstore/peerstore_common.h +++ b/src/service/peerstore/peerstore_common.h | |||
diff --git a/src/peerstore/perf_peerstore_store.c b/src/service/peerstore/perf_peerstore_store.c index 24c7e4f01..24c7e4f01 100644 --- a/src/peerstore/perf_peerstore_store.c +++ b/src/service/peerstore/perf_peerstore_store.c | |||
diff --git a/src/peerstore/plugin_peerstore_flat.c b/src/service/peerstore/plugin_peerstore_flat.c index cc5b8b76b..cc5b8b76b 100644 --- a/src/peerstore/plugin_peerstore_flat.c +++ b/src/service/peerstore/plugin_peerstore_flat.c | |||
diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/service/peerstore/plugin_peerstore_sqlite.c index ad69efdf4..ad69efdf4 100644 --- a/src/peerstore/plugin_peerstore_sqlite.c +++ b/src/service/peerstore/plugin_peerstore_sqlite.c | |||
diff --git a/src/peerstore/test_peerstore_api_data.conf b/src/service/peerstore/test_peerstore_api_data.conf index 614d0cf5b..614d0cf5b 100644 --- a/src/peerstore/test_peerstore_api_data.conf +++ b/src/service/peerstore/test_peerstore_api_data.conf | |||
diff --git a/src/peerstore/test_peerstore_api_iterate.c b/src/service/peerstore/test_peerstore_api_iterate.c index b6cd51906..b6cd51906 100644 --- a/src/peerstore/test_peerstore_api_iterate.c +++ b/src/service/peerstore/test_peerstore_api_iterate.c | |||
diff --git a/src/peerstore/test_peerstore_api_store.c b/src/service/peerstore/test_peerstore_api_store.c index 77e8a17c1..77e8a17c1 100644 --- a/src/peerstore/test_peerstore_api_store.c +++ b/src/service/peerstore/test_peerstore_api_store.c | |||
diff --git a/src/peerstore/test_peerstore_api_sync.c b/src/service/peerstore/test_peerstore_api_sync.c index 5057c98b5..5057c98b5 100644 --- a/src/peerstore/test_peerstore_api_sync.c +++ b/src/service/peerstore/test_peerstore_api_sync.c | |||
diff --git a/src/peerstore/test_peerstore_api_watch.c b/src/service/peerstore/test_peerstore_api_watch.c index 126b321df..126b321df 100644 --- a/src/peerstore/test_peerstore_api_watch.c +++ b/src/service/peerstore/test_peerstore_api_watch.c | |||
diff --git a/src/peerstore/test_plugin_peerstore.c b/src/service/peerstore/test_plugin_peerstore.c index bce62dda9..bce62dda9 100644 --- a/src/peerstore/test_plugin_peerstore.c +++ b/src/service/peerstore/test_plugin_peerstore.c | |||
diff --git a/src/peerstore/test_plugin_peerstore_flat.conf b/src/service/peerstore/test_plugin_peerstore_flat.conf index c55b1e9d6..c55b1e9d6 100644 --- a/src/peerstore/test_plugin_peerstore_flat.conf +++ b/src/service/peerstore/test_plugin_peerstore_flat.conf | |||
diff --git a/src/peerstore/test_plugin_peerstore_sqlite.conf b/src/service/peerstore/test_plugin_peerstore_sqlite.conf index dcf1fc1a4..dcf1fc1a4 100644 --- a/src/peerstore/test_plugin_peerstore_sqlite.conf +++ b/src/service/peerstore/test_plugin_peerstore_sqlite.conf | |||
diff --git a/src/statistics/.gitignore b/src/service/statistics/.gitignore index f1f567149..f1f567149 100644 --- a/src/statistics/.gitignore +++ b/src/service/statistics/.gitignore | |||
diff --git a/src/statistics/Makefile.am b/src/service/statistics/Makefile.am index ed4796274..55cd266b0 100644 --- a/src/statistics/Makefile.am +++ b/src/service/statistics/Makefile.am | |||
@@ -27,16 +27,6 @@ libgnunetstatistics_la_LDFLAGS = \ | |||
27 | libexec_PROGRAMS = \ | 27 | libexec_PROGRAMS = \ |
28 | gnunet-service-statistics | 28 | gnunet-service-statistics |
29 | 29 | ||
30 | bin_PROGRAMS = \ | ||
31 | gnunet-statistics | ||
32 | |||
33 | gnunet_statistics_SOURCES = \ | ||
34 | gnunet-statistics.c | ||
35 | gnunet_statistics_LDADD = \ | ||
36 | libgnunetstatistics.la \ | ||
37 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
38 | $(GN_LIBINTL) | ||
39 | |||
40 | gnunet_service_statistics_SOURCES = \ | 30 | gnunet_service_statistics_SOURCES = \ |
41 | gnunet-service-statistics.c | 31 | gnunet-service-statistics.c |
42 | gnunet_service_statistics_LDADD = \ | 32 | gnunet_service_statistics_LDADD = \ |
@@ -79,20 +69,21 @@ test_statistics_api_watch_zero_value_LDADD = \ | |||
79 | libgnunetstatistics.la \ | 69 | libgnunetstatistics.la \ |
80 | $(top_builddir)/src/lib/util/libgnunetutil.la | 70 | $(top_builddir)/src/lib/util/libgnunetutil.la |
81 | 71 | ||
82 | if HAVE_PYTHON | 72 | # Needs to be done with CLI |
83 | check_SCRIPTS = \ | 73 | #if HAVE_PYTHON |
84 | test_gnunet_statistics.py | 74 | #check_SCRIPTS = \ |
85 | endif | 75 | # test_gnunet_statistics.py |
86 | 76 | #endif | |
87 | SUFFIXES = .py.in .py | 77 | # |
88 | .py.in.py: | 78 | #SUFFIXES = .py.in .py |
89 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/$< > $@ | 79 | #.py.in.py: |
90 | chmod +x $@ | 80 | # $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/$< > $@ |
91 | 81 | # chmod +x $@ | |
92 | test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile | 82 | # |
93 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py | 83 | #test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile |
94 | chmod +x test_gnunet_statistics.py | 84 | # $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py |
95 | 85 | # chmod +x test_gnunet_statistics.py | |
96 | EXTRA_DIST = \ | 86 | # |
97 | test_statistics_api_data.conf \ | 87 | #EXTRA_DIST = \ |
98 | test_gnunet_statistics.py.in | 88 | # test_statistics_api_data.conf \ |
89 | # test_gnunet_statistics.py.in | ||
diff --git a/src/statistics/gnunet-service-statistics.c b/src/service/statistics/gnunet-service-statistics.c index a6c897a79..a6c897a79 100644 --- a/src/statistics/gnunet-service-statistics.c +++ b/src/service/statistics/gnunet-service-statistics.c | |||
diff --git a/src/statistics/meson.build b/src/service/statistics/meson.build index 14cdb0ac3..14cdb0ac3 100644 --- a/src/statistics/meson.build +++ b/src/service/statistics/meson.build | |||
diff --git a/src/statistics/statistics.conf.in b/src/service/statistics/statistics.conf.in index 36aca538f..36aca538f 100644 --- a/src/statistics/statistics.conf.in +++ b/src/service/statistics/statistics.conf.in | |||
diff --git a/src/statistics/statistics.h b/src/service/statistics/statistics.h index 6eb75cc99..6eb75cc99 100644 --- a/src/statistics/statistics.h +++ b/src/service/statistics/statistics.h | |||
diff --git a/src/statistics/statistics_api.c b/src/service/statistics/statistics_api.c index 88f127da8..88f127da8 100644 --- a/src/statistics/statistics_api.c +++ b/src/service/statistics/statistics_api.c | |||
diff --git a/src/statistics/test_gnunet_statistics.py.in b/src/service/statistics/test_gnunet_statistics.py.in index bf6ba6ef2..bf6ba6ef2 100644 --- a/src/statistics/test_gnunet_statistics.py.in +++ b/src/service/statistics/test_gnunet_statistics.py.in | |||
diff --git a/src/statistics/test_statistics_api.c b/src/service/statistics/test_statistics_api.c index c9e568870..c9e568870 100644 --- a/src/statistics/test_statistics_api.c +++ b/src/service/statistics/test_statistics_api.c | |||
diff --git a/src/statistics/test_statistics_api_data.conf b/src/service/statistics/test_statistics_api_data.conf index d437c2aa8..d437c2aa8 100644 --- a/src/statistics/test_statistics_api_data.conf +++ b/src/service/statistics/test_statistics_api_data.conf | |||
diff --git a/src/statistics/test_statistics_api_loop.c b/src/service/statistics/test_statistics_api_loop.c index ad273287d..ad273287d 100644 --- a/src/statistics/test_statistics_api_loop.c +++ b/src/service/statistics/test_statistics_api_loop.c | |||
diff --git a/src/statistics/test_statistics_api_watch.c b/src/service/statistics/test_statistics_api_watch.c index 2d9d08305..2d9d08305 100644 --- a/src/statistics/test_statistics_api_watch.c +++ b/src/service/statistics/test_statistics_api_watch.c | |||
diff --git a/src/statistics/test_statistics_api_watch_zero_value.c b/src/service/statistics/test_statistics_api_watch_zero_value.c index cb2694f8f..cb2694f8f 100644 --- a/src/statistics/test_statistics_api_watch_zero_value.c +++ b/src/service/statistics/test_statistics_api_watch_zero_value.c | |||
diff --git a/src/transport/.gitignore b/src/service/transport/.gitignore index 163ffbd5d..163ffbd5d 100644 --- a/src/transport/.gitignore +++ b/src/service/transport/.gitignore | |||
diff --git a/src/transport/Makefile.am b/src/service/transport/Makefile.am index 7f71b0967..e5a3fe9bd 100644 --- a/src/transport/Makefile.am +++ b/src/service/transport/Makefile.am | |||
@@ -47,9 +47,9 @@ libgnunettransporttesting2_la_LIBADD = \ | |||
47 | libgnunettransportapplication.la \ | 47 | libgnunettransportapplication.la \ |
48 | libgnunettransportcore.la \ | 48 | libgnunettransportcore.la \ |
49 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 49 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
50 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 50 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
51 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 51 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
52 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 52 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
53 | $(top_builddir)/src/lib/util/libgnunetutil.la | 53 | $(top_builddir)/src/lib/util/libgnunetutil.la |
54 | libgnunettransporttesting2_la_LDFLAGS = \ | 54 | libgnunettransporttesting2_la_LDFLAGS = \ |
55 | $(GN_LIBINTL) \ | 55 | $(GN_LIBINTL) \ |
@@ -129,16 +129,16 @@ gnunet_communicator_unix_SOURCES = \ | |||
129 | gnunet-communicator-unix.c | 129 | gnunet-communicator-unix.c |
130 | gnunet_communicator_unix_LDADD = \ | 130 | gnunet_communicator_unix_LDADD = \ |
131 | libgnunettransportcommunicator.la \ | 131 | libgnunettransportcommunicator.la \ |
132 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 132 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
133 | $(top_builddir)/src/lib/util/libgnunetutil.la | 133 | $(top_builddir)/src/lib/util/libgnunetutil.la |
134 | 134 | ||
135 | gnunet_communicator_tcp_SOURCES = \ | 135 | gnunet_communicator_tcp_SOURCES = \ |
136 | gnunet-communicator-tcp.c | 136 | gnunet-communicator-tcp.c |
137 | gnunet_communicator_tcp_LDADD = \ | 137 | gnunet_communicator_tcp_LDADD = \ |
138 | libgnunettransportcommunicator.la \ | 138 | libgnunettransportcommunicator.la \ |
139 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 139 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
140 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | 140 | $(top_builddir)/src/service/nat/libgnunetnatnew.la \ |
141 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 141 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
142 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 142 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
143 | $(LIBGCRYPT_LIBS) | 143 | $(LIBGCRYPT_LIBS) |
144 | 144 | ||
@@ -147,8 +147,8 @@ gnunet_communicator_udp_SOURCES = \ | |||
147 | gnunet_communicator_udp_LDADD = \ | 147 | gnunet_communicator_udp_LDADD = \ |
148 | libgnunettransportapplication.la \ | 148 | libgnunettransportapplication.la \ |
149 | libgnunettransportcommunicator.la \ | 149 | libgnunettransportcommunicator.la \ |
150 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | 150 | $(top_builddir)/src/service/nat/libgnunetnatnew.la \ |
151 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 151 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
152 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 152 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
153 | $(LIBGCRYPT_LIBS) | 153 | $(LIBGCRYPT_LIBS) |
154 | 154 | ||
@@ -159,9 +159,9 @@ gnunet_communicator_quic_SOURCES = \ | |||
159 | gnunet_communicator_quic_LDADD = \ | 159 | gnunet_communicator_quic_LDADD = \ |
160 | libgnunettransportapplication.la \ | 160 | libgnunettransportapplication.la \ |
161 | libgnunettransportcommunicator.la \ | 161 | libgnunettransportcommunicator.la \ |
162 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 162 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
163 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | 163 | $(top_builddir)/src/service/nat/libgnunetnatnew.la \ |
164 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 164 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
165 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 165 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
166 | -lquiche \ | 166 | -lquiche \ |
167 | $(LIBGCRYPT_LIBS) | 167 | $(LIBGCRYPT_LIBS) |
@@ -179,9 +179,9 @@ endif | |||
179 | gnunet_service_transport_SOURCES = \ | 179 | gnunet_service_transport_SOURCES = \ |
180 | gnunet-service-transport.c transport.h | 180 | gnunet-service-transport.c transport.h |
181 | gnunet_service_transport_LDADD = \ | 181 | gnunet_service_transport_LDADD = \ |
182 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 182 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
183 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 183 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
184 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 184 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
185 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 185 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
186 | $(LIBGCRYPT_LIBS) \ | 186 | $(LIBGCRYPT_LIBS) \ |
187 | $(GN_LIBINTL) | 187 | $(GN_LIBINTL) |
@@ -200,9 +200,9 @@ libgnunet_test_transport_plugin_cmd_nat_upnp_la_LIBADD = \ | |||
200 | libgnunettransporttesting2.la \ | 200 | libgnunettransporttesting2.la \ |
201 | libgnunettransportapplication.la \ | 201 | libgnunettransportapplication.la \ |
202 | libgnunettransportcore.la \ | 202 | libgnunettransportcore.la \ |
203 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 203 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
204 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 204 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
205 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 205 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
206 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 206 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
207 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 207 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
208 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 208 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
@@ -216,9 +216,9 @@ libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LIBADD = \ | |||
216 | libgnunettransporttesting2.la \ | 216 | libgnunettransporttesting2.la \ |
217 | libgnunettransportapplication.la \ | 217 | libgnunettransportapplication.la \ |
218 | libgnunettransportcore.la \ | 218 | libgnunettransportcore.la \ |
219 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 219 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
220 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 220 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
221 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 221 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
222 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 222 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
223 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 223 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
224 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 224 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
@@ -232,9 +232,9 @@ libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \ | |||
232 | libgnunettransporttesting2.la \ | 232 | libgnunettransporttesting2.la \ |
233 | libgnunettransportapplication.la \ | 233 | libgnunettransportapplication.la \ |
234 | libgnunettransportcore.la \ | 234 | libgnunettransportcore.la \ |
235 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 235 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
236 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 236 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
237 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 237 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
238 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 238 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
239 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 239 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
240 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 240 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
@@ -248,9 +248,9 @@ libgnunet_test_transport_plugin_cmd_simple_send_performance_la_LIBADD = \ | |||
248 | libgnunettransporttesting2.la \ | 248 | libgnunettransporttesting2.la \ |
249 | libgnunettransportapplication.la \ | 249 | libgnunettransportapplication.la \ |
250 | libgnunettransportcore.la \ | 250 | libgnunettransportcore.la \ |
251 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 251 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
252 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 252 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
253 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 253 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
254 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 254 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
255 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 255 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
256 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 256 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
@@ -264,9 +264,9 @@ libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LIBADD = \ | |||
264 | libgnunettransporttesting2.la \ | 264 | libgnunettransporttesting2.la \ |
265 | libgnunettransportapplication.la \ | 265 | libgnunettransportapplication.la \ |
266 | libgnunettransportcore.la \ | 266 | libgnunettransportcore.la \ |
267 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 267 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
268 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 268 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
269 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 269 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
270 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 270 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
271 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 271 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
272 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 272 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
@@ -280,9 +280,9 @@ libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LIBADD = \ | |||
280 | libgnunettransporttesting2.la \ | 280 | libgnunettransporttesting2.la \ |
281 | libgnunettransportapplication.la \ | 281 | libgnunettransportapplication.la \ |
282 | libgnunettransportcore.la \ | 282 | libgnunettransportcore.la \ |
283 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 283 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
284 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 284 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
285 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 285 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
286 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 286 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
287 | $(top_builddir)/src/service/arm/libgnunetarm.la \ | 287 | $(top_builddir)/src/service/arm/libgnunetarm.la \ |
288 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 288 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
@@ -330,7 +330,7 @@ endif | |||
330 | test_transport_start_with_config_SOURCES = \ | 330 | test_transport_start_with_config_SOURCES = \ |
331 | test_transport_start_with_config.c | 331 | test_transport_start_with_config.c |
332 | test_transport_start_with_config_LDADD = \ | 332 | test_transport_start_with_config_LDADD = \ |
333 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 333 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
334 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 334 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
335 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 335 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
336 | libgnunettransportcore.la \ | 336 | libgnunettransportcore.la \ |
@@ -340,65 +340,65 @@ test_communicator_basic_unix_SOURCES = \ | |||
340 | test_communicator_basic.c | 340 | test_communicator_basic.c |
341 | test_communicator_basic_unix_LDADD = \ | 341 | test_communicator_basic_unix_LDADD = \ |
342 | libgnunettransporttesting2.la \ | 342 | libgnunettransporttesting2.la \ |
343 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 343 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
344 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 344 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
345 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 345 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la |
346 | 346 | ||
347 | test_communicator_basic_tcp_SOURCES = \ | 347 | test_communicator_basic_tcp_SOURCES = \ |
348 | test_communicator_basic.c | 348 | test_communicator_basic.c |
349 | test_communicator_basic_tcp_LDADD = \ | 349 | test_communicator_basic_tcp_LDADD = \ |
350 | libgnunettransporttesting2.la \ | 350 | libgnunettransporttesting2.la \ |
351 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 351 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
352 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 352 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
353 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 353 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la |
354 | 354 | ||
355 | test_communicator_basic_udp_SOURCES = \ | 355 | test_communicator_basic_udp_SOURCES = \ |
356 | test_communicator_basic.c | 356 | test_communicator_basic.c |
357 | test_communicator_basic_udp_LDADD = \ | 357 | test_communicator_basic_udp_LDADD = \ |
358 | libgnunettransporttesting2.la \ | 358 | libgnunettransporttesting2.la \ |
359 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 359 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
360 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 360 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
361 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 361 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la |
362 | 362 | ||
363 | test_communicator_basic_quic_SOURCES = \ | 363 | test_communicator_basic_quic_SOURCES = \ |
364 | test_communicator_basic.c | 364 | test_communicator_basic.c |
365 | test_communicator_basic_quic_LDADD = \ | 365 | test_communicator_basic_quic_LDADD = \ |
366 | libgnunettransporttesting2.la \ | 366 | libgnunettransporttesting2.la \ |
367 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 367 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
368 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 368 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
369 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 369 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la |
370 | 370 | ||
371 | test_communicator_rekey_tcp_SOURCES = \ | 371 | test_communicator_rekey_tcp_SOURCES = \ |
372 | test_communicator_basic.c | 372 | test_communicator_basic.c |
373 | test_communicator_rekey_tcp_LDADD = \ | 373 | test_communicator_rekey_tcp_LDADD = \ |
374 | libgnunettransporttesting2.la \ | 374 | libgnunettransporttesting2.la \ |
375 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 375 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
376 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 376 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
377 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 377 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la |
378 | 378 | ||
379 | test_communicator_rekey_udp_SOURCES = \ | 379 | test_communicator_rekey_udp_SOURCES = \ |
380 | test_communicator_basic.c | 380 | test_communicator_basic.c |
381 | test_communicator_rekey_udp_LDADD = \ | 381 | test_communicator_rekey_udp_LDADD = \ |
382 | libgnunettransporttesting2.la \ | 382 | libgnunettransporttesting2.la \ |
383 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 383 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
384 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 384 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
385 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 385 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la |
386 | 386 | ||
387 | test_communicator_backchannel_udp_SOURCES = \ | 387 | test_communicator_backchannel_udp_SOURCES = \ |
388 | test_communicator_basic.c | 388 | test_communicator_basic.c |
389 | test_communicator_backchannel_udp_LDADD = \ | 389 | test_communicator_backchannel_udp_LDADD = \ |
390 | libgnunettransporttesting2.la \ | 390 | libgnunettransporttesting2.la \ |
391 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 391 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
392 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 392 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
393 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 393 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la |
394 | 394 | ||
395 | test_communicator_bidirect_tcp_SOURCES = \ | 395 | test_communicator_bidirect_tcp_SOURCES = \ |
396 | test_communicator_basic.c | 396 | test_communicator_basic.c |
397 | test_communicator_bidirect_tcp_LDADD = \ | 397 | test_communicator_bidirect_tcp_LDADD = \ |
398 | libgnunettransporttesting2.la \ | 398 | libgnunettransporttesting2.la \ |
399 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 399 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
400 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 400 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
401 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 401 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la |
402 | 402 | ||
403 | test_transport_api2_tcp_SOURCES = \ | 403 | test_transport_api2_tcp_SOURCES = \ |
404 | test_transport_api2.c | 404 | test_transport_api2.c |
diff --git a/src/transport/NOTES b/src/service/transport/NOTES index 41404e1f9..41404e1f9 100644 --- a/src/transport/NOTES +++ b/src/service/transport/NOTES | |||
diff --git a/src/transport/benchmark.sh b/src/service/transport/benchmark.sh index a29e6ec2d..a29e6ec2d 100755 --- a/src/transport/benchmark.sh +++ b/src/service/transport/benchmark.sh | |||
diff --git a/src/transport/communicator.h b/src/service/transport/communicator.h index 5ef43597d..5ef43597d 100644 --- a/src/transport/communicator.h +++ b/src/service/transport/communicator.h | |||
diff --git a/src/transport/gnunet-communicator-quic.c b/src/service/transport/gnunet-communicator-quic.c index 0a7e511eb..0a7e511eb 100644 --- a/src/transport/gnunet-communicator-quic.c +++ b/src/service/transport/gnunet-communicator-quic.c | |||
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/service/transport/gnunet-communicator-tcp.c index e7d989021..e7d989021 100644 --- a/src/transport/gnunet-communicator-tcp.c +++ b/src/service/transport/gnunet-communicator-tcp.c | |||
diff --git a/src/transport/gnunet-communicator-udp.c b/src/service/transport/gnunet-communicator-udp.c index f9bbe91f6..f9bbe91f6 100644 --- a/src/transport/gnunet-communicator-udp.c +++ b/src/service/transport/gnunet-communicator-udp.c | |||
diff --git a/src/transport/gnunet-communicator-unix.c b/src/service/transport/gnunet-communicator-unix.c index 0ff16ab08..0ff16ab08 100644 --- a/src/transport/gnunet-communicator-unix.c +++ b/src/service/transport/gnunet-communicator-unix.c | |||
diff --git a/src/transport/gnunet-service-transport.c b/src/service/transport/gnunet-service-transport.c index ec3019161..ec3019161 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/service/transport/gnunet-service-transport.c | |||
diff --git a/src/transport/gnunet-service-transport.h b/src/service/transport/gnunet-service-transport.h index ea9e71e4b..ea9e71e4b 100644 --- a/src/transport/gnunet-service-transport.h +++ b/src/service/transport/gnunet-service-transport.h | |||
diff --git a/src/transport/gnunet-transport-certificate-creation.in b/src/service/transport/gnunet-transport-certificate-creation.in index 771422a7a..771422a7a 100644 --- a/src/transport/gnunet-transport-certificate-creation.in +++ b/src/service/transport/gnunet-transport-certificate-creation.in | |||
diff --git a/src/transport/gnunet-transport.c b/src/service/transport/gnunet-transport.c index b5ad43770..b5ad43770 100644 --- a/src/transport/gnunet-transport.c +++ b/src/service/transport/gnunet-transport.c | |||
diff --git a/src/transport/ieee80211_radiotap.h b/src/service/transport/ieee80211_radiotap.h index 9351da9a5..9351da9a5 100644 --- a/src/transport/ieee80211_radiotap.h +++ b/src/service/transport/ieee80211_radiotap.h | |||
diff --git a/src/transport/meson.build b/src/service/transport/meson.build index 65a2beeb3..65a2beeb3 100644 --- a/src/transport/meson.build +++ b/src/service/transport/meson.build | |||
diff --git a/src/transport/template_cfg_peer1.conf b/src/service/transport/template_cfg_peer1.conf index 5ba198450..5ba198450 100644 --- a/src/transport/template_cfg_peer1.conf +++ b/src/service/transport/template_cfg_peer1.conf | |||
diff --git a/src/transport/template_cfg_peer2.conf b/src/service/transport/template_cfg_peer2.conf index 6ac610fec..6ac610fec 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/service/transport/template_cfg_peer2.conf | |||
diff --git a/src/transport/template_tng_cfg_peer1.conf b/src/service/transport/template_tng_cfg_peer1.conf index b6198d72c..b6198d72c 100644 --- a/src/transport/template_tng_cfg_peer1.conf +++ b/src/service/transport/template_tng_cfg_peer1.conf | |||
diff --git a/src/transport/test_communicator_basic.c b/src/service/transport/test_communicator_basic.c index fdbad0957..fdbad0957 100644 --- a/src/transport/test_communicator_basic.c +++ b/src/service/transport/test_communicator_basic.c | |||
diff --git a/src/transport/test_communicator_quic_basic_peer1.conf b/src/service/transport/test_communicator_quic_basic_peer1.conf index d43752ecc..d43752ecc 100644 --- a/src/transport/test_communicator_quic_basic_peer1.conf +++ b/src/service/transport/test_communicator_quic_basic_peer1.conf | |||
diff --git a/src/transport/test_communicator_quic_basic_peer2.conf b/src/service/transport/test_communicator_quic_basic_peer2.conf index 4fabc8a86..4fabc8a86 100644 --- a/src/transport/test_communicator_quic_basic_peer2.conf +++ b/src/service/transport/test_communicator_quic_basic_peer2.conf | |||
diff --git a/src/transport/test_communicator_tcp_basic_peer1.conf b/src/service/transport/test_communicator_tcp_basic_peer1.conf index dbc227ac6..dbc227ac6 100644 --- a/src/transport/test_communicator_tcp_basic_peer1.conf +++ b/src/service/transport/test_communicator_tcp_basic_peer1.conf | |||
diff --git a/src/transport/test_communicator_tcp_basic_peer2.conf b/src/service/transport/test_communicator_tcp_basic_peer2.conf index b73157f0d..b73157f0d 100644 --- a/src/transport/test_communicator_tcp_basic_peer2.conf +++ b/src/service/transport/test_communicator_tcp_basic_peer2.conf | |||
diff --git a/src/transport/test_communicator_tcp_bidirect_peer1.conf b/src/service/transport/test_communicator_tcp_bidirect_peer1.conf index dbc227ac6..dbc227ac6 100644 --- a/src/transport/test_communicator_tcp_bidirect_peer1.conf +++ b/src/service/transport/test_communicator_tcp_bidirect_peer1.conf | |||
diff --git a/src/transport/test_communicator_tcp_bidirect_peer2.conf b/src/service/transport/test_communicator_tcp_bidirect_peer2.conf index b73157f0d..b73157f0d 100644 --- a/src/transport/test_communicator_tcp_bidirect_peer2.conf +++ b/src/service/transport/test_communicator_tcp_bidirect_peer2.conf | |||
diff --git a/src/transport/test_communicator_tcp_rekey_peer1.conf b/src/service/transport/test_communicator_tcp_rekey_peer1.conf index 82fbf353a..82fbf353a 100644 --- a/src/transport/test_communicator_tcp_rekey_peer1.conf +++ b/src/service/transport/test_communicator_tcp_rekey_peer1.conf | |||
diff --git a/src/transport/test_communicator_tcp_rekey_peer2.conf b/src/service/transport/test_communicator_tcp_rekey_peer2.conf index 086a996ae..086a996ae 100644 --- a/src/transport/test_communicator_tcp_rekey_peer2.conf +++ b/src/service/transport/test_communicator_tcp_rekey_peer2.conf | |||
diff --git a/src/transport/test_communicator_udp_backchannel_peer1.conf b/src/service/transport/test_communicator_udp_backchannel_peer1.conf index 65f33bd6b..65f33bd6b 100644 --- a/src/transport/test_communicator_udp_backchannel_peer1.conf +++ b/src/service/transport/test_communicator_udp_backchannel_peer1.conf | |||
diff --git a/src/transport/test_communicator_udp_backchannel_peer2.conf b/src/service/transport/test_communicator_udp_backchannel_peer2.conf index 9875af724..9875af724 100644 --- a/src/transport/test_communicator_udp_backchannel_peer2.conf +++ b/src/service/transport/test_communicator_udp_backchannel_peer2.conf | |||
diff --git a/src/transport/test_communicator_udp_basic_peer1.conf b/src/service/transport/test_communicator_udp_basic_peer1.conf index 6968b3aef..6968b3aef 100644 --- a/src/transport/test_communicator_udp_basic_peer1.conf +++ b/src/service/transport/test_communicator_udp_basic_peer1.conf | |||
diff --git a/src/transport/test_communicator_udp_basic_peer2.conf b/src/service/transport/test_communicator_udp_basic_peer2.conf index 781bfa7da..781bfa7da 100644 --- a/src/transport/test_communicator_udp_basic_peer2.conf +++ b/src/service/transport/test_communicator_udp_basic_peer2.conf | |||
diff --git a/src/transport/test_communicator_udp_rekey_peer1.conf b/src/service/transport/test_communicator_udp_rekey_peer1.conf index 9b0fa7497..9b0fa7497 100644 --- a/src/transport/test_communicator_udp_rekey_peer1.conf +++ b/src/service/transport/test_communicator_udp_rekey_peer1.conf | |||
diff --git a/src/transport/test_communicator_udp_rekey_peer2.conf b/src/service/transport/test_communicator_udp_rekey_peer2.conf index 383ab19d2..383ab19d2 100644 --- a/src/transport/test_communicator_udp_rekey_peer2.conf +++ b/src/service/transport/test_communicator_udp_rekey_peer2.conf | |||
diff --git a/src/transport/test_communicator_unix_basic_peer1.conf b/src/service/transport/test_communicator_unix_basic_peer1.conf index 13ba2d16b..13ba2d16b 100644 --- a/src/transport/test_communicator_unix_basic_peer1.conf +++ b/src/service/transport/test_communicator_unix_basic_peer1.conf | |||
diff --git a/src/transport/test_communicator_unix_basic_peer2.conf b/src/service/transport/test_communicator_unix_basic_peer2.conf index 727e844a7..727e844a7 100644 --- a/src/transport/test_communicator_unix_basic_peer2.conf +++ b/src/service/transport/test_communicator_unix_basic_peer2.conf | |||
diff --git a/src/transport/test_delay b/src/service/transport/test_delay index 5f82b65fb..5f82b65fb 100755 --- a/src/transport/test_delay +++ b/src/service/transport/test_delay | |||
diff --git a/src/transport/test_plugin_hostkey b/src/service/transport/test_plugin_hostkey index e7b1ad012..e7b1ad012 100644 --- a/src/transport/test_plugin_hostkey +++ b/src/service/transport/test_plugin_hostkey | |||
Binary files differ | |||
diff --git a/src/transport/test_plugin_hostkey.ecc b/src/service/transport/test_plugin_hostkey.ecc index 18641b798..18641b798 100644 --- a/src/transport/test_plugin_hostkey.ecc +++ b/src/service/transport/test_plugin_hostkey.ecc | |||
diff --git a/src/transport/test_tng_defaults.conf b/src/service/transport/test_tng_defaults.conf index e37dab25e..e37dab25e 100644 --- a/src/transport/test_tng_defaults.conf +++ b/src/service/transport/test_tng_defaults.conf | |||
diff --git a/src/transport/test_transport_address_switch.c b/src/service/transport/test_transport_address_switch.c index ce5117bd1..ce5117bd1 100644 --- a/src/transport/test_transport_address_switch.c +++ b/src/service/transport/test_transport_address_switch.c | |||
diff --git a/src/transport/test_transport_address_switch_tcp_peer1.conf b/src/service/transport/test_transport_address_switch_tcp_peer1.conf index cfcbfe41c..cfcbfe41c 100644 --- a/src/transport/test_transport_address_switch_tcp_peer1.conf +++ b/src/service/transport/test_transport_address_switch_tcp_peer1.conf | |||
diff --git a/src/transport/test_transport_address_switch_tcp_peer2.conf b/src/service/transport/test_transport_address_switch_tcp_peer2.conf index bda2354b6..bda2354b6 100644 --- a/src/transport/test_transport_address_switch_tcp_peer2.conf +++ b/src/service/transport/test_transport_address_switch_tcp_peer2.conf | |||
diff --git a/src/transport/test_transport_address_switch_udp_peer1.conf b/src/service/transport/test_transport_address_switch_udp_peer1.conf index bdc3a2253..bdc3a2253 100644 --- a/src/transport/test_transport_address_switch_udp_peer1.conf +++ b/src/service/transport/test_transport_address_switch_udp_peer1.conf | |||
diff --git a/src/transport/test_transport_address_switch_udp_peer2.conf b/src/service/transport/test_transport_address_switch_udp_peer2.conf index ae6397db4..ae6397db4 100644 --- a/src/transport/test_transport_address_switch_udp_peer2.conf +++ b/src/service/transport/test_transport_address_switch_udp_peer2.conf | |||
diff --git a/src/transport/test_transport_api.c b/src/service/transport/test_transport_api.c index 5f5e03a9e..5f5e03a9e 100644 --- a/src/transport/test_transport_api.c +++ b/src/service/transport/test_transport_api.c | |||
diff --git a/src/transport/test_transport_api2.c b/src/service/transport/test_transport_api2.c index 4d423f7c2..4d423f7c2 100644 --- a/src/transport/test_transport_api2.c +++ b/src/service/transport/test_transport_api2.c | |||
diff --git a/src/transport/test_transport_api2_tcp_node1.conf b/src/service/transport/test_transport_api2_tcp_node1.conf index 463ec61d8..463ec61d8 100644 --- a/src/transport/test_transport_api2_tcp_node1.conf +++ b/src/service/transport/test_transport_api2_tcp_node1.conf | |||
diff --git a/src/transport/test_transport_api2_tcp_node2.conf b/src/service/transport/test_transport_api2_tcp_node2.conf index b7f92869e..b7f92869e 100644 --- a/src/transport/test_transport_api2_tcp_node2.conf +++ b/src/service/transport/test_transport_api2_tcp_node2.conf | |||
diff --git a/src/transport/test_transport_api2_tcp_peer1.conf b/src/service/transport/test_transport_api2_tcp_peer1.conf index 54ec9fd9f..54ec9fd9f 100644 --- a/src/transport/test_transport_api2_tcp_peer1.conf +++ b/src/service/transport/test_transport_api2_tcp_peer1.conf | |||
diff --git a/src/transport/test_transport_api2_tcp_peer2.conf b/src/service/transport/test_transport_api2_tcp_peer2.conf index 7ae5ac697..7ae5ac697 100644 --- a/src/transport/test_transport_api2_tcp_peer2.conf +++ b/src/service/transport/test_transport_api2_tcp_peer2.conf | |||
diff --git a/src/transport/test_transport_api2_tng_node.conf b/src/service/transport/test_transport_api2_tng_node.conf index c50ccf662..c50ccf662 100644 --- a/src/transport/test_transport_api2_tng_node.conf +++ b/src/service/transport/test_transport_api2_tng_node.conf | |||
diff --git a/src/transport/test_transport_api_data.conf b/src/service/transport/test_transport_api_data.conf index c06235a0a..c06235a0a 100644 --- a/src/transport/test_transport_api_data.conf +++ b/src/service/transport/test_transport_api_data.conf | |||
diff --git a/src/transport/test_transport_api_monitor_peers.c b/src/service/transport/test_transport_api_monitor_peers.c index c09e3782d..c09e3782d 100644 --- a/src/transport/test_transport_api_monitor_peers.c +++ b/src/service/transport/test_transport_api_monitor_peers.c | |||
diff --git a/src/transport/test_transport_api_monitor_peers_peer1.conf b/src/service/transport/test_transport_api_monitor_peers_peer1.conf index bc9eee19b..bc9eee19b 100644 --- a/src/transport/test_transport_api_monitor_peers_peer1.conf +++ b/src/service/transport/test_transport_api_monitor_peers_peer1.conf | |||
diff --git a/src/transport/test_transport_api_monitor_peers_peer2.conf b/src/service/transport/test_transport_api_monitor_peers_peer2.conf index 5225a5a87..5225a5a87 100644 --- a/src/transport/test_transport_api_monitor_peers_peer2.conf +++ b/src/service/transport/test_transport_api_monitor_peers_peer2.conf | |||
diff --git a/src/transport/test_transport_api_monitor_validation_peer1.conf b/src/service/transport/test_transport_api_monitor_validation_peer1.conf index 02f7bc2f0..02f7bc2f0 100644 --- a/src/transport/test_transport_api_monitor_validation_peer1.conf +++ b/src/service/transport/test_transport_api_monitor_validation_peer1.conf | |||
diff --git a/src/transport/test_transport_api_monitor_validation_peer2.conf b/src/service/transport/test_transport_api_monitor_validation_peer2.conf index d4e0874f0..d4e0874f0 100644 --- a/src/transport/test_transport_api_monitor_validation_peer2.conf +++ b/src/service/transport/test_transport_api_monitor_validation_peer2.conf | |||
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/service/transport/test_transport_api_multi_peer1.conf index b7cb98777..b7cb98777 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/service/transport/test_transport_api_multi_peer1.conf | |||
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/service/transport/test_transport_api_multi_peer2.conf index f69e0abd9..f69e0abd9 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/service/transport/test_transport_api_multi_peer2.conf | |||
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/service/transport/test_transport_api_tcp_nat_peer1.conf index fb2fcecc6..fb2fcecc6 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/service/transport/test_transport_api_tcp_nat_peer1.conf | |||
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/service/transport/test_transport_api_tcp_nat_peer2.conf index 1faefc195..1faefc195 100644 --- a/src/transport/test_transport_api_tcp_nat_peer2.conf +++ b/src/service/transport/test_transport_api_tcp_nat_peer2.conf | |||
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/service/transport/test_transport_api_tcp_peer1.conf index eabd6b701..eabd6b701 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/service/transport/test_transport_api_tcp_peer1.conf | |||
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/service/transport/test_transport_api_tcp_peer2.conf index 58ce0777f..58ce0777f 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/service/transport/test_transport_api_tcp_peer2.conf | |||
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/service/transport/test_transport_api_udp_nat_peer1.conf index 7bbcaa628..7bbcaa628 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/service/transport/test_transport_api_udp_nat_peer1.conf | |||
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/service/transport/test_transport_api_udp_nat_peer2.conf index 8bdb8c293..8bdb8c293 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/service/transport/test_transport_api_udp_nat_peer2.conf | |||
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/service/transport/test_transport_api_udp_peer1.conf index 4684b77f2..4684b77f2 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/service/transport/test_transport_api_udp_peer1.conf | |||
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/service/transport/test_transport_api_udp_peer2.conf index 96706ce49..96706ce49 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/service/transport/test_transport_api_udp_peer2.conf | |||
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/service/transport/test_transport_api_unix_peer1.conf index 005558bcc..005558bcc 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/service/transport/test_transport_api_unix_peer1.conf | |||
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/service/transport/test_transport_api_unix_peer2.conf index 840ed81c7..840ed81c7 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/service/transport/test_transport_api_unix_peer2.conf | |||
diff --git a/src/transport/test_transport_defaults.conf b/src/service/transport/test_transport_defaults.conf index 3aed73f0c..3aed73f0c 100644 --- a/src/transport/test_transport_defaults.conf +++ b/src/service/transport/test_transport_defaults.conf | |||
diff --git a/src/transport/test_transport_distance_vector_circle_topo.conf b/src/service/transport/test_transport_distance_vector_circle_topo.conf index e8d694c3a..e8d694c3a 100644 --- a/src/transport/test_transport_distance_vector_circle_topo.conf +++ b/src/service/transport/test_transport_distance_vector_circle_topo.conf | |||
diff --git a/src/transport/test_transport_distance_vector_inverse_topo.conf b/src/service/transport/test_transport_distance_vector_inverse_topo.conf index e062b3e2e..e062b3e2e 100644 --- a/src/transport/test_transport_distance_vector_inverse_topo.conf +++ b/src/service/transport/test_transport_distance_vector_inverse_topo.conf | |||
diff --git a/src/transport/test_transport_distance_vector_topo.conf b/src/service/transport/test_transport_distance_vector_topo.conf index ead3e0a0a..ead3e0a0a 100644 --- a/src/transport/test_transport_distance_vector_topo.conf +++ b/src/service/transport/test_transport_distance_vector_topo.conf | |||
diff --git a/src/transport/test_transport_just_run_topo.conf b/src/service/transport/test_transport_just_run_topo.conf index d27a2fc77..d27a2fc77 100644 --- a/src/transport/test_transport_just_run_topo.conf +++ b/src/service/transport/test_transport_just_run_topo.conf | |||
diff --git a/src/transport/test_transport_nat_icmp_tcp.sh b/src/service/transport/test_transport_nat_icmp_tcp.sh index 41cdde487..41cdde487 100755 --- a/src/transport/test_transport_nat_icmp_tcp.sh +++ b/src/service/transport/test_transport_nat_icmp_tcp.sh | |||
diff --git a/src/transport/test_transport_nat_icmp_tcp_topo.conf b/src/service/transport/test_transport_nat_icmp_tcp_topo.conf index 37738c80f..37738c80f 100644 --- a/src/transport/test_transport_nat_icmp_tcp_topo.conf +++ b/src/service/transport/test_transport_nat_icmp_tcp_topo.conf | |||
diff --git a/src/transport/test_transport_nat_upnp.sh b/src/service/transport/test_transport_nat_upnp.sh index df43ef320..df43ef320 100755 --- a/src/transport/test_transport_nat_upnp.sh +++ b/src/service/transport/test_transport_nat_upnp.sh | |||
diff --git a/src/transport/test_transport_nat_upnp_topo.conf b/src/service/transport/test_transport_nat_upnp_topo.conf index e02633d4b..e02633d4b 100644 --- a/src/transport/test_transport_nat_upnp_topo.conf +++ b/src/service/transport/test_transport_nat_upnp_topo.conf | |||
diff --git a/src/transport/test_transport_plugin_cmd_just_run.c b/src/service/transport/test_transport_plugin_cmd_just_run.c index df7484884..df7484884 100644 --- a/src/transport/test_transport_plugin_cmd_just_run.c +++ b/src/service/transport/test_transport_plugin_cmd_just_run.c | |||
diff --git a/src/transport/test_transport_plugin_cmd_nat_upnp.c b/src/service/transport/test_transport_plugin_cmd_nat_upnp.c index 9d7c5d856..9d7c5d856 100644 --- a/src/transport/test_transport_plugin_cmd_nat_upnp.c +++ b/src/service/transport/test_transport_plugin_cmd_nat_upnp.c | |||
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/service/transport/test_transport_plugin_cmd_simple_send.c index c6d75cce4..c6d75cce4 100644 --- a/src/transport/test_transport_plugin_cmd_simple_send.c +++ b/src/service/transport/test_transport_plugin_cmd_simple_send.c | |||
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c b/src/service/transport/test_transport_plugin_cmd_simple_send_broadcast.c index d2870ab34..d2870ab34 100644 --- a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c +++ b/src/service/transport/test_transport_plugin_cmd_simple_send_broadcast.c | |||
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_dv.c b/src/service/transport/test_transport_plugin_cmd_simple_send_dv.c index d35672cd9..d35672cd9 100644 --- a/src/transport/test_transport_plugin_cmd_simple_send_dv.c +++ b/src/service/transport/test_transport_plugin_cmd_simple_send_dv.c | |||
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_performance.c b/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c index 2baa7b5b4..2baa7b5b4 100644 --- a/src/transport/test_transport_plugin_cmd_simple_send_performance.c +++ b/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c | |||
diff --git a/src/transport/test_transport_plugin_cmd_udp_backchannel.c b/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c index 378caf7df..378caf7df 100644 --- a/src/transport/test_transport_plugin_cmd_udp_backchannel.c +++ b/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c | |||
diff --git a/src/transport/test_transport_simple_send.sh b/src/service/transport/test_transport_simple_send.sh index 0250070be..0250070be 100755 --- a/src/transport/test_transport_simple_send.sh +++ b/src/service/transport/test_transport_simple_send.sh | |||
diff --git a/src/transport/test_transport_simple_send_broadcast.sh b/src/service/transport/test_transport_simple_send_broadcast.sh index a4801bf70..a4801bf70 100755 --- a/src/transport/test_transport_simple_send_broadcast.sh +++ b/src/service/transport/test_transport_simple_send_broadcast.sh | |||
diff --git a/src/transport/test_transport_simple_send_broadcast_topo.conf b/src/service/transport/test_transport_simple_send_broadcast_topo.conf index aa4964f81..aa4964f81 100644 --- a/src/transport/test_transport_simple_send_broadcast_topo.conf +++ b/src/service/transport/test_transport_simple_send_broadcast_topo.conf | |||
diff --git a/src/transport/test_transport_simple_send_dv_circle.sh b/src/service/transport/test_transport_simple_send_dv_circle.sh index bd5f00abe..bd5f00abe 100755 --- a/src/transport/test_transport_simple_send_dv_circle.sh +++ b/src/service/transport/test_transport_simple_send_dv_circle.sh | |||
diff --git a/src/transport/test_transport_simple_send_dv_inverse.sh b/src/service/transport/test_transport_simple_send_dv_inverse.sh index cf7b863a0..cf7b863a0 100755 --- a/src/transport/test_transport_simple_send_dv_inverse.sh +++ b/src/service/transport/test_transport_simple_send_dv_inverse.sh | |||
diff --git a/src/transport/test_transport_simple_send_performance.sh b/src/service/transport/test_transport_simple_send_performance.sh index 12798c2f0..12798c2f0 100755 --- a/src/transport/test_transport_simple_send_performance.sh +++ b/src/service/transport/test_transport_simple_send_performance.sh | |||
diff --git a/src/transport/test_transport_simple_send_performance_topo.conf b/src/service/transport/test_transport_simple_send_performance_topo.conf index 9f39cd9bc..9f39cd9bc 100644 --- a/src/transport/test_transport_simple_send_performance_topo.conf +++ b/src/service/transport/test_transport_simple_send_performance_topo.conf | |||
diff --git a/src/transport/test_transport_simple_send_string.sh b/src/service/transport/test_transport_simple_send_string.sh index 211abb494..211abb494 100755 --- a/src/transport/test_transport_simple_send_string.sh +++ b/src/service/transport/test_transport_simple_send_string.sh | |||
diff --git a/src/transport/test_transport_simple_send_topo.conf b/src/service/transport/test_transport_simple_send_topo.conf index 2c16201f5..2c16201f5 100644 --- a/src/transport/test_transport_simple_send_topo.conf +++ b/src/service/transport/test_transport_simple_send_topo.conf | |||
diff --git a/src/transport/test_transport_start_testcase.sh b/src/service/transport/test_transport_start_testcase.sh index 028c8f248..028c8f248 100755 --- a/src/transport/test_transport_start_testcase.sh +++ b/src/service/transport/test_transport_start_testcase.sh | |||
diff --git a/src/transport/test_transport_start_with_config.c b/src/service/transport/test_transport_start_with_config.c index 349cd65a5..349cd65a5 100644 --- a/src/transport/test_transport_start_with_config.c +++ b/src/service/transport/test_transport_start_with_config.c | |||
diff --git a/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf b/src/service/transport/test_transport_test_transport_address_switch_tcp_peer1.conf index 920e8d199..920e8d199 100644 --- a/src/transport/test_transport_test_transport_address_switch_tcp_peer1.conf +++ b/src/service/transport/test_transport_test_transport_address_switch_tcp_peer1.conf | |||
diff --git a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf b/src/service/transport/test_transport_test_transport_address_switch_tcp_peer2.conf index 6855cd00d..6855cd00d 100644 --- a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf +++ b/src/service/transport/test_transport_test_transport_address_switch_tcp_peer2.conf | |||
diff --git a/src/transport/test_transport_testing_startstop.c b/src/service/transport/test_transport_testing_startstop.c index 4783c1813..4783c1813 100644 --- a/src/transport/test_transport_testing_startstop.c +++ b/src/service/transport/test_transport_testing_startstop.c | |||
diff --git a/src/transport/test_transport_udp_backchannel.sh b/src/service/transport/test_transport_udp_backchannel.sh index 1a7c83385..1a7c83385 100755 --- a/src/transport/test_transport_udp_backchannel.sh +++ b/src/service/transport/test_transport_udp_backchannel.sh | |||
diff --git a/src/transport/test_transport_udp_backchannel_topo.conf b/src/service/transport/test_transport_udp_backchannel_topo.conf index ad35bde0a..ad35bde0a 100644 --- a/src/transport/test_transport_udp_backchannel_topo.conf +++ b/src/service/transport/test_transport_udp_backchannel_topo.conf | |||
diff --git a/src/transport/transport-testing-cmds.h b/src/service/transport/transport-testing-cmds.h index 6b6fcf4f1..6b6fcf4f1 100644 --- a/src/transport/transport-testing-cmds.h +++ b/src/service/transport/transport-testing-cmds.h | |||
diff --git a/src/transport/transport-testing-communicator.c b/src/service/transport/transport-testing-communicator.c index 553426b66..553426b66 100644 --- a/src/transport/transport-testing-communicator.c +++ b/src/service/transport/transport-testing-communicator.c | |||
diff --git a/src/transport/transport-testing-communicator.h b/src/service/transport/transport-testing-communicator.h index 7460aab8e..7460aab8e 100644 --- a/src/transport/transport-testing-communicator.h +++ b/src/service/transport/transport-testing-communicator.h | |||
diff --git a/src/transport/transport-testing-filenames2.c b/src/service/transport/transport-testing-filenames2.c index 59fa1ebd5..59fa1ebd5 100644 --- a/src/transport/transport-testing-filenames2.c +++ b/src/service/transport/transport-testing-filenames2.c | |||
diff --git a/src/transport/transport-testing-loggers2.c b/src/service/transport/transport-testing-loggers2.c index e6c79b78a..e6c79b78a 100644 --- a/src/transport/transport-testing-loggers2.c +++ b/src/service/transport/transport-testing-loggers2.c | |||
diff --git a/src/transport/transport-testing-main2.c b/src/service/transport/transport-testing-main2.c index 0a1710922..0a1710922 100644 --- a/src/transport/transport-testing-main2.c +++ b/src/service/transport/transport-testing-main2.c | |||
diff --git a/src/transport/transport-testing-send2.c b/src/service/transport/transport-testing-send2.c index c48dc3a4a..c48dc3a4a 100644 --- a/src/transport/transport-testing-send2.c +++ b/src/service/transport/transport-testing-send2.c | |||
diff --git a/src/transport/transport-testing2.c b/src/service/transport/transport-testing2.c index afa0b0ad4..afa0b0ad4 100644 --- a/src/transport/transport-testing2.c +++ b/src/service/transport/transport-testing2.c | |||
diff --git a/src/transport/transport-testing2.h b/src/service/transport/transport-testing2.h index 8f1071e8f..8f1071e8f 100644 --- a/src/transport/transport-testing2.h +++ b/src/service/transport/transport-testing2.h | |||
diff --git a/src/transport/transport.conf.in b/src/service/transport/transport.conf.in index de4855c6a..de4855c6a 100644 --- a/src/transport/transport.conf.in +++ b/src/service/transport/transport.conf.in | |||
diff --git a/src/transport/transport.h b/src/service/transport/transport.h index 66f17ee5b..66f17ee5b 100644 --- a/src/transport/transport.h +++ b/src/service/transport/transport.h | |||
diff --git a/src/transport/transport_api2_application.c b/src/service/transport/transport_api2_application.c index 00f5f62eb..00f5f62eb 100644 --- a/src/transport/transport_api2_application.c +++ b/src/service/transport/transport_api2_application.c | |||
diff --git a/src/transport/transport_api2_communication.c b/src/service/transport/transport_api2_communication.c index 0a7636843..0a7636843 100644 --- a/src/transport/transport_api2_communication.c +++ b/src/service/transport/transport_api2_communication.c | |||
diff --git a/src/transport/transport_api2_core.c b/src/service/transport/transport_api2_core.c index 0d2a0ac7f..0d2a0ac7f 100644 --- a/src/transport/transport_api2_core.c +++ b/src/service/transport/transport_api2_core.c | |||
diff --git a/src/transport/transport_api2_monitor.c b/src/service/transport/transport_api2_monitor.c index 67aa1985e..67aa1985e 100644 --- a/src/transport/transport_api2_monitor.c +++ b/src/service/transport/transport_api2_monitor.c | |||
diff --git a/src/transport/transport_api_cmd_backchannel_check.c b/src/service/transport/transport_api_cmd_backchannel_check.c index 68bdae69c..68bdae69c 100644 --- a/src/transport/transport_api_cmd_backchannel_check.c +++ b/src/service/transport/transport_api_cmd_backchannel_check.c | |||
diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/service/transport/transport_api_cmd_connecting_peers.c index c59c4b006..c59c4b006 100644 --- a/src/transport/transport_api_cmd_connecting_peers.c +++ b/src/service/transport/transport_api_cmd_connecting_peers.c | |||
diff --git a/src/transport/transport_api_cmd_send_simple.c b/src/service/transport/transport_api_cmd_send_simple.c index 2671727c0..2671727c0 100644 --- a/src/transport/transport_api_cmd_send_simple.c +++ b/src/service/transport/transport_api_cmd_send_simple.c | |||
diff --git a/src/transport/transport_api_cmd_send_simple_performance.c b/src/service/transport/transport_api_cmd_send_simple_performance.c index 7ce3b8bf7..7ce3b8bf7 100644 --- a/src/transport/transport_api_cmd_send_simple_performance.c +++ b/src/service/transport/transport_api_cmd_send_simple_performance.c | |||
diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/service/transport/transport_api_cmd_start_peer.c index 54e204a21..54e204a21 100644 --- a/src/transport/transport_api_cmd_start_peer.c +++ b/src/service/transport/transport_api_cmd_start_peer.c | |||
diff --git a/src/transport/transport_api_cmd_stop_peer.c b/src/service/transport/transport_api_cmd_stop_peer.c index 60d48c56b..60d48c56b 100644 --- a/src/transport/transport_api_cmd_stop_peer.c +++ b/src/service/transport/transport_api_cmd_stop_peer.c | |||
diff --git a/src/transport/transport_api_traits.c b/src/service/transport/transport_api_traits.c index 7e66cc3d1..7e66cc3d1 100644 --- a/src/transport/transport_api_traits.c +++ b/src/service/transport/transport_api_traits.c | |||
diff --git a/src/transport/upnp.sh b/src/service/transport/upnp.sh index d01a1a1a1..d01a1a1a1 100755 --- a/src/transport/upnp.sh +++ b/src/service/transport/upnp.sh | |||
diff --git a/src/set/Makefile.am b/src/set/Makefile.am index d8c47f45d..150da06e0 100644 --- a/src/set/Makefile.am +++ b/src/set/Makefile.am | |||
@@ -28,9 +28,9 @@ gnunet_set_profiler_SOURCES = \ | |||
28 | gnunet-set-profiler.c | 28 | gnunet-set-profiler.c |
29 | gnunet_set_profiler_LDADD = \ | 29 | gnunet_set_profiler_LDADD = \ |
30 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 30 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
31 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 31 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
32 | libgnunetset.la \ | 32 | libgnunetset.la \ |
33 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 33 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
34 | $(GN_LIBINTL) | 34 | $(GN_LIBINTL) |
35 | 35 | ||
36 | 36 | ||
@@ -50,7 +50,7 @@ gnunet_service_set_SOURCES = \ | |||
50 | gnunet-service-set_protocol.h | 50 | gnunet-service-set_protocol.h |
51 | gnunet_service_set_LDADD = \ | 51 | gnunet_service_set_LDADD = \ |
52 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 52 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
53 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 53 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
54 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 54 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
55 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 55 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
56 | $(top_builddir)/src/lib/block/libgnunetblock.la \ | 56 | $(top_builddir)/src/lib/block/libgnunetblock.la \ |
@@ -80,28 +80,28 @@ test_set_api_SOURCES = \ | |||
80 | test_set_api.c | 80 | test_set_api.c |
81 | test_set_api_LDADD = \ | 81 | test_set_api_LDADD = \ |
82 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 82 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
83 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 83 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
84 | libgnunetset.la | 84 | libgnunetset.la |
85 | 85 | ||
86 | test_set_union_result_symmetric_SOURCES = \ | 86 | test_set_union_result_symmetric_SOURCES = \ |
87 | test_set_union_result_symmetric.c | 87 | test_set_union_result_symmetric.c |
88 | test_set_union_result_symmetric_LDADD = \ | 88 | test_set_union_result_symmetric_LDADD = \ |
89 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 89 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
90 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 90 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
91 | libgnunetset.la | 91 | libgnunetset.la |
92 | 92 | ||
93 | test_set_intersection_result_full_SOURCES = \ | 93 | test_set_intersection_result_full_SOURCES = \ |
94 | test_set_intersection_result_full.c | 94 | test_set_intersection_result_full.c |
95 | test_set_intersection_result_full_LDADD = \ | 95 | test_set_intersection_result_full_LDADD = \ |
96 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 96 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
97 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 97 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
98 | libgnunetset.la | 98 | libgnunetset.la |
99 | 99 | ||
100 | test_set_union_copy_SOURCES = \ | 100 | test_set_union_copy_SOURCES = \ |
101 | test_set_union_copy.c | 101 | test_set_union_copy.c |
102 | test_set_union_copy_LDADD = \ | 102 | test_set_union_copy_LDADD = \ |
103 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 103 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
104 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 104 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
105 | libgnunetset.la | 105 | libgnunetset.la |
106 | 106 | ||
107 | plugin_LTLIBRARIES = \ | 107 | plugin_LTLIBRARIES = \ |
diff --git a/src/seti/Makefile.am b/src/seti/Makefile.am index 96adf377d..46e200516 100644 --- a/src/seti/Makefile.am +++ b/src/seti/Makefile.am | |||
@@ -27,9 +27,9 @@ gnunet_seti_profiler_SOURCES = \ | |||
27 | gnunet-seti-profiler.c | 27 | gnunet-seti-profiler.c |
28 | gnunet_seti_profiler_LDADD = \ | 28 | gnunet_seti_profiler_LDADD = \ |
29 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 29 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
30 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 30 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
31 | libgnunetseti.la \ | 31 | libgnunetseti.la \ |
32 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 32 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
33 | $(GN_LIBINTL) | 33 | $(GN_LIBINTL) |
34 | 34 | ||
35 | 35 | ||
@@ -38,7 +38,7 @@ gnunet_service_seti_SOURCES = \ | |||
38 | gnunet-service-seti_protocol.h | 38 | gnunet-service-seti_protocol.h |
39 | gnunet_service_seti_LDADD = \ | 39 | gnunet_service_seti_LDADD = \ |
40 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 40 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
41 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 41 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
42 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 42 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
43 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 43 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
44 | $(top_builddir)/src/lib/block/libgnunetblock.la \ | 44 | $(top_builddir)/src/lib/block/libgnunetblock.la \ |
@@ -65,7 +65,7 @@ test_seti_api_SOURCES = \ | |||
65 | test_seti_api.c | 65 | test_seti_api.c |
66 | test_seti_api_LDADD = \ | 66 | test_seti_api_LDADD = \ |
67 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 67 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
68 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 68 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
69 | libgnunetseti.la | 69 | libgnunetseti.la |
70 | 70 | ||
71 | plugin_LTLIBRARIES = \ | 71 | plugin_LTLIBRARIES = \ |
diff --git a/src/setu/Makefile.am b/src/setu/Makefile.am index 3ecd8f32a..f826c9e2a 100644 --- a/src/setu/Makefile.am +++ b/src/setu/Makefile.am | |||
@@ -28,9 +28,9 @@ gnunet_setu_profiler_SOURCES = \ | |||
28 | gnunet-setu-profiler.c | 28 | gnunet-setu-profiler.c |
29 | gnunet_setu_profiler_LDADD = \ | 29 | gnunet_setu_profiler_LDADD = \ |
30 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 30 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
31 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 31 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
32 | libgnunetsetu.la \ | 32 | libgnunetsetu.la \ |
33 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 33 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
34 | $(GN_LIBINTL) | 34 | $(GN_LIBINTL) |
35 | 35 | ||
36 | 36 | ||
@@ -48,7 +48,7 @@ gnunet_service_setu_SOURCES = \ | |||
48 | gnunet-service-setu_protocol.h | 48 | gnunet-service-setu_protocol.h |
49 | gnunet_service_setu_LDADD = \ | 49 | gnunet_service_setu_LDADD = \ |
50 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 50 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
51 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 51 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
52 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 52 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
53 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 53 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
54 | $(top_builddir)/src/lib/block/libgnunetblock.la \ | 54 | $(top_builddir)/src/lib/block/libgnunetblock.la \ |
@@ -76,7 +76,7 @@ test_setu_api_SOURCES = \ | |||
76 | test_setu_api.c | 76 | test_setu_api.c |
77 | test_setu_api_LDADD = \ | 77 | test_setu_api_LDADD = \ |
78 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 78 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
79 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 79 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
80 | libgnunetsetu.la | 80 | libgnunetsetu.la |
81 | 81 | ||
82 | 82 | ||
@@ -84,7 +84,7 @@ perf_setu_api_SOURCES = \ | |||
84 | perf_setu_api.c | 84 | perf_setu_api.c |
85 | perf_setu_api_LDADD = \ | 85 | perf_setu_api_LDADD = \ |
86 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 86 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
87 | $(top_builddir)/src/lib/testing/libgnunettesting.la \ | 87 | $(top_builddir)/src/service/testing/libgnunettesting.la \ |
88 | libgnunetsetu.la | 88 | libgnunetsetu.la |
89 | 89 | ||
90 | 90 | ||
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index 620d51d9a..7f5ad1893 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am | |||
@@ -20,9 +20,9 @@ gnunet_daemon_topology_SOURCES = \ | |||
20 | gnunet-daemon-topology.c | 20 | gnunet-daemon-topology.c |
21 | gnunet_daemon_topology_LDADD = \ | 21 | gnunet_daemon_topology_LDADD = \ |
22 | $(top_builddir)/src/service/core/libgnunetcore.la \ | 22 | $(top_builddir)/src/service/core/libgnunetcore.la \ |
23 | $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ | 23 | $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \ |
24 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 24 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
25 | $(top_builddir)/src/transport/libgnunettransportapplication.la \ | 25 | $(top_builddir)/src/service/transport/libgnunettransportapplication.la \ |
26 | $(top_builddir)/src/lib/hello/libgnunethello.la \ | 26 | $(top_builddir)/src/lib/hello/libgnunethello.la \ |
27 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 27 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
28 | $(GN_LIBINTL) | 28 | $(GN_LIBINTL) |
@@ -40,7 +40,7 @@ test_gnunet_daemon_topology_SOURCES = \ | |||
40 | test_gnunet_daemon_topology.c | 40 | test_gnunet_daemon_topology.c |
41 | test_gnunet_daemon_topology_LDADD = \ | 41 | test_gnunet_daemon_topology_LDADD = \ |
42 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 42 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
43 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 43 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
44 | $(top_builddir)/src/lib/util/libgnunetutil.la | 44 | $(top_builddir)/src/lib/util/libgnunetutil.la |
45 | 45 | ||
46 | EXTRA_DIST = \ | 46 | EXTRA_DIST = \ |
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 38a7e8b3f..2f102a3fd 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am | |||
@@ -39,7 +39,7 @@ gnunet_helper_vpn_LDADD = \ | |||
39 | gnunet_service_vpn_SOURCES = \ | 39 | gnunet_service_vpn_SOURCES = \ |
40 | gnunet-service-vpn.c | 40 | gnunet-service-vpn.c |
41 | gnunet_service_vpn_LDADD = \ | 41 | gnunet_service_vpn_LDADD = \ |
42 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 42 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
43 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 43 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
44 | $(top_builddir)/src/cadet/libgnunetcadet.la \ | 44 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
45 | $(top_builddir)/src/regex/libgnunetregex.la \ | 45 | $(top_builddir)/src/regex/libgnunetregex.la \ |
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am index b5fcb9d7b..5c10827b8 100644 --- a/src/zonemaster/Makefile.am +++ b/src/zonemaster/Makefile.am | |||
@@ -24,7 +24,7 @@ gnunet_service_zonemaster_LDADD = \ | |||
24 | $(top_builddir)/src/dht/libgnunetdht.la \ | 24 | $(top_builddir)/src/dht/libgnunetdht.la \ |
25 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ | 25 | $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \ |
26 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ | 26 | $(top_builddir)/src/service/identity/libgnunetidentity.la \ |
27 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 27 | $(top_builddir)/src/service/statistics/libgnunetstatistics.la \ |
28 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | 28 | $(top_builddir)/src/lib/util/libgnunetutil.la \ |
29 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 29 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
30 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ | 30 | $(top_builddir)/src/namecache/libgnunetnamecache.la \ |