Do not crash if key is NULL.

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index a6e680448a0f90b7f594a5deb14f35d257378988..ca01856307f08d75faf134f17bb1176288cf004a 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,7 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -22,7 +22,7 @@ plugindir = $(libdir)/gnunet
 lib_LTLIBRARIES = libgnunetfs.la
 
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_fs.la 
+  libgnunet_plugin_block_fs.la
 
 if HAVE_TESTING
 noinst_LIBRARIES = libgnunetfstest.a
@@ -45,16 +45,16 @@ libgnunetfs_la_SOURCES = \
   fs_sharetree.c \
   fs_tree.c fs_tree.h \
   fs_unindex.c \
-  fs_uri.c 
+  fs_uri.c
 
 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 = \
@@ -62,11 +62,11 @@ libgnunetfstest_a_SOURCES = \
 
 libgnunetfstest_a_LIBADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la 
+  $(top_builddir)/src/testbed/libgnunettestbed.la
 
 libexec_PROGRAMS = \
   gnunet-helper-fs-publish \
-  gnunet-service-fs 
+  gnunet-service-fs
 
 if HAVE_TESTING
 noinst_PROGRAMS = \
@@ -81,7 +81,7 @@ bin_PROGRAMS = \
   gnunet-publish \
   gnunet-search \
   gnunet-fs \
-  gnunet-unindex 
+  gnunet-unindex
 
 bin_SCRIPTS = \
   gnunet-download-manager.scm
@@ -114,7 +114,7 @@ gnunet_fs_DEPENDENCIES = \
   libgnunetfs.la
 
 gnunet_download_SOURCES =  \
- gnunet-download.c         
+ gnunet-download.c
 gnunet_download_LDADD =  \
  $(top_builddir)/src/fs/libgnunetfs.la \
  $(top_builddir)/src/util/libgnunetutil.la \
@@ -123,7 +123,7 @@ gnunet_download_DEPENDENCIES = \
   libgnunetfs.la
 
 gnunet_publish_SOURCES =  \
- gnunet-publish.c         
+ gnunet-publish.c
 gnunet_publish_LDADD =  \
  $(top_builddir)/src/identity/libgnunetidentity.la \
  $(top_builddir)/src/fs/libgnunetfs.la \
@@ -134,7 +134,7 @@ gnunet_publish_DEPENDENCIES = \
   libgnunetfs.la
 
 gnunet_auto_share_SOURCES =  \
- gnunet-auto-share.c         
+ gnunet-auto-share.c
 gnunet_auto_share_LDADD =  \
  $(top_builddir)/src/util/libgnunetutil.la \
  -lextractor \
@@ -143,7 +143,7 @@ gnunet_auto_share_DEPENDENCIES = \
   libgnunetfs.la
 
 gnunet_helper_fs_publish_SOURCES =  \
- gnunet-helper-fs-publish.c 
+ gnunet-helper-fs-publish.c
 gnunet_helper_fs_publish_LDADD =  \
  $(top_builddir)/src/util/libgnunetutil.la \
  -lextractor \
@@ -152,7 +152,7 @@ gnunet_helper_fs_publish_DEPENDENCIES = \
   libgnunetfs.la
 
 gnunet_search_SOURCES = \
- gnunet-search.c         
+ gnunet-search.c
 gnunet_search_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -180,24 +180,25 @@ 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 \
+ $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
  $(GN_LIBINTL) -lm
 gnunet_service_fs_DEPENDENCIES = \
   libgnunetfs.la
 
 gnunet_unindex_SOURCES = \
- gnunet-unindex.c         
+ gnunet-unindex.c
 gnunet_unindex_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -227,7 +228,7 @@ if HAVE_BENCHMARKS
  perf_gnunet_service_fs_p2p \
  perf_gnunet_service_fs_p2p_dht \
  perf_gnunet_service_fs_p2p_index \
- perf_gnunet_service_fs_p2p_respect 
+ perf_gnunet_service_fs_p2p_respect
 endif
 
 if HAVE_TESTING
@@ -235,7 +236,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 +256,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
 
