X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcadet%2FMakefile.am;h=ce30ebe46a3e98bc9b7ae4cda0b1e54d0cfaebc5;hb=c831b76d24e75c692ab6141f327d1a91d391f93b;hp=c33a653b0554205c96fd3be0a64cc56efffa2f95;hpb=b05d9b4b7cead622dce8342daa5556b76647bc31;p=oweals%2Fgnunet.git diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am index c33a653b0..ce30ebe46 100644 --- a/src/cadet/Makefile.am +++ b/src/cadet/Makefile.am @@ -22,55 +22,43 @@ plugindir = $(libdir)/gnunet AM_CLFAGS = -g libexec_PROGRAMS = \ - gnunet-service-cadet-new \ + gnunet-service-cadet \ $(EXP_LIBEXEC) bin_PROGRAMS = \ gnunet-cadet lib_LTLIBRARIES = \ - libgnunetcadetnew.la \ libgnunetcadet.la \ $(EXP_LIB) libgnunetcadet_la_SOURCES = \ - cadet_api.c cadet_common.c + cadet_api.c libgnunetcadet_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(XLIB) \ $(LTLIBINTL) 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 + -version-info 7:0:0 gnunet_cadet_SOURCES = \ gnunet-cadet.c gnunet_cadet_LDADD = \ - libgnunetcadetnew.la \ + libgnunetcadet.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 = \ +gnunet_service_cadet_SOURCES = \ + gnunet-service-cadet.c gnunet-service-cadet.h \ + gnunet-service-cadet_channel.c gnunet-service-cadet_channel.h \ + gnunet-service-cadet_connection.c gnunet-service-cadet_connection.h \ + gnunet-service-cadet_core.c gnunet-service-cadet_core.h \ + gnunet-service-cadet_dht.c gnunet-service-cadet_dht.h \ + gnunet-service-cadet_hello.c gnunet-service-cadet_hello.h \ + gnunet-service-cadet_tunnels.c gnunet-service-cadet_tunnels.h \ + gnunet-service-cadet_paths.c gnunet-service-cadet_paths.h \ + gnunet-service-cadet_peer.c gnunet-service-cadet_peer.h +gnunet_service_cadet_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ @@ -81,154 +69,133 @@ gnunet_service_cadet_new_LDADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/block/libgnunetblock.la if LINUX - gnunet_service_cadet_new_LDFLAGS = -lrt + gnunet_service_cadet_LDFLAGS = -lrt endif if HAVE_TESTING - noinst_LTLIBRARIES = libgnunetcadettest.la libgnunetcadettestnew.la $(noinst_LIB_EXP) - noinst_PROGRAMS = gnunet-cadet-profiler + noinst_LTLIBRARIES = libgnunetcadettest.la $(noinst_LIB_EXP) +# noinst_PROGRAMS = gnunet-cadet-profiler endif -libgnunetcadettest_la_SOURCES = \ - cadet_test_lib.c cadet_test_lib.h -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_2_forward \ + 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_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.la \ - libgnunetcadet.la \ - $(top_builddir)/src/testbed/libgnunettestbed.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - -dep_cadet_test_lib = \ - libgnunetcadet.la \ - libgnunetcadettest.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_SOURCES = \ +# gnunet-cadet-profiler.c +#gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib) test_cadet_local_mq_SOURCES = \ test_cadet_local_mq.c test_cadet_local_mq_LDADD = \ - libgnunetcadetnew.la \ + libgnunetcadet.la \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la -libgnunetcadettestnew_la_SOURCES = \ - cadet_test_lib_new.c cadet_test_lib_new.h -libgnunetcadettestnew_la_LIBADD = \ +libgnunetcadettest_la_SOURCES = \ + cadet_test_lib.c cadet_test_lib.h +libgnunetcadettest_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ - libgnunetcadetnew.la + libgnunetcadet.la -ld_cadet_test_lib_new = \ +ld_cadet_test_lib = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - libgnunetcadetnew.la \ - libgnunetcadettestnew.la \ + libgnunetcadet.la \ + libgnunetcadettest.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la -dep_cadet_test_lib_new = \ - libgnunetcadetnew.la \ - libgnunetcadettestnew.la \ +dep_cadet_test_lib = \ + libgnunetcadet.la \ + libgnunetcadettest.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_forward_SOURCES = \ + test_cadet.c +test_cadet_2_forward_LDADD = $(ld_cadet_test_lib) -test_cadet_2_keepalive_new_SOURCES = \ - test_cadet_new.c -test_cadet_2_keepalive_new_LDADD = $(ld_cadet_test_lib_new) +test_cadet_2_signal_SOURCES = \ + test_cadet.c +test_cadet_2_signal_LDADD = $(ld_cadet_test_lib) -test_cadet_2_speed_new_SOURCES = \ - test_cadet_new.c -test_cadet_2_speed_new_LDADD = $(ld_cadet_test_lib_new) +test_cadet_2_keepalive_SOURCES = \ + test_cadet.c +test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib) -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_SOURCES = \ + test_cadet.c +test_cadet_2_speed_LDADD = $(ld_cadet_test_lib) -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_ack_SOURCES = \ + test_cadet.c +test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib) -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_backwards_SOURCES = \ + test_cadet.c +test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib) -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_2_speed_reliable_SOURCES = \ + test_cadet.c +test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib) +test_cadet_2_speed_reliable_backwards_SOURCES = \ + test_cadet.c +test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) -test_cadet_5_forward_new_SOURCES = \ - test_cadet_new.c -test_cadet_5_forward_new_LDADD = $(ld_cadet_test_lib_new) +test_cadet_5_forward_SOURCES = \ + test_cadet.c +test_cadet_5_forward_LDADD = $(ld_cadet_test_lib) -test_cadet_5_signal_new_SOURCES = \ - test_cadet_new.c -test_cadet_5_signal_new_LDADD = $(ld_cadet_test_lib_new) +test_cadet_5_signal_SOURCES = \ + test_cadet.c +test_cadet_5_signal_LDADD = $(ld_cadet_test_lib) -test_cadet_5_keepalive_new_SOURCES = \ - test_cadet_new.c -test_cadet_5_keepalive_new_LDADD = $(ld_cadet_test_lib_new) +test_cadet_5_keepalive_SOURCES = \ + test_cadet.c +test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib) -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_SOURCES = \ + test_cadet.c +test_cadet_5_speed_LDADD = $(ld_cadet_test_lib) -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_ack_SOURCES = \ + test_cadet.c +test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib) -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_backwards_SOURCES = \ + test_cadet.c +test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib) -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_SOURCES = \ + test_cadet.c +test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib) -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) +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