diff options
-rw-r--r-- | src/cadet/Makefile.am | 22 | ||||
-rw-r--r-- | src/cadet/cadet_api.c (renamed from src/cadet/cadet_api_new.c) | 0 | ||||
-rw-r--r-- | src/conversation/Makefile.am | 2 | ||||
-rw-r--r-- | src/exit/Makefile.am | 2 | ||||
-rw-r--r-- | src/fs/Makefile.am | 2 | ||||
-rw-r--r-- | src/multicast/Makefile.am | 2 | ||||
-rw-r--r-- | src/pt/Makefile.am | 2 | ||||
-rw-r--r-- | src/rps/Makefile.am | 36 | ||||
-rw-r--r-- | src/scalarproduct/Makefile.am | 8 | ||||
-rw-r--r-- | src/set/Makefile.am | 2 | ||||
-rw-r--r-- | src/vpn/Makefile.am | 2 |
11 files changed, 43 insertions, 37 deletions
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 = \ | |||
29 | gnunet-cadet | 29 | gnunet-cadet |
30 | 30 | ||
31 | lib_LTLIBRARIES = \ | 31 | lib_LTLIBRARIES = \ |
32 | libgnunetcadetnew.la \ | 32 | libgnunetcadet.la \ |
33 | $(EXP_LIB) | 33 | $(EXP_LIB) |
34 | 34 | ||
35 | libgnunetcadetnew_la_SOURCES = \ | 35 | libgnunetcadet_la_SOURCES = \ |
36 | cadet_api_new.c | 36 | cadet_api.c |
37 | libgnunetcadetnew_la_LIBADD = \ | 37 | libgnunetcadet_la_LIBADD = \ |
38 | $(top_builddir)/src/util/libgnunetutil.la \ | 38 | $(top_builddir)/src/util/libgnunetutil.la \ |
39 | $(XLIB) \ | 39 | $(XLIB) \ |
40 | $(LTLIBINTL) | 40 | $(LTLIBINTL) |
41 | libgnunetcadetnew_la_LDFLAGS = \ | 41 | libgnunetcadet_la_LDFLAGS = \ |
42 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 42 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
43 | -version-info 6:0:0 | 43 | -version-info 7:0:0 |
44 | 44 | ||
45 | gnunet_cadet_SOURCES = \ | 45 | gnunet_cadet_SOURCES = \ |
46 | gnunet-cadet.c | 46 | gnunet-cadet.c |
47 | gnunet_cadet_LDADD = \ | 47 | gnunet_cadet_LDADD = \ |
48 | libgnunetcadetnew.la \ | 48 | libgnunetcadet.la \ |
49 | $(top_builddir)/src/util/libgnunetutil.la | 49 | $(top_builddir)/src/util/libgnunetutil.la |
50 | 50 | ||
51 | gnunet_service_cadet_SOURCES = \ | 51 | gnunet_service_cadet_SOURCES = \ |
@@ -109,7 +109,7 @@ endif | |||
109 | test_cadet_local_mq_SOURCES = \ | 109 | test_cadet_local_mq_SOURCES = \ |
110 | test_cadet_local_mq.c | 110 | test_cadet_local_mq.c |
111 | test_cadet_local_mq_LDADD = \ | 111 | test_cadet_local_mq_LDADD = \ |
112 | libgnunetcadetnew.la \ | 112 | libgnunetcadet.la \ |
113 | $(top_builddir)/src/testing/libgnunettesting.la \ | 113 | $(top_builddir)/src/testing/libgnunettesting.la \ |
114 | $(top_builddir)/src/util/libgnunetutil.la | 114 | $(top_builddir)/src/util/libgnunetutil.la |
115 | 115 | ||
@@ -119,17 +119,17 @@ libgnunetcadettest_la_SOURCES = \ | |||
119 | libgnunetcadettest_la_LIBADD = \ | 119 | libgnunetcadettest_la_LIBADD = \ |
120 | $(top_builddir)/src/util/libgnunetutil.la \ | 120 | $(top_builddir)/src/util/libgnunetutil.la \ |
121 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 121 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
122 | libgnunetcadetnew.la | 122 | libgnunetcadet.la |
123 | 123 | ||
124 | ld_cadet_test_lib = \ | 124 | ld_cadet_test_lib = \ |
125 | $(top_builddir)/src/util/libgnunetutil.la \ | 125 | $(top_builddir)/src/util/libgnunetutil.la \ |
126 | $(top_builddir)/src/testing/libgnunettesting.la \ | 126 | $(top_builddir)/src/testing/libgnunettesting.la \ |
127 | libgnunetcadetnew.la \ | 127 | libgnunetcadet.la \ |
128 | libgnunetcadettest.la \ | 128 | libgnunetcadettest.la \ |
129 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 129 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
130 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 130 | $(top_builddir)/src/statistics/libgnunetstatistics.la |
131 | dep_cadet_test_lib = \ | 131 | dep_cadet_test_lib = \ |
132 | libgnunetcadetnew.la \ | 132 | libgnunetcadet.la \ |
133 | libgnunetcadettest.la \ | 133 | libgnunetcadettest.la \ |
134 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 134 | $(top_builddir)/src/statistics/libgnunetstatistics.la |
135 | 135 | ||
diff --git a/src/cadet/cadet_api_new.c b/src/cadet/cadet_api.c index c9f2a11bb..c9f2a11bb 100644 --- a/src/cadet/cadet_api_new.c +++ b/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 = \ | |||
180 | libgnunetconversation.la \ | 180 | libgnunetconversation.la \ |
181 | libgnunetspeaker.la \ | 181 | libgnunetspeaker.la \ |
182 | libgnunetmicrophone.la \ | 182 | libgnunetmicrophone.la \ |
183 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 183 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
184 | $(top_builddir)/src/util/libgnunetutil.la \ | 184 | $(top_builddir)/src/util/libgnunetutil.la \ |
185 | $(INTLLIBS) | 185 | $(INTLLIBS) |
186 | gnunet_service_conversation_LDFLAGS = \ | 186 | 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 = \ | |||
54 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 54 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
55 | $(top_builddir)/src/tun/libgnunettun.la \ | 55 | $(top_builddir)/src/tun/libgnunettun.la \ |
56 | $(top_builddir)/src/util/libgnunetutil.la \ | 56 | $(top_builddir)/src/util/libgnunetutil.la \ |
57 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 57 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
58 | $(top_builddir)/src/regex/libgnunetregex.la \ | 58 | $(top_builddir)/src/regex/libgnunetregex.la \ |
59 | $(GN_LIBINTL) | 59 | $(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 = \ | |||
202 | $(top_builddir)/src/block/libgnunetblock.la \ | 202 | $(top_builddir)/src/block/libgnunetblock.la \ |
203 | $(top_builddir)/src/datastore/libgnunetdatastore.la \ | 203 | $(top_builddir)/src/datastore/libgnunetdatastore.la \ |
204 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 204 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
205 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 205 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
206 | $(top_builddir)/src/ats/libgnunetats.la \ | 206 | $(top_builddir)/src/ats/libgnunetats.la \ |
207 | $(top_builddir)/src/core/libgnunetcore.la \ | 207 | $(top_builddir)/src/core/libgnunetcore.la \ |
208 | $(top_builddir)/src/util/libgnunetutil.la \ | 208 | $(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 = \ | |||
46 | gnunet-service-multicast.c | 46 | gnunet-service-multicast.c |
47 | gnunet_service_multicast_LDADD = \ | 47 | gnunet_service_multicast_LDADD = \ |
48 | $(top_builddir)/src/util/libgnunetutil.la \ | 48 | $(top_builddir)/src/util/libgnunetutil.la \ |
49 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 49 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
50 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 50 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
51 | $(GN_LIBINTL) | 51 | $(GN_LIBINTL) |
52 | 52 | ||
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 = \ | |||
25 | gnunet-daemon-pt.c | 25 | gnunet-daemon-pt.c |
26 | gnunet_daemon_pt_LDADD = \ | 26 | gnunet_daemon_pt_LDADD = \ |
27 | $(top_builddir)/src/vpn/libgnunetvpn.la \ | 27 | $(top_builddir)/src/vpn/libgnunetvpn.la \ |
28 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 28 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
29 | $(top_builddir)/src/dht/libgnunetdht.la \ | 29 | $(top_builddir)/src/dht/libgnunetdht.la \ |
30 | $(top_builddir)/src/dns/libgnunetdns.la \ | 30 | $(top_builddir)/src/dns/libgnunetdns.la \ |
31 | $(top_builddir)/src/dns/libgnunetdnsparser.la \ | 31 | $(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 = \ | |||
60 | libgnunetrps.la \ | 60 | libgnunetrps.la \ |
61 | $(top_builddir)/src/util/libgnunetutil.la \ | 61 | $(top_builddir)/src/util/libgnunetutil.la \ |
62 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 62 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
63 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 63 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
64 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 64 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
65 | $(top_builddir)/src/nse/libgnunetnse.la \ | 65 | $(top_builddir)/src/nse/libgnunetnse.la \ |
66 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 66 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
@@ -100,22 +100,28 @@ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PAT | |||
100 | TESTS = $(check_PROGRAMS) | 100 | TESTS = $(check_PROGRAMS) |
101 | endif | 101 | endif |
102 | 102 | ||
103 | test_service_rps_view_SOURCES = gnunet-service-rps_view.h gnunet-service-rps_view.c \ | 103 | test_service_rps_view_SOURCES = \ |
104 | test_service_rps_view.c | 104 | gnunet-service-rps_view.h gnunet-service-rps_view.c \ |
105 | test_service_rps_view.c | ||
105 | test_service_rps_view_LDADD = $(top_builddir)/src/util/libgnunetutil.la | 106 | test_service_rps_view_LDADD = $(top_builddir)/src/util/libgnunetutil.la |
106 | 107 | ||
107 | test_service_rps_peers_SOURCES = gnunet-service-rps_peers.h gnunet-service-rps_peers.c \ | 108 | test_service_rps_peers_SOURCES = \ |
108 | test_service_rps_peers.c | 109 | gnunet-service-rps_peers.h gnunet-service-rps_peers.c \ |
109 | test_service_rps_peers_LDADD = $(top_builddir)/src/util/libgnunetutil.la \ | 110 | test_service_rps_peers.c |
110 | $(top_builddir)/src/cadet/libgnunetcadetnew.la | 111 | test_service_rps_peers_LDADD = \ |
111 | 112 | $(top_builddir)/src/util/libgnunetutil.la \ | |
112 | test_service_rps_custommap_SOURCES = gnunet-service-rps_custommap.h gnunet-service-rps_custommap.c \ | 113 | $(top_builddir)/src/cadet/libgnunetcadet.la |
113 | test_service_rps_custommap.c | 114 | |
114 | test_service_rps_custommap_LDADD = $(top_builddir)/src/util/libgnunetutil.la | 115 | test_service_rps_custommap_SOURCES = \ |
115 | 116 | gnunet-service-rps_custommap.h gnunet-service-rps_custommap.c \ | |
116 | test_service_rps_sampler_elem_SOURCES = gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \ | 117 | test_service_rps_custommap.c |
117 | rps-test_util.h rps-test_util.c \ | 118 | test_service_rps_custommap_LDADD = \ |
118 | test_service_rps_sampler_elem.c | 119 | $(top_builddir)/src/util/libgnunetutil.la |
120 | |||
121 | test_service_rps_sampler_elem_SOURCES = \ | ||
122 | gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \ | ||
123 | rps-test_util.h rps-test_util.c \ | ||
124 | test_service_rps_sampler_elem.c | ||
119 | test_service_rps_sampler_elem_LDADD = $(top_builddir)/src/util/libgnunetutil.la | 125 | test_service_rps_sampler_elem_LDADD = $(top_builddir)/src/util/libgnunetutil.la |
120 | 126 | ||
121 | test_rps_malicious_1_SOURCES = $(rps_test_src) | 127 | 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 = \ | |||
42 | gnunet-service-scalarproduct_alice.c | 42 | gnunet-service-scalarproduct_alice.c |
43 | gnunet_service_scalarproduct_alice_LDADD = \ | 43 | gnunet_service_scalarproduct_alice_LDADD = \ |
44 | $(top_builddir)/src/util/libgnunetutil.la \ | 44 | $(top_builddir)/src/util/libgnunetutil.la \ |
45 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 45 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
46 | $(top_builddir)/src/set/libgnunetset.la \ | 46 | $(top_builddir)/src/set/libgnunetset.la \ |
47 | $(LIBGCRYPT_LIBS) \ | 47 | $(LIBGCRYPT_LIBS) \ |
48 | -lgcrypt \ | 48 | -lgcrypt \ |
@@ -53,7 +53,7 @@ gnunet_service_scalarproduct_bob_SOURCES = \ | |||
53 | gnunet-service-scalarproduct_bob.c | 53 | gnunet-service-scalarproduct_bob.c |
54 | gnunet_service_scalarproduct_bob_LDADD = \ | 54 | gnunet_service_scalarproduct_bob_LDADD = \ |
55 | $(top_builddir)/src/util/libgnunetutil.la \ | 55 | $(top_builddir)/src/util/libgnunetutil.la \ |
56 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 56 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
57 | $(top_builddir)/src/set/libgnunetset.la \ | 57 | $(top_builddir)/src/set/libgnunetset.la \ |
58 | $(LIBGCRYPT_LIBS) \ | 58 | $(LIBGCRYPT_LIBS) \ |
59 | -lgcrypt \ | 59 | -lgcrypt \ |
@@ -64,7 +64,7 @@ gnunet_service_scalarproduct_ecc_alice_SOURCES = \ | |||
64 | gnunet-service-scalarproduct-ecc_alice.c | 64 | gnunet-service-scalarproduct-ecc_alice.c |
65 | gnunet_service_scalarproduct_ecc_alice_LDADD = \ | 65 | gnunet_service_scalarproduct_ecc_alice_LDADD = \ |
66 | $(top_builddir)/src/util/libgnunetutil.la \ | 66 | $(top_builddir)/src/util/libgnunetutil.la \ |
67 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 67 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
68 | $(top_builddir)/src/set/libgnunetset.la \ | 68 | $(top_builddir)/src/set/libgnunetset.la \ |
69 | $(LIBGCRYPT_LIBS) \ | 69 | $(LIBGCRYPT_LIBS) \ |
70 | -lgcrypt \ | 70 | -lgcrypt \ |
@@ -75,7 +75,7 @@ gnunet_service_scalarproduct_ecc_bob_SOURCES = \ | |||
75 | gnunet-service-scalarproduct-ecc_bob.c | 75 | gnunet-service-scalarproduct-ecc_bob.c |
76 | gnunet_service_scalarproduct_ecc_bob_LDADD = \ | 76 | gnunet_service_scalarproduct_ecc_bob_LDADD = \ |
77 | $(top_builddir)/src/util/libgnunetutil.la \ | 77 | $(top_builddir)/src/util/libgnunetutil.la \ |
78 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 78 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
79 | $(top_builddir)/src/set/libgnunetset.la \ | 79 | $(top_builddir)/src/set/libgnunetset.la \ |
80 | $(LIBGCRYPT_LIBS) \ | 80 | $(LIBGCRYPT_LIBS) \ |
81 | -lgcrypt \ | 81 | -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 = \ | |||
60 | $(top_builddir)/src/util/libgnunetutil.la \ | 60 | $(top_builddir)/src/util/libgnunetutil.la \ |
61 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 61 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
62 | $(top_builddir)/src/core/libgnunetcore.la \ | 62 | $(top_builddir)/src/core/libgnunetcore.la \ |
63 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 63 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
64 | $(top_builddir)/src/block/libgnunetblock.la \ | 64 | $(top_builddir)/src/block/libgnunetblock.la \ |
65 | libgnunetset.la \ | 65 | libgnunetset.la \ |
66 | $(GN_LIBINTL) | 66 | $(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 = \ | |||
59 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 59 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
60 | $(top_builddir)/src/tun/libgnunettun.la \ | 60 | $(top_builddir)/src/tun/libgnunettun.la \ |
61 | $(top_builddir)/src/util/libgnunetutil.la \ | 61 | $(top_builddir)/src/util/libgnunetutil.la \ |
62 | $(top_builddir)/src/cadet/libgnunetcadetnew.la \ | 62 | $(top_builddir)/src/cadet/libgnunetcadet.la \ |
63 | $(top_builddir)/src/regex/libgnunetregex.la \ | 63 | $(top_builddir)/src/regex/libgnunetregex.la \ |
64 | $(GN_LIBINTL) | 64 | $(GN_LIBINTL) |
65 | gnunet_service_vpn_CFLAGS = \ | 65 | gnunet_service_vpn_CFLAGS = \ |