+# This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
if MINGW
AM_CLFAGS = -g
libexec_PROGRAMS = \
- gnunet-service-cadet $(EXP_LIBEXEC)
+ gnunet-service-cadet \
+ gnunet-service-cadet-new \
+ $(EXP_LIBEXEC)
bin_PROGRAMS = \
gnunet-cadet
gnunet_cadet_SOURCES = \
gnunet-cadet.c
gnunet_cadet_LDADD = \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ libgnunetcadet.la \
$(top_builddir)/src/util/libgnunetutil.la
-gnunet_cadet_DEPENDENCIES = \
- libgnunetcadet.la
+
+gnunet_service_cadet_new_SOURCES = \
+ gnunet-service-cadet-new.c gnunet-service-cadet-new.h \
+ gnunet-service-cadet-new_channel.c gnunet-service-cadet-new_channel.h \
+ gnunet-service-cadet-new_connection.c gnunet-service-cadet-new_connection.h \
+ gnunet-service-cadet-new_core.c gnunet-service-cadet-new_core.h \
+ gnunet-service-cadet-new_dht.c gnunet-service-cadet-new_dht.h \
+ gnunet-service-cadet-new_hello.c gnunet-service-cadet-new_hello.h \
+ gnunet-service-cadet-new_tunnels.c gnunet-service-cadet-new_tunnels.h \
+ gnunet-service-cadet-new_paths.c gnunet-service-cadet-new_paths.h \
+ gnunet-service-cadet-new_peer.c gnunet-service-cadet-new_peer.h
+gnunet_service_cadet_new_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/block/libgnunetblock.la
gnunet_service_cadet_SOURCES = \
gnunet-service-cadet_tunnel.c gnunet-service-cadet_tunnel.h \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/dht/libgnunetdht.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/block/libgnunetblock.la
-gnunet_service_cadet_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
libgnunetcadettest_a_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la
-libgnunetcadettest_a_DEPENDENCIES = \
- libgnunetcadet.la
+ libgnunetcadet.la
if HAVE_TESTING
check_PROGRAMS = \
+ test_cadet_2_speed_reliable_backwards \
+ test_cadet_5_speed \
+ test_cadet_5_speed_ack \
+ test_cadet_5_speed_reliable \
+ test_cadet_5_speed_reliable_backwards \
test_cadet_single \
test_cadet_local \
- test_cadet_forward \
- test_cadet_signal \
- test_cadet_keepalive \
- test_cadet_speed \
- test_cadet_speed_ack \
- test_cadet_speed_backwards \
- test_cadet_speed_reliable \
- test_cadet_speed_reliable_backwards
+ test_cadet_2_forward \
+ test_cadet_2_signal \
+ test_cadet_2_keepalive \
+ test_cadet_2_speed \
+ test_cadet_2_speed_ack \
+ test_cadet_2_speed_backwards \
+ test_cadet_2_speed_reliable \
+ test_cadet_5_forward \
+ test_cadet_5_signal \
+ test_cadet_5_keepalive \
+ test_cadet_5_speed_backwards
endif
ld_cadet_test_lib = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/cadet/libgnunetcadettest.a \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
+ libgnunetcadettest.a \
+ libgnunetcadet.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la
gnunet_cadet_profiler_SOURCES = \
gnunet-cadet-profiler.c
gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib)
-gnunet_cadet_profiler_DEPENDENCIES = $(dep_cadet_test_lib)
test_cadet_single_SOURCES = \
test_cadet_single.c
test_cadet_single_LDADD = $(ld_cadet_test_lib)
-test_cadet_single_DEPENDENCIES = $(dep_cadet_test_lib)
test_cadet_local_SOURCES = \
test_cadet_local.c
test_cadet_local_LDADD = $(ld_cadet_test_lib)
-test_cadet_local_DEPENDENCIES = $(dep_cadet_test_lib)
-test_cadet_forward_SOURCES = \
+
+test_cadet_2_forward_SOURCES = \
+ test_cadet.c
+test_cadet_2_forward_LDADD = $(ld_cadet_test_lib)
+
+test_cadet_2_signal_SOURCES = \
+ test_cadet.c
+test_cadet_2_signal_LDADD = $(ld_cadet_test_lib)
+
+test_cadet_2_keepalive_SOURCES = \
test_cadet.c
-test_cadet_forward_LDADD = $(ld_cadet_test_lib)
-test_cadet_forward_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib)
-test_cadet_signal_SOURCES = \
+test_cadet_2_speed_SOURCES = \
test_cadet.c
-test_cadet_signal_LDADD = $(ld_cadet_test_lib)
-test_cadet_signal_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_speed_LDADD = $(ld_cadet_test_lib)
-test_cadet_keepalive_SOURCES = \
+test_cadet_2_speed_ack_SOURCES = \
test_cadet.c
-test_cadet_keepalive_LDADD = $(ld_cadet_test_lib)
-test_cadet_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_SOURCES = \
+test_cadet_2_speed_backwards_SOURCES = \
test_cadet.c
-test_cadet_speed_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_ack_SOURCES = \
+test_cadet_2_speed_reliable_SOURCES = \
test_cadet.c
-test_cadet_speed_ack_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_backwards_SOURCES = \
+test_cadet_2_speed_reliable_backwards_SOURCES = \
test_cadet.c
-test_cadet_speed_backwards_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_reliable_SOURCES = \
+
+test_cadet_5_forward_SOURCES = \
test_cadet.c
-test_cadet_speed_reliable_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_5_forward_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_reliable_backwards_SOURCES = \
+test_cadet_5_signal_SOURCES = \
test_cadet.c
-test_cadet_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
-test_cadet_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
+test_cadet_5_signal_LDADD = $(ld_cadet_test_lib)
+
+test_cadet_5_keepalive_SOURCES = \
+ test_cadet.c
+test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib)
+
+test_cadet_5_speed_SOURCES = \
+ test_cadet.c
+test_cadet_5_speed_LDADD = $(ld_cadet_test_lib)
+
+test_cadet_5_speed_ack_SOURCES = \
+ test_cadet.c
+test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib)
+
+test_cadet_5_speed_backwards_SOURCES = \
+ test_cadet.c
+test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib)
+
+test_cadet_5_speed_reliable_SOURCES = \
+ test_cadet.c
+test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib)
+
+test_cadet_5_speed_reliable_backwards_SOURCES = \
+ test_cadet.c
+test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
if ENABLE_TEST_RUN
cadet.h cadet_protocol.h \
test_cadet.conf \
test_cadet_drop.conf
-