aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2014-05-07 12:07:41 +0000
committerBart Polot <bart@net.in.tum.de>2014-05-07 12:07:41 +0000
commit25a2bc263a11834ca7c9f82e9f8cca7d2a12dccc (patch)
tree8ef862b884a4061acc45020a5396f1859ef8a057
parent7c7abeb99c0f2f1b2dea83d892b63896b883b336 (diff)
downloadgnunet-25a2bc263a11834ca7c9f82e9f8cca7d2a12dccc.tar.gz
gnunet-25a2bc263a11834ca7c9f82e9f8cca7d2a12dccc.zip
Update all am files
-rw-r--r--doc/man/Makefile.am2
-rw-r--r--pkgconfig/Makefile.am4
-rw-r--r--src/conversation/Makefile.am2
-rw-r--r--src/exit/Makefile.am2
-rw-r--r--src/fs/Makefile.am24
-rw-r--r--src/pt/Makefile.am2
-rw-r--r--src/scalarproduct/Makefile.am2
-rw-r--r--src/set/Makefile.am2
-rw-r--r--src/vpn/Makefile.am2
9 files changed, 21 insertions, 21 deletions
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 7417b3fb5..6bc86cebf 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -18,7 +18,7 @@ man_MANS = \
18 gnunet-gns-import.1 \ 18 gnunet-gns-import.1 \
19 gnunet-gns-proxy.1 \ 19 gnunet-gns-proxy.1 \
20 gnunet-identity.1 \ 20 gnunet-identity.1 \
21 gnunet-mesh.1 \ 21 gnunet-cadet.1 \
22 gnunet-namecache.1 \ 22 gnunet-namecache.1 \
23 gnunet-namestore.1 \ 23 gnunet-namestore.1 \
24 gnunet-namestore-fcfsd.1 \ 24 gnunet-namestore-fcfsd.1 \
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 068b0bbe1..ac40906cd 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -18,7 +18,7 @@ pcfiles = \
18 gnunetgns.pc \ 18 gnunetgns.pc \
19 gnunethello.pc \ 19 gnunethello.pc \
20 gnunetidentity.pc \ 20 gnunetidentity.pc \
21 gnunetmesh.pc \ 21 gnunetcadet.pc \
22 gnunetmicrophone.pc \ 22 gnunetmicrophone.pc \
23 gnunetmulticast.pc \ 23 gnunetmulticast.pc \
24 gnunetmysql.pc \ 24 gnunetmysql.pc \
@@ -74,7 +74,7 @@ EXTRA_DIST = \
74 gnunetgns.pc.in \ 74 gnunetgns.pc.in \
75 gnunethello.pc.in \ 75 gnunethello.pc.in \
76 gnunetidentity.pc.in \ 76 gnunetidentity.pc.in \
77 gnunetmesh.pc.in \ 77 gnunetcadet.pc.in \
78 gnunetmicrophone.pc.in \ 78 gnunetmicrophone.pc.in \
79 gnunetmulticast.pc.in \ 79 gnunetmulticast.pc.in \
80 gnunetmysql.pc.in \ 80 gnunetmysql.pc.in \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 25c31c8e6..d5219cae9 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -147,7 +147,7 @@ gnunet_service_conversation_LDADD = \
147 libgnunetconversation.la \ 147 libgnunetconversation.la \
148 libgnunetspeaker.la \ 148 libgnunetspeaker.la \
149 libgnunetmicrophone.la \ 149 libgnunetmicrophone.la \
150 $(top_builddir)/src/mesh/libgnunetmesh.la \ 150 $(top_builddir)/src/cadet/libgnunetcadet.la \
151 $(top_builddir)/src/util/libgnunetutil.la \ 151 $(top_builddir)/src/util/libgnunetutil.la \
152 $(INTLLIBS) 152 $(INTLLIBS)
153gnunet_service_conversation_LDFLAGS = \ 153gnunet_service_conversation_LDFLAGS = \
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am
index 3d221f0c6..8479e3c4b 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -53,6 +53,6 @@ gnunet_daemon_exit_LDADD = \
53 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 53 $(top_builddir)/src/statistics/libgnunetstatistics.la \
54 $(top_builddir)/src/tun/libgnunettun.la \ 54 $(top_builddir)/src/tun/libgnunettun.la \
55 $(top_builddir)/src/util/libgnunetutil.la \ 55 $(top_builddir)/src/util/libgnunetutil.la \
56 $(top_builddir)/src/mesh/libgnunetmesh.la \ 56 $(top_builddir)/src/cadet/libgnunetcadet.la \
57 $(top_builddir)/src/regex/libgnunetregex.la \ 57 $(top_builddir)/src/regex/libgnunetregex.la \
58 $(GN_LIBINTL) 58 $(GN_LIBINTL)
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index fcab73820..89fd9b750 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -180,15 +180,15 @@ gnunet_service_fs_SOURCES = \
180 gnunet-service-fs_pr.c gnunet-service-fs_pr.h \ 180 gnunet-service-fs_pr.c gnunet-service-fs_pr.h \
181 gnunet-service-fs_push.c gnunet-service-fs_push.h \ 181 gnunet-service-fs_push.c gnunet-service-fs_push.h \
182 gnunet-service-fs_put.c gnunet-service-fs_put.h \ 182 gnunet-service-fs_put.c gnunet-service-fs_put.h \
183 gnunet-service-fs_mesh_client.c gnunet-service-fs_mesh.h \ 183 gnunet-service-fs_cadet_client.c gnunet-service-fs_cadet.h \
184 gnunet-service-fs_mesh_server.c 184 gnunet-service-fs_cadet_server.c
185gnunet_service_fs_LDADD = \ 185gnunet_service_fs_LDADD = \
186 $(top_builddir)/src/fs/libgnunetfs.la \ 186 $(top_builddir)/src/fs/libgnunetfs.la \
187 $(top_builddir)/src/dht/libgnunetdht.la \ 187 $(top_builddir)/src/dht/libgnunetdht.la \
188 $(top_builddir)/src/block/libgnunetblock.la \ 188 $(top_builddir)/src/block/libgnunetblock.la \
189 $(top_builddir)/src/datastore/libgnunetdatastore.la \ 189 $(top_builddir)/src/datastore/libgnunetdatastore.la \
190 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 190 $(top_builddir)/src/statistics/libgnunetstatistics.la \
191 $(top_builddir)/src/mesh/libgnunetmesh.la \ 191 $(top_builddir)/src/cadet/libgnunetcadet.la \
192 $(top_builddir)/src/ats/libgnunetats.la \ 192 $(top_builddir)/src/ats/libgnunetats.la \
193 $(top_builddir)/src/core/libgnunetcore.la \ 193 $(top_builddir)/src/core/libgnunetcore.la \
194 $(top_builddir)/src/util/libgnunetutil.la \ 194 $(top_builddir)/src/util/libgnunetutil.la \
@@ -235,7 +235,7 @@ check_PROGRAMS = \
235 test_plugin_block_fs \ 235 test_plugin_block_fs \
236 test_fs_directory \ 236 test_fs_directory \
237 test_fs_download \ 237 test_fs_download \
238 test_fs_download_mesh \ 238 test_fs_download_cadet \
239 test_fs_download_indexed \ 239 test_fs_download_indexed \
240 test_fs_download_persistence \ 240 test_fs_download_persistence \
241 test_fs_file_information \ 241 test_fs_file_information \
@@ -255,7 +255,7 @@ check_PROGRAMS = \
255 test_fs_uri \ 255 test_fs_uri \
256 test_gnunet_service_fs_migration \ 256 test_gnunet_service_fs_migration \
257 test_gnunet_service_fs_p2p \ 257 test_gnunet_service_fs_p2p \
258 test_gnunet_service_fs_p2p_mesh \ 258 test_gnunet_service_fs_p2p_cadet \
259 $(FS_BENCHMARKS) 259 $(FS_BENCHMARKS)
260endif 260endif
261 261
@@ -301,7 +301,7 @@ TESTS = \
301 test_fs_test_lib \ 301 test_fs_test_lib \
302 test_gnunet_service_fs_migration \ 302 test_gnunet_service_fs_migration \
303 test_gnunet_service_fs_p2p \ 303 test_gnunet_service_fs_p2p \
304 test_gnunet_service_fs_p2p_mesh \ 304 test_gnunet_service_fs_p2p_cadet \
305 perf_gnunet_service_fs_p2p \ 305 perf_gnunet_service_fs_p2p \
306 perf_gnunet_service_fs_p2p_index \ 306 perf_gnunet_service_fs_p2p_index \
307 perf_gnunet_service_fs_p2p_respect \ 307 perf_gnunet_service_fs_p2p_respect \
@@ -330,9 +330,9 @@ test_fs_download_indexed_LDADD = \
330 $(top_builddir)/src/fs/libgnunetfs.la \ 330 $(top_builddir)/src/fs/libgnunetfs.la \
331 $(top_builddir)/src/util/libgnunetutil.la 331 $(top_builddir)/src/util/libgnunetutil.la
332 332
333test_fs_download_mesh_SOURCES = \ 333test_fs_download_cadet_SOURCES = \
334 test_fs_download.c 334 test_fs_download.c
335test_fs_download_mesh_LDADD = \ 335test_fs_download_cadet_LDADD = \
336 $(top_builddir)/src/testing/libgnunettesting.la \ 336 $(top_builddir)/src/testing/libgnunettesting.la \
337 $(top_builddir)/src/fs/libgnunetfs.la \ 337 $(top_builddir)/src/fs/libgnunetfs.la \
338 $(top_builddir)/src/util/libgnunetutil.la 338 $(top_builddir)/src/util/libgnunetutil.la
@@ -456,9 +456,9 @@ test_gnunet_service_fs_p2p_LDADD = \
456 $(top_builddir)/src/fs/libgnunetfs.la \ 456 $(top_builddir)/src/fs/libgnunetfs.la \
457 $(top_builddir)/src/util/libgnunetutil.la 457 $(top_builddir)/src/util/libgnunetutil.la
458 458
459test_gnunet_service_fs_p2p_mesh_SOURCES = \ 459test_gnunet_service_fs_p2p_cadet_SOURCES = \
460 test_gnunet_service_fs_p2p.c 460 test_gnunet_service_fs_p2p.c
461test_gnunet_service_fs_p2p_mesh_LDADD = \ 461test_gnunet_service_fs_p2p_cadet_LDADD = \
462 $(top_builddir)/src/fs/libgnunetfstest.a \ 462 $(top_builddir)/src/fs/libgnunetfstest.a \
463 $(top_builddir)/src/testbed/libgnunettestbed.la \ 463 $(top_builddir)/src/testbed/libgnunettestbed.la \
464 $(top_builddir)/src/fs/libgnunetfs.la \ 464 $(top_builddir)/src/fs/libgnunetfs.la \
@@ -534,7 +534,7 @@ EXTRA_DIST = \
534 test_fs_data.conf \ 534 test_fs_data.conf \
535 test_fs_download_data.conf \ 535 test_fs_download_data.conf \
536 test_fs_download_indexed.conf \ 536 test_fs_download_indexed.conf \
537 test_fs_download_mesh.conf \ 537 test_fs_download_cadet.conf \
538 test_fs_file_information_data.conf \ 538 test_fs_file_information_data.conf \
539 fs_test_lib_data.conf \ 539 fs_test_lib_data.conf \
540 test_fs_list_indexed_data.conf \ 540 test_fs_list_indexed_data.conf \
@@ -544,7 +544,7 @@ EXTRA_DIST = \
544 test_fs_unindex_data.conf \ 544 test_fs_unindex_data.conf \
545 test_fs_uri_data.conf \ 545 test_fs_uri_data.conf \
546 test_gnunet_service_fs_migration_data.conf \ 546 test_gnunet_service_fs_migration_data.conf \
547 test_gnunet_service_fs_p2p_mesh.conf \ 547 test_gnunet_service_fs_p2p_cadet.conf \
548 test_gnunet_fs_idx_data.conf \ 548 test_gnunet_fs_idx_data.conf \
549 test_gnunet_fs_psd_data.conf \ 549 test_gnunet_fs_psd_data.conf \
550 test_gnunet_fs_rec_data.conf \ 550 test_gnunet_fs_rec_data.conf \
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 2f821288a..650fabf09 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -24,7 +24,7 @@ gnunet_daemon_pt_SOURCES = \
24 gnunet-daemon-pt.c 24 gnunet-daemon-pt.c
25gnunet_daemon_pt_LDADD = \ 25gnunet_daemon_pt_LDADD = \
26 $(top_builddir)/src/vpn/libgnunetvpn.la \ 26 $(top_builddir)/src/vpn/libgnunetvpn.la \
27 $(top_builddir)/src/mesh/libgnunetmesh.la \ 27 $(top_builddir)/src/cadet/libgnunetcadet.la \
28 $(top_builddir)/src/dht/libgnunetdht.la \ 28 $(top_builddir)/src/dht/libgnunetdht.la \
29 $(top_builddir)/src/dns/libgnunetdns.la \ 29 $(top_builddir)/src/dns/libgnunetdns.la \
30 $(top_builddir)/src/dns/libgnunetdnsparser.la \ 30 $(top_builddir)/src/dns/libgnunetdnsparser.la \
diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 81ee9c4fc..a92e684f4 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -39,7 +39,7 @@ gnunet_service_scalarproduct_SOURCES = \
39 gnunet-service-scalarproduct.c 39 gnunet-service-scalarproduct.c
40gnunet_service_scalarproduct_LDADD = \ 40gnunet_service_scalarproduct_LDADD = \
41 $(top_builddir)/src/util/libgnunetutil.la \ 41 $(top_builddir)/src/util/libgnunetutil.la \
42 $(top_builddir)/src/mesh/libgnunetmesh.la \ 42 $(top_builddir)/src/cadet/libgnunetcadet.la \
43 $(top_builddir)/src/set/libgnunetset.la \ 43 $(top_builddir)/src/set/libgnunetset.la \
44 $(LIBGCRYPT_LIBS) \ 44 $(LIBGCRYPT_LIBS) \
45 -lgcrypt \ 45 -lgcrypt \
diff --git a/src/set/Makefile.am b/src/set/Makefile.am
index 8d3fe62b9..7dc269446 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -52,7 +52,7 @@ gnunet_service_set_SOURCES = \
52gnunet_service_set_LDADD = \ 52gnunet_service_set_LDADD = \
53 $(top_builddir)/src/util/libgnunetutil.la \ 53 $(top_builddir)/src/util/libgnunetutil.la \
54 $(top_builddir)/src/core/libgnunetcore.la \ 54 $(top_builddir)/src/core/libgnunetcore.la \
55 $(top_builddir)/src/mesh/libgnunetmesh.la \ 55 $(top_builddir)/src/cadet/libgnunetcadet.la \
56 $(top_builddir)/src/block/libgnunetblock.la \ 56 $(top_builddir)/src/block/libgnunetblock.la \
57 $(GN_LIBINTL) 57 $(GN_LIBINTL)
58 58
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index e22c0e2c3..cfc0456c7 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -58,7 +58,7 @@ gnunet_service_vpn_LDADD = \
58 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 58 $(top_builddir)/src/statistics/libgnunetstatistics.la \
59 $(top_builddir)/src/tun/libgnunettun.la \ 59 $(top_builddir)/src/tun/libgnunettun.la \
60 $(top_builddir)/src/util/libgnunetutil.la \ 60 $(top_builddir)/src/util/libgnunetutil.la \
61 $(top_builddir)/src/mesh/libgnunetmesh.la \ 61 $(top_builddir)/src/cadet/libgnunetcadet.la \
62 $(top_builddir)/src/regex/libgnunetregex.la \ 62 $(top_builddir)/src/regex/libgnunetregex.la \
63 $(GN_LIBINTL) 63 $(GN_LIBINTL)
64gnunet_service_vpn_CFLAGS = \ 64gnunet_service_vpn_CFLAGS = \