- update fs

[oweals/gnunet.git] / src / fs / Makefile.am

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index c892bb47e6740632ebcfcb4c39fbb592dec46f86..89fd9b75013bb36c8ec73d6ac11c04452059817d 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -50,11 +50,11 @@ libgnunetfs_la_SOURCES = \
 libgnunetfs_la_LIBADD = \
   $(top_builddir)/src/datastore/libgnunetdatastore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB) -lunistring -lextractor -lgcrypt
+  $(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring -lextractor
 
 libgnunetfs_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 3:0:1
+  -version-info 3:1:1
 
 
 libgnunetfstest_a_SOURCES = \
@@ -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
 
@@ -273,12 +273,13 @@ check_SCRIPTS = \
 endif
 
 if ENABLE_MONKEY
- TESTS_ENVIRONMENT = @MONKEYPREFIX@
+ MONKEY = @MONKEYPREFIX@
  AM_LDFLAGS = -no-install
 endif
 
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; $(MONKEY)
 TESTS = \
  test_fs_directory \
  test_fs_download \
@@ -300,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 \
@@ -329,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
@@ -455,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  \
@@ -533,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 \
@@ -543,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 \