projects / oweals / gnunet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use heap instead of DLL
[oweals/gnunet.git] / src / fs / Makefile.am
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 419e878d6d44d84da8f624f8637af6d26eed64b4..33260a79408979c1a9ae5fe75ef5d5d1d346ebe4 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,7 +1,8 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+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,9 +23,11 @@ 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
+endif
 
 libgnunetfs_la_SOURCES = \
   fs_api.c fs_api.h fs.h \
@@ -36,23 +39,28 @@ libgnunetfs_la_SOURCES = \
   fs_list_indexed.c \
   fs_publish.c \
   fs_publish_ksk.c \
+  fs_publish_ublock.c fs_publish_ublock.h \
   fs_misc.c \
   fs_namespace.c \
-  fs_namespace_advertise.c \
   fs_search.c \
   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
+  $(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring
+
+if HAVE_LIBEXTRACTOR
+libgnunetfs_la_LIBADD += \
+  -lextractor
+endif
 
 libgnunetfs_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 2:2:0
+  -version-info 3:1:1
 
 
 libgnunetfstest_a_SOURCES = \
@@ -60,21 +68,26 @@ 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 = \
+  gnunet-fs-profiler \
+  gnunet-daemon-fsprofiler
+endif
 
 bin_PROGRAMS = \
   gnunet-auto-share \
   gnunet-directory \
   gnunet-download \
   gnunet-publish \
-  gnunet-pseudonym \
   gnunet-search \
   gnunet-fs \
-  gnunet-unindex 
+  gnunet-unindex
 
 bin_SCRIPTS = \
   gnunet-download-manager.scm
@@ -82,139 +95,152 @@ bin_SCRIPTS = \
 gnunet_directory_SOURCES = \
  gnunet-directory.c
 gnunet_directory_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_directory_LDADD += \
+  -lextractor
+endif
+
+gnunet_fs_profiler_SOURCES = \
+ gnunet-fs-profiler.c
+gnunet_fs_profiler_LDADD = \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  -lextractor \
   $(GN_LIBINTL)
-gnunet_directory_DEPENDENCIES = \
-  libgnunetfs.la
 
 gnunet_fs_SOURCES = \
  gnunet-fs.c
 gnunet_fs_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  -lextractor \
   $(GN_LIBINTL)
-gnunet_fs_DEPENDENCIES = \
-  libgnunetfs.la
+
+if HAVE_LIBEXTRACTOR
+gnunet_fs_LDADD += \
+  -lextractor
+endif
 
 gnunet_download_SOURCES =  \
- gnunet-download.c         
+ gnunet-download.c
 gnunet_download_LDADD =  \
- $(top_builddir)/src/fs/libgnunetfs.la \
+ libgnunetfs.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
-gnunet_download_DEPENDENCIES = \
-  libgnunetfs.la
 
 gnunet_publish_SOURCES =  \
- gnunet-publish.c         
+ gnunet-publish.c
 gnunet_publish_LDADD =  \
- $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/identity/libgnunetidentity.la \
+ libgnunetfs.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- -lextractor \
  $(GN_LIBINTL)
-gnunet_publish_DEPENDENCIES = \
-  libgnunetfs.la
+
+if HAVE_LIBEXTRACTOR
+gnunet_publish_LDADD += \
+  -lextractor
+endif
 
 gnunet_auto_share_SOURCES =  \
- gnunet-auto-share.c         
+ gnunet-auto-share.c
 gnunet_auto_share_LDADD =  \
  $(top_builddir)/src/util/libgnunetutil.la \
- -lextractor \
  $(GN_LIBINTL)
-gnunet_auto_share_DEPENDENCIES = \
-  libgnunetfs.la
+
+if HAVE_LIBEXTRACTOR
+gnunet_auto_share_LDADD += \
+  -lextractor
+endif
 
 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 \
  $(GN_LIBINTL)
-gnunet_helper_fs_publish_DEPENDENCIES = \
-  libgnunetfs.la
 
-gnunet_pseudonym_SOURCES = \
- gnunet-pseudonym.c
-gnunet_pseudonym_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  -lextractor \
-  $(GN_LIBINTL)
-gnunet_pseudonym_DEPENDENCIES = \
-  libgnunetfs.la
+if HAVE_LIBEXTRACTOR
+gnunet_helper_fs_publish_LDADD += \
+  -lextractor
+endif
 
 gnunet_search_SOURCES = \
- gnunet-search.c         
+ gnunet-search.c
 gnunet_search_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_search_LDADD += \
+  -lextractor
+endif
+
+
+gnunet_daemon_fsprofiler_SOURCES =  \
+ gnunet-daemon-fsprofiler.c
+gnunet_daemon_fsprofiler_LDADD = \
+  libgnunetfs.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
- -lextractor \
   $(GN_LIBINTL)
-gnunet_search_DEPENDENCIES = \
-  libgnunetfs.la
 
 gnunet_service_fs_SOURCES =  \
  gnunet-service-fs.c gnunet-service-fs.h \
  gnunet-service-fs_cp.c gnunet-service-fs_cp.h \
  gnunet-service-fs_indexing.c gnunet-service-fs_indexing.h \
- gnunet-service-fs_lc.c gnunet-service-fs_lc.h \
  gnunet-service-fs_pe.c gnunet-service-fs_pe.h \
  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_stream.c gnunet-service-fs_sream.h 
+ 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 \
+ 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/stream/libgnunetstream.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 \
+  libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_unindex_DEPENDENCIES = \
-  libgnunetfs.la
-
 
 libgnunet_plugin_block_fs_la_SOURCES = \
   plugin_block_fs.c
 libgnunet_plugin_block_fs_la_LIBADD = \
+  $(top_builddir)/src/block/libgnunetblockgroup.la \
   $(top_builddir)/src/block/libgnunetblock.la \
+  libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_block_fs_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_fs_la_DEPENDENCIES = \
-  $(top_builddir)/src/block/libgnunetblock.la
-
-
 
 if HAVE_BENCHMARKS
  FS_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
 check_PROGRAMS = \
  test_plugin_block_fs \
  test_fs_directory \
  test_fs_download \
+ test_fs_download_cadet \
  test_fs_download_indexed \
  test_fs_download_persistence \
  test_fs_file_information \
@@ -225,6 +251,7 @@ check_PROGRAMS = \
  test_fs_publish \
  test_fs_publish_persistence \
  test_fs_search \
+ test_fs_search_with_and \
  test_fs_search_probes \
  test_fs_search_persistence \
  test_fs_start_stop \
@@ -234,29 +261,35 @@ check_PROGRAMS = \
  test_fs_uri \
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
+ test_gnunet_service_fs_p2p_cadet \
  $(FS_BENCHMARKS)
+endif
 
 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_ns.py 
+ test_gnunet_fs_idx.py
+
+if HAVE_LIBEXTRACTOR
+check_SCRIPTS += \
+ test_gnunet_fs_psd.py
+endif
 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;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; $(MONKEY)
 TESTS = \
  test_fs_directory \
  test_fs_download \
@@ -269,6 +302,7 @@ TESTS = \
  test_fs_publish \
  test_fs_publish_persistence \
  test_fs_search \
+ test_fs_search_with_and \
  test_fs_search_probes \
  test_fs_search_persistence \
  test_fs_start_stop \
@@ -278,196 +312,229 @@ TESTS = \
  test_fs_test_lib \
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
+ 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
 
 
 test_fs_directory_SOURCES = \
  test_fs_directory.c
 test_fs_directory_LDADD = \
-  -lextractor \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
+
+if HAVE_LIBEXTRACTOR
+test_fs_directory_LDADD += \
+  -lextractor
+endif
+
 
 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  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_download_indexed_SOURCES = \
- test_fs_download_indexed.c
+ 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  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
+
+test_fs_download_cadet_SOURCES = \
+ test_fs_download.c
+test_fs_download_cadet_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la  \
+  libgnunetfs.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  
+  libgnunetfs.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  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
+
+if HAVE_LIBEXTRACTOR
+test_fs_file_information_LDADD += \
+  -lextractor
+endif
+
 
 test_fs_getopt_SOURCES = \
  test_fs_getopt.c
 test_fs_getopt_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetfs.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  
+  libgnunetfs.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  
+  libgnunetfs.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  
+  libgnunetfs.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  
+  libgnunetfs.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  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_search_SOURCES = \
  test_fs_search.c
 test_fs_search_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la        \
+  libgnunetfs.la       \
+  $(top_builddir)/src/util/libgnunetutil.la
+
+test_fs_search_with_and_SOURCES = \
+ test_fs_search_with_and.c
+test_fs_search_with_and_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  libgnunetfs.la       \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_search_probes_SOURCES = \
  test_fs_search_probes.c
 test_fs_search_probes_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la        \
+  libgnunetfs.la       \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_search_persistence_SOURCES = \
  test_fs_search_persistence.c
 test_fs_search_persistence_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la        \
+  libgnunetfs.la       \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_start_stop_SOURCES = \
  test_fs_start_stop.c
 test_fs_start_stop_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetfs.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  
+  libgnunetfs.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  
+  libgnunetfs.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  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_test_lib_SOURCES = \
  test_fs_test_lib.c
 test_fs_test_lib_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_service_fs_p2p_SOURCES = \
  test_gnunet_service_fs_p2p.c
 test_gnunet_service_fs_p2p_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
+
+test_gnunet_service_fs_p2p_cadet_SOURCES = \
+ test_gnunet_service_fs_p2p.c
+test_gnunet_service_fs_p2p_cadet_LDADD = \
+  libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_service_fs_migration_SOURCES = \
  test_gnunet_service_fs_migration.c
 test_gnunet_service_fs_migration_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_SOURCES = \
  perf_gnunet_service_fs_p2p.c
 perf_gnunet_service_fs_p2p_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_index_SOURCES = \
  perf_gnunet_service_fs_p2p.c
 perf_gnunet_service_fs_p2p_index_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_dht_SOURCES = \
  perf_gnunet_service_fs_p2p.c
 perf_gnunet_service_fs_p2p_dht_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_respect_SOURCES = \
  perf_gnunet_service_fs_p2p_respect.c
 perf_gnunet_service_fs_p2p_respect_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
+  libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
@@ -490,29 +557,28 @@ test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile
 
 
 EXTRA_DIST = \
-  test_fs_defaults.conf \
   fs_test_lib_data.conf \
+  perf_gnunet_service_fs_p2p.conf \
   test_fs_data.conf \
+  test_fs_defaults.conf \
   test_fs_download_data.conf \
+  test_fs_download_indexed.conf \
   test_fs_file_information_data.conf \
-  fs_test_lib_data.conf \
   test_fs_list_indexed_data.conf \
   test_fs_namespace_data.conf \
   test_fs_publish_data.conf \
   test_fs_search_data.conf \
   test_fs_unindex_data.conf \
-  test_fs_uri_data.conf \
-  test_gnunet_service_fs_migration_data.conf \
   test_gnunet_fs_idx_data.conf \
-  test_gnunet_fs_ns_data.conf \
   test_gnunet_fs_psd_data.conf \
   test_gnunet_fs_rec_data.conf \
-  perf_gnunet_service_fs_p2p.conf \
   test_gnunet_fs_rec_data.tgz \
   test_gnunet_fs_psd.py.in \
   test_gnunet_fs_rec.py.in \
-  test_gnunet_fs_ns.py.in \
   test_gnunet_fs_idx.py.in \
-  $(bin_SCRIPTS) 
+  test_gnunet_service_fs_migration_data.conf \
+  test_gnunet_service_fs_p2p_cadet.conf \
+  test_pseudonym_data.conf \
+  $(bin_SCRIPTS)
 
 CLEANFILES = $(check_SCRIPTS)
Unnamed repository; edit this file 'description' to name the repository.