diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-15 21:49:06 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-15 21:49:06 +0100 |
commit | 71785fccb8584bd028ff48aa56f55e84324c569e (patch) | |
tree | df07376ac00f04484045be67f5743ff42449a2d2 /src/cadet/Makefile.am | |
parent | 4270685ca41e6401f0836716a24e87dbab4d1145 (diff) | |
download | gnunet-71785fccb8584bd028ff48aa56f55e84324c569e.tar.gz gnunet-71785fccb8584bd028ff48aa56f55e84324c569e.zip |
cleaning up some CADET logic, improving types used
Diffstat (limited to 'src/cadet/Makefile.am')
-rw-r--r-- | src/cadet/Makefile.am | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am index d823b4872..ba93bee18 100644 --- a/src/cadet/Makefile.am +++ b/src/cadet/Makefile.am | |||
@@ -22,7 +22,9 @@ plugindir = $(libdir)/gnunet | |||
22 | AM_CLFAGS = -g | 22 | AM_CLFAGS = -g |
23 | 23 | ||
24 | libexec_PROGRAMS = \ | 24 | libexec_PROGRAMS = \ |
25 | gnunet-service-cadet $(EXP_LIBEXEC) | 25 | gnunet-service-cadet \ |
26 | gnunet-service-cadet-new \ | ||
27 | $(EXP_LIBEXEC) | ||
26 | 28 | ||
27 | bin_PROGRAMS = \ | 29 | bin_PROGRAMS = \ |
28 | gnunet-cadet | 30 | gnunet-cadet |
@@ -46,6 +48,26 @@ gnunet_cadet_LDADD = \ | |||
46 | libgnunetcadet.la \ | 48 | libgnunetcadet.la \ |
47 | $(top_builddir)/src/util/libgnunetutil.la | 49 | $(top_builddir)/src/util/libgnunetutil.la |
48 | 50 | ||
51 | gnunet_service_cadet_new_SOURCES = \ | ||
52 | gnunet-service-cadet-new.c gnunet-service-cadet-new.h \ | ||
53 | gnunet-service-cadet-new_channel.c gnunet-service-cadet-new_channel.h \ | ||
54 | gnunet-service-cadet-new_connection.c gnunet-service-cadet-new_connection.h \ | ||
55 | gnunet-service-cadet-new_dht.c gnunet-service-cadet-new_dht.h \ | ||
56 | gnunet-service-cadet-new_hello.c gnunet-service-cadet-new_hello.h \ | ||
57 | gnunet-service-cadet-new_tunnels.c gnunet-service-cadet-new_tunnels.h \ | ||
58 | gnunet-service-cadet-new_paths.c gnunet-service-cadet-new_paths.h \ | ||
59 | gnunet-service-cadet-new_peer.c gnunet-service-cadet-new_peer.h | ||
60 | gnunet_service_cadet_new_LDADD = \ | ||
61 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
62 | $(top_builddir)/src/ats/libgnunetats.la \ | ||
63 | $(top_builddir)/src/core/libgnunetcore.la \ | ||
64 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
65 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
66 | $(top_builddir)/src/transport/libgnunettransport.la \ | ||
67 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | ||
68 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
69 | $(top_builddir)/src/block/libgnunetblock.la | ||
70 | |||
49 | gnunet_service_cadet_SOURCES = \ | 71 | gnunet_service_cadet_SOURCES = \ |
50 | gnunet-service-cadet_tunnel.c gnunet-service-cadet_tunnel.h \ | 72 | gnunet-service-cadet_tunnel.c gnunet-service-cadet_tunnel.h \ |
51 | gnunet-service-cadet_connection.c gnunet-service-cadet_connection.h \ | 73 | gnunet-service-cadet_connection.c gnunet-service-cadet_connection.h \ |
@@ -87,6 +109,11 @@ libgnunetcadettest_a_LIBADD = \ | |||
87 | 109 | ||
88 | if HAVE_TESTING | 110 | if HAVE_TESTING |
89 | check_PROGRAMS = \ | 111 | check_PROGRAMS = \ |
112 | test_cadet_2_speed_reliable_backwards \ | ||
113 | test_cadet_5_speed \ | ||
114 | test_cadet_5_speed_ack \ | ||
115 | test_cadet_5_speed_reliable \ | ||
116 | test_cadet_5_speed_reliable_backwards \ | ||
90 | test_cadet_single \ | 117 | test_cadet_single \ |
91 | test_cadet_local \ | 118 | test_cadet_local \ |
92 | test_cadet_2_forward \ | 119 | test_cadet_2_forward \ |
@@ -96,15 +123,10 @@ check_PROGRAMS = \ | |||
96 | test_cadet_2_speed_ack \ | 123 | test_cadet_2_speed_ack \ |
97 | test_cadet_2_speed_backwards \ | 124 | test_cadet_2_speed_backwards \ |
98 | test_cadet_2_speed_reliable \ | 125 | test_cadet_2_speed_reliable \ |
99 | test_cadet_2_speed_reliable_backwards \ | ||
100 | test_cadet_5_forward \ | 126 | test_cadet_5_forward \ |
101 | test_cadet_5_signal \ | 127 | test_cadet_5_signal \ |
102 | test_cadet_5_keepalive \ | 128 | test_cadet_5_keepalive \ |
103 | test_cadet_5_speed \ | 129 | test_cadet_5_speed_backwards |
104 | test_cadet_5_speed_ack \ | ||
105 | test_cadet_5_speed_backwards \ | ||
106 | test_cadet_5_speed_reliable \ | ||
107 | test_cadet_5_speed_reliable_backwards | ||
108 | endif | 130 | endif |
109 | 131 | ||
110 | ld_cadet_test_lib = \ | 132 | ld_cadet_test_lib = \ |