Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / cadet / Makefile.am

diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index ba93bee183c6e4299bd3a0e07d90a9e9ad0959bf..b52079b2e1dcc1d95107d89083a263c874538eb8 100644 (file)
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -30,7 +30,9 @@ 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
@@ -42,16 +44,28 @@ 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 \
@@ -96,24 +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_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_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 \
@@ -123,23 +150,28 @@ check_PROGRAMS = \
   test_cadet_2_speed_ack \
   test_cadet_2_speed_backwards \
   test_cadet_2_speed_reliable \
+  test_cadet_2_speed_reliable_backwards \
   test_cadet_5_forward \
   test_cadet_5_signal \
   test_cadet_5_keepalive \
+  test_cadet_5_speed \
+  test_cadet_5_speed_ack \
+  test_cadet_5_speed_reliable \
+  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
 
 
@@ -157,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)
@@ -223,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