summaryrefslogtreecommitdiff
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)
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 = \
gnunet-gns-import.1 \
gnunet-gns-proxy.1 \
gnunet-identity.1 \
- gnunet-mesh.1 \
+ gnunet-cadet.1 \
gnunet-namecache.1 \
gnunet-namestore.1 \
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 = \
gnunetgns.pc \
gnunethello.pc \
gnunetidentity.pc \
- gnunetmesh.pc \
+ gnunetcadet.pc \
gnunetmicrophone.pc \
gnunetmulticast.pc \
gnunetmysql.pc \
@@ -74,7 +74,7 @@ EXTRA_DIST = \
gnunetgns.pc.in \
gnunethello.pc.in \
gnunetidentity.pc.in \
- gnunetmesh.pc.in \
+ gnunetcadet.pc.in \
gnunetmicrophone.pc.in \
gnunetmulticast.pc.in \
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 = \
libgnunetconversation.la \
libgnunetspeaker.la \
libgnunetmicrophone.la \
- $(top_builddir)/src/mesh/libgnunetmesh.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 3d221f0c6..8479e3c4b 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -53,6 +53,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/mesh/libgnunetmesh.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 fcab73820..89fd9b750 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -180,15 +180,15 @@ gnunet_service_fs_SOURCES = \
gnunet-service-fs_pr.c gnunet-service-fs_pr.h \
gnunet-service-fs_push.c gnunet-service-fs_push.h \
gnunet-service-fs_put.c gnunet-service-fs_put.h \
- gnunet-service-fs_mesh_client.c gnunet-service-fs_mesh.h \
- gnunet-service-fs_mesh_server.c
+ gnunet-service-fs_cadet_client.c gnunet-service-fs_cadet.h \
+ gnunet-service-fs_cadet_server.c
gnunet_service_fs_LDADD = \
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/block/libgnunetblock.la \
$(top_builddir)/src/datastore/libgnunetdatastore.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/mesh/libgnunetmesh.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 \
@@ -235,7 +235,7 @@ check_PROGRAMS = \
test_plugin_block_fs \
test_fs_directory \
test_fs_download \
- test_fs_download_mesh \
+ test_fs_download_cadet \
test_fs_download_indexed \
test_fs_download_persistence \
test_fs_file_information \
@@ -255,7 +255,7 @@ check_PROGRAMS = \
test_fs_uri \
test_gnunet_service_fs_migration \
test_gnunet_service_fs_p2p \
- test_gnunet_service_fs_p2p_mesh \
+ test_gnunet_service_fs_p2p_cadet \
$(FS_BENCHMARKS)
endif
@@ -301,7 +301,7 @@ TESTS = \
test_fs_test_lib \
test_gnunet_service_fs_migration \
test_gnunet_service_fs_p2p \
- test_gnunet_service_fs_p2p_mesh \
+ test_gnunet_service_fs_p2p_cadet \
perf_gnunet_service_fs_p2p \
perf_gnunet_service_fs_p2p_index \
perf_gnunet_service_fs_p2p_respect \
@@ -330,9 +330,9 @@ test_fs_download_indexed_LDADD = \
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/util/libgnunetutil.la
-test_fs_download_mesh_SOURCES = \
+test_fs_download_cadet_SOURCES = \
test_fs_download.c
-test_fs_download_mesh_LDADD = \
+test_fs_download_cadet_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/util/libgnunetutil.la
@@ -456,9 +456,9 @@ test_gnunet_service_fs_p2p_LDADD = \
$(top_builddir)/src/fs/libgnunetfs.la \
$(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_service_fs_p2p_mesh_SOURCES = \
+test_gnunet_service_fs_p2p_cadet_SOURCES = \
test_gnunet_service_fs_p2p.c
-test_gnunet_service_fs_p2p_mesh_LDADD = \
+test_gnunet_service_fs_p2p_cadet_LDADD = \
$(top_builddir)/src/fs/libgnunetfstest.a \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/fs/libgnunetfs.la \
@@ -534,7 +534,7 @@ EXTRA_DIST = \
test_fs_data.conf \
test_fs_download_data.conf \
test_fs_download_indexed.conf \
- test_fs_download_mesh.conf \
+ test_fs_download_cadet.conf \
test_fs_file_information_data.conf \
fs_test_lib_data.conf \
test_fs_list_indexed_data.conf \
@@ -544,7 +544,7 @@ EXTRA_DIST = \
test_fs_unindex_data.conf \
test_fs_uri_data.conf \
test_gnunet_service_fs_migration_data.conf \
- test_gnunet_service_fs_p2p_mesh.conf \
+ test_gnunet_service_fs_p2p_cadet.conf \
test_gnunet_fs_idx_data.conf \
test_gnunet_fs_psd_data.conf \
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 = \
gnunet-daemon-pt.c
gnunet_daemon_pt_LDADD = \
$(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/mesh/libgnunetmesh.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/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 = \
gnunet-service-scalarproduct.c
gnunet_service_scalarproduct_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/mesh/libgnunetmesh.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 8d3fe62b9..7dc269446 100644
--- a/src/set/Makefile.am
+++ b/src/set/Makefile.am
@@ -52,7 +52,7 @@ gnunet_service_set_SOURCES = \
gnunet_service_set_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/block/libgnunetblock.la \
$(GN_LIBINTL)
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 = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/tun/libgnunettun.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/cadet/libgnunetcadet.la \
$(top_builddir)/src/regex/libgnunetregex.la \
$(GN_LIBINTL)
gnunet_service_vpn_CFLAGS = \