@@ -263,22 +264,23 @@ test_plugin_block_fs_SOURCES = \
  test_plugin_block_fs.c
 test_plugin_block_fs_LDADD = \
  $(top_builddir)/src/block/libgnunetblock.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 
 if HAVE_PYTHON
 check_SCRIPTS = \
  test_gnunet_fs_psd.py \
  test_gnunet_fs_rec.py \
- test_gnunet_fs_idx.py 
+ test_gnunet_fs_idx.py
 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,11 +302,11 @@ 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 \
- $(check_SCRIPTS)  
+ $(check_SCRIPTS)
 endif
 
 
@@ -313,83 +315,83 @@ test_fs_directory_SOURCES = \
 test_fs_directory_LDADD = \
   -lextractor \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_download_SOURCES = \
  test_fs_download.c
 test_fs_download_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la  \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_download_indexed_SOURCES = \
  test_fs_download.c
 test_fs_download_indexed_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la  \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.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  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_download_persistence_SOURCES = \
  test_fs_download_persistence.c
 test_fs_download_persistence_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la  \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_file_information_SOURCES = \
  test_fs_file_information.c
 test_fs_file_information_LDADD = \
   -lextractor \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_getopt_SOURCES = \
  test_fs_getopt.c
 test_fs_getopt_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_list_indexed_SOURCES = \
  test_fs_list_indexed.c
 test_fs_list_indexed_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_namespace_SOURCES = \
  test_fs_namespace.c
 test_fs_namespace_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_namespace_list_updateable_SOURCES = \
  test_fs_namespace_list_updateable.c
 test_fs_namespace_list_updateable_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_publish_SOURCES = \
  test_fs_publish.c
 test_fs_publish_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_publish_persistence_SOURCES = \
  test_fs_publish_persistence.c
 test_fs_publish_persistence_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_search_SOURCES = \
  test_fs_search.c
@@ -417,27 +419,27 @@ test_fs_start_stop_SOURCES = \
 test_fs_start_stop_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_unindex_SOURCES = \
  test_fs_unindex.c
 test_fs_unindex_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/fs/libgnunetfs.la \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_unindex_persistence_SOURCES = \
  test_fs_unindex_persistence.c
 test_fs_unindex_persistence_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/fs/libgnunetfs.la \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_uri_SOURCES = \
  test_fs_uri.c
 test_fs_uri_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_test_lib_SOURCES = \
  test_fs_test_lib.c
@@ -445,7 +447,7 @@ test_fs_test_lib_LDADD = \
   $(top_builddir)/src/fs/libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_service_fs_p2p_SOURCES = \
  test_gnunet_service_fs_p2p.c
@@ -453,15 +455,15 @@ test_gnunet_service_fs_p2p_LDADD = \
   $(top_builddir)/src/fs/libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.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  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_service_fs_migration_SOURCES = \
  test_gnunet_service_fs_migration.c
@@ -469,7 +471,7 @@ test_gnunet_service_fs_migration_LDADD = \
   $(top_builddir)/src/fs/libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_SOURCES = \
  perf_gnunet_service_fs_p2p.c
@@ -478,7 +480,7 @@ perf_gnunet_service_fs_p2p_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_index_SOURCES = \
  perf_gnunet_service_fs_p2p.c
@@ -487,7 +489,7 @@ perf_gnunet_service_fs_p2p_index_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_dht_SOURCES = \
  perf_gnunet_service_fs_p2p.c
@@ -496,7 +498,7 @@ perf_gnunet_service_fs_p2p_dht_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_respect_SOURCES = \
  perf_gnunet_service_fs_p2p_respect.c
@@ -505,7 +507,7 @@ perf_gnunet_service_fs_p2p_respect_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/util/libgnunetutil.la
 
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
@@ -533,7 +535,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 +545,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 \
@@ -553,6 +555,6 @@ EXTRA_DIST = \
   test_gnunet_fs_rec.py.in \
   test_gnunet_fs_idx.py.in \
   test_pseudonym_data.conf \
-  $(bin_SCRIPTS) 
+  $(bin_SCRIPTS)
 
 CLEANFILES = $(check_SCRIPTS)