From 91abbcffa03d4f87d4c899ec396c9213e9dc6e18 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 13 Mar 2017 01:36:59 +0100 Subject: [PATCH] rename libgnunetcadetnew -> libgnunetcadet --- src/cadet/Makefile.am | 22 ++++++------- src/cadet/{cadet_api_new.c => cadet_api.c} | 0 src/conversation/Makefile.am | 2 +- src/exit/Makefile.am | 2 +- src/fs/Makefile.am | 2 +- src/multicast/Makefile.am | 2 +- src/pt/Makefile.am | 2 +- src/rps/Makefile.am | 36 +++++++++++++--------- src/scalarproduct/Makefile.am | 8 ++--- src/set/Makefile.am | 2 +- src/vpn/Makefile.am | 2 +- 11 files changed, 43 insertions(+), 37 deletions(-) rename src/cadet/{cadet_api_new.c => cadet_api.c} (100%) diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am index c30804e13..af1a6720c 100644 --- a/src/cadet/Makefile.am +++ b/src/cadet/Makefile.am @@ -29,23 +29,23 @@ bin_PROGRAMS = \ gnunet-cadet lib_LTLIBRARIES = \ - libgnunetcadetnew.la \ + libgnunetcadet.la \ $(EXP_LIB) -libgnunetcadetnew_la_SOURCES = \ - cadet_api_new.c -libgnunetcadetnew_la_LIBADD = \ +libgnunetcadet_la_SOURCES = \ + cadet_api.c +libgnunetcadet_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(XLIB) \ $(LTLIBINTL) -libgnunetcadetnew_la_LDFLAGS = \ +libgnunetcadet_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_SOURCES = \ @@ -109,7 +109,7 @@ endif 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 @@ -119,17 +119,17 @@ libgnunetcadettest_la_SOURCES = \ libgnunetcadettest_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ - libgnunetcadetnew.la + libgnunetcadet.la ld_cadet_test_lib = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la \ - libgnunetcadetnew.la \ + libgnunetcadet.la \ libgnunetcadettest.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la dep_cadet_test_lib = \ - libgnunetcadetnew.la \ + libgnunetcadet.la \ libgnunetcadettest.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la diff --git a/src/cadet/cadet_api_new.c b/src/cadet/cadet_api.c similarity index 100% rename from src/cadet/cadet_api_new.c rename to src/cadet/cadet_api.c diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am index 83313e7f8..cc2938144 100644 --- a/src/conversation/Makefile.am +++ b/src/conversation/Makefile.am @@ -180,7 +180,7 @@ gnunet_service_conversation_LDADD = \ libgnunetconversation.la \ libgnunetspeaker.la \ libgnunetmicrophone.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(INTLLIBS) gnunet_service_conversation_LDFLAGS = \ diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am index 271b4ebd7..aa1210269 100644 --- a/src/exit/Makefile.am +++ b/src/exit/Makefile.am @@ -54,6 +54,6 @@ gnunet_daemon_exit_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/tun/libgnunettun.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/regex/libgnunetregex.la \ $(GN_LIBINTL) diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 4374d45ea..33260a794 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -202,7 +202,7 @@ gnunet_service_fs_LDADD = \ $(top_builddir)/src/block/libgnunetblock.la \ $(top_builddir)/src/datastore/libgnunetdatastore.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/util/libgnunetutil.la \ diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am index 7aae13dd1..1a61abb09 100644 --- a/src/multicast/Makefile.am +++ b/src/multicast/Makefile.am @@ -46,7 +46,7 @@ gnunet_service_multicast_SOURCES = \ gnunet-service-multicast.c gnunet_service_multicast_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(GN_LIBINTL) diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index 7ea8257d5..e36630ae4 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am @@ -25,7 +25,7 @@ gnunet_daemon_pt_SOURCES = \ gnunet-daemon-pt.c gnunet_daemon_pt_LDADD = \ $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/dht/libgnunetdht.la \ $(top_builddir)/src/dns/libgnunetdns.la \ $(top_builddir)/src/dns/libgnunetdnsparser.la \ diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am index d557e2ffd..e6c8cd929 100644 --- a/src/rps/Makefile.am +++ b/src/rps/Makefile.am @@ -60,7 +60,7 @@ gnunet_service_rps_LDADD = \ libgnunetrps.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ $(top_builddir)/src/nse/libgnunetnse.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ @@ -100,22 +100,28 @@ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PAT TESTS = $(check_PROGRAMS) endif -test_service_rps_view_SOURCES = gnunet-service-rps_view.h gnunet-service-rps_view.c \ - test_service_rps_view.c +test_service_rps_view_SOURCES = \ + gnunet-service-rps_view.h gnunet-service-rps_view.c \ + test_service_rps_view.c test_service_rps_view_LDADD = $(top_builddir)/src/util/libgnunetutil.la -test_service_rps_peers_SOURCES = gnunet-service-rps_peers.h gnunet-service-rps_peers.c \ - test_service_rps_peers.c -test_service_rps_peers_LDADD = $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la - -test_service_rps_custommap_SOURCES = gnunet-service-rps_custommap.h gnunet-service-rps_custommap.c \ - test_service_rps_custommap.c -test_service_rps_custommap_LDADD = $(top_builddir)/src/util/libgnunetutil.la - -test_service_rps_sampler_elem_SOURCES = gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \ - rps-test_util.h rps-test_util.c \ - test_service_rps_sampler_elem.c +test_service_rps_peers_SOURCES = \ + gnunet-service-rps_peers.h gnunet-service-rps_peers.c \ + test_service_rps_peers.c +test_service_rps_peers_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la + +test_service_rps_custommap_SOURCES = \ + gnunet-service-rps_custommap.h gnunet-service-rps_custommap.c \ + test_service_rps_custommap.c +test_service_rps_custommap_LDADD = \ + $(top_builddir)/src/util/libgnunetutil.la + +test_service_rps_sampler_elem_SOURCES = \ + gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \ + rps-test_util.h rps-test_util.c \ + test_service_rps_sampler_elem.c test_service_rps_sampler_elem_LDADD = $(top_builddir)/src/util/libgnunetutil.la test_rps_malicious_1_SOURCES = $(rps_test_src) diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am index 98829408a..10e04284f 100644 --- a/src/scalarproduct/Makefile.am +++ b/src/scalarproduct/Makefile.am @@ -42,7 +42,7 @@ gnunet_service_scalarproduct_alice_SOURCES = \ gnunet-service-scalarproduct_alice.c gnunet_service_scalarproduct_alice_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/set/libgnunetset.la \ $(LIBGCRYPT_LIBS) \ -lgcrypt \ @@ -53,7 +53,7 @@ gnunet_service_scalarproduct_bob_SOURCES = \ gnunet-service-scalarproduct_bob.c gnunet_service_scalarproduct_bob_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/set/libgnunetset.la \ $(LIBGCRYPT_LIBS) \ -lgcrypt \ @@ -64,7 +64,7 @@ gnunet_service_scalarproduct_ecc_alice_SOURCES = \ gnunet-service-scalarproduct-ecc_alice.c gnunet_service_scalarproduct_ecc_alice_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/set/libgnunetset.la \ $(LIBGCRYPT_LIBS) \ -lgcrypt \ @@ -75,7 +75,7 @@ gnunet_service_scalarproduct_ecc_bob_SOURCES = \ gnunet-service-scalarproduct-ecc_bob.c gnunet_service_scalarproduct_ecc_bob_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/set/libgnunetset.la \ $(LIBGCRYPT_LIBS) \ -lgcrypt \ diff --git a/src/set/Makefile.am b/src/set/Makefile.am index 03c258352..14667d0ef 100644 --- a/src/set/Makefile.am +++ b/src/set/Makefile.am @@ -60,7 +60,7 @@ gnunet_service_set_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/block/libgnunetblock.la \ libgnunetset.la \ $(GN_LIBINTL) diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 417d2eb89..5c16fa349 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am @@ -59,7 +59,7 @@ gnunet_service_vpn_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/tun/libgnunettun.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/cadet/libgnunetcadetnew.la \ + $(top_builddir)/src/cadet/libgnunetcadet.la \ $(top_builddir)/src/regex/libgnunetregex.la \ $(GN_LIBINTL) gnunet_service_vpn_CFLAGS = \ -- 2.25.1