X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcadet%2FMakefile.am;h=b52079b2e1dcc1d95107d89083a263c874538eb8;hb=f82b3a27df765f4a31548ae4efe66dc3dbc42cef;hp=e88c3a0d3b730f6b2118cca0a2f46faec9ee0a3d;hpb=1b4ccddc7946888fc0b66c58b1434e1814a43822;p=oweals%2Fgnunet.git

diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index e88c3a0d3..b52079b2e 100644
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -22,13 +22,17 @@ plugindir = $(libdir)/gnunet
 AM_CLFAGS = -g
 
 libexec_PROGRAMS = \
- gnunet-service-cadet $(EXP_LIBEXEC)
+ gnunet-service-cadet \
+ gnunet-service-cadet-new \
+ $(EXP_LIBEXEC)
 
 bin_PROGRAMS = \
  gnunet-cadet
 
 lib_LTLIBRARIES = \
-  libgnunetcadet.la $(EXP_LIB)
+  libgnunetcadetnew.la \
+  libgnunetcadet.la \
+  $(EXP_LIB)
 
 libgnunetcadet_la_SOURCES = \
   cadet_api.c cadet_common.c
@@ -40,12 +44,44 @@ libgnunetcadet_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 5:0:0
 
+
+libgnunetcadetnew_la_SOURCES = \
+  cadet_api_new.c
+libgnunetcadetnew_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIB) \
+  $(LTLIBINTL)
+libgnunetcadetnew_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+  -version-info 6:0:0
+
 gnunet_cadet_SOURCES = \
   gnunet-cadet.c
 gnunet_cadet_LDADD = \
-  libgnunetcadet.la \
+  libgnunetcadetnew.la \
   $(top_builddir)/src/util/libgnunetutil.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 \
  gnunet-service-cadet_connection.c gnunet-service-cadet_connection.h \
@@ -62,6 +98,7 @@ gnunet_service_cadet_LDADD = \
   $(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 \
@@ -73,19 +110,37 @@ endif
 
 
 if HAVE_TESTING
- noinst_LIBRARIES = libgnunetcadettest.a $(noinst_LIB_EXP)
+ noinst_LTLIBRARIES = libgnunetcadettest.la libgnunetcadettestnew.la $(noinst_LIB_EXP)
  noinst_PROGRAMS = gnunet-cadet-profiler
 endif
 
-libgnunetcadettest_a_SOURCES = \
+libgnunetcadettest_la_SOURCES = \
   cadet_test_lib.c cadet_test_lib.h
-libgnunetcadettest_a_LIBADD = \
+libgnunetcadettest_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  libgnunetcadet.la
 
 if HAVE_TESTING
 check_PROGRAMS = \
+  test_cadet_local_mq \
+  test_cadet_2_forward_new \
+  test_cadet_2_forward_new \
+  test_cadet_2_signal_new \
+  test_cadet_2_keepalive_new \
+  test_cadet_2_speed_new \
+  test_cadet_2_speed_ack_new \
+  test_cadet_2_speed_backwards_new \
+  test_cadet_2_speed_reliable_new \
+  test_cadet_2_speed_reliable_backwards_new \
+  test_cadet_5_forward_new \
+  test_cadet_5_signal_new \
+  test_cadet_5_keepalive_new \
+  test_cadet_5_speed_new \
+  test_cadet_5_speed_ack_new \
+  test_cadet_5_speed_reliable_new \
+  test_cadet_5_speed_reliable_backwards_new \
+  test_cadet_5_speed_backwards_new \
   test_cadet_single \
   test_cadet_local \
   test_cadet_2_forward \
@@ -101,22 +156,22 @@ check_PROGRAMS = \
   test_cadet_5_keepalive \
   test_cadet_5_speed \
   test_cadet_5_speed_ack \
-  test_cadet_5_speed_backwards \
   test_cadet_5_speed_reliable \
-  test_cadet_5_speed_reliable_backwards
+  test_cadet_5_speed_reliable_backwards \
+  test_cadet_5_speed_backwards
 endif
 
 ld_cadet_test_lib = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  libgnunetcadettest.a \
+  libgnunetcadettest.la \
   libgnunetcadet.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 dep_cadet_test_lib = \
   libgnunetcadet.la \
-  libgnunetcadettest.a \
+  libgnunetcadettest.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 
@@ -134,6 +189,13 @@ test_cadet_local_SOURCES = \
 test_cadet_local_LDADD = $(ld_cadet_test_lib)
 
 
+test_cadet_local_mq_SOURCES = \
+  test_cadet_local_mq.c
+test_cadet_local_mq_LDADD = \
+  libgnunetcadetnew.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+
 test_cadet_2_forward_SOURCES = \
   test_cadet.c
 test_cadet_2_forward_LDADD = $(ld_cadet_test_lib)
@@ -200,8 +262,94 @@ test_cadet_5_speed_reliable_backwards_SOURCES = \
 test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
 
 
+# NEW TESTS
+libgnunetcadettestnew_la_SOURCES = \
+  cadet_test_lib_new.c cadet_test_lib_new.h
+libgnunetcadettestnew_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ libgnunetcadetnew.la
+
+ld_cadet_test_lib_new = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  libgnunetcadetnew.la \
+  libgnunetcadettestnew.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
+dep_cadet_test_lib_new = \
+  libgnunetcadetnew.la \
+  libgnunetcadettestnew.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
+
+test_cadet_2_forward_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_2_forward_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_2_signal_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_2_signal_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_2_keepalive_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_2_keepalive_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_2_speed_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_2_speed_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_2_speed_ack_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_2_speed_ack_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_2_speed_backwards_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_2_speed_backwards_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_2_speed_reliable_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_2_speed_reliable_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_2_speed_reliable_backwards_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_2_speed_reliable_backwards_new_LDADD = $(ld_cadet_test_lib_new)
+
+
+test_cadet_5_forward_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_5_forward_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_5_signal_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_5_signal_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_5_keepalive_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_5_keepalive_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_5_speed_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_5_speed_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_5_speed_ack_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_5_speed_ack_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_5_speed_backwards_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_5_speed_backwards_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_5_speed_reliable_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_5_speed_reliable_new_LDADD = $(ld_cadet_test_lib_new)
+
+test_cadet_5_speed_reliable_backwards_new_SOURCES = \
+  test_cadet_new.c
+test_cadet_5_speed_reliable_backwards_new_LDADD = $(ld_cadet_test_lib_new)
+
+
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = \
  $(check_PROGRAMS)
 endif
@@ -210,4 +358,3 @@ EXTRA_DIST = \
   cadet.h cadet_protocol.h \
   test_cadet.conf \
   test_cadet_drop.conf
-