-dead test, gnunet-pseudonym is gone

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 54267c57c6150df7090c71f2aadff67a34295726..07d243ce51cbd2cccc3d12fd484ad7ed7f4500d3 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -24,7 +24,9 @@ lib_LTLIBRARIES = libgnunetfs.la
 plugin_LTLIBRARIES = \
   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,6 +38,7 @@ 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_search.c \
@@ -47,7 +50,7 @@ libgnunetfs_la_SOURCES = \
 libgnunetfs_la_LIBADD = \
   $(top_builddir)/src/datastore/libgnunetdatastore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB) -lunistring -lextractor
+  $(GN_LIBINTL) $(XLIB) -lunistring -lextractor -lgcrypt
 
 libgnunetfs_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -65,16 +68,17 @@ libexec_PROGRAMS = \
   gnunet-helper-fs-publish \
   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 
@@ -121,6 +125,7 @@ gnunet_download_DEPENDENCIES = \
 gnunet_publish_SOURCES =  \
  gnunet-publish.c         
 gnunet_publish_LDADD =  \
+ $(top_builddir)/src/identity/libgnunetidentity.la \
  $(top_builddir)/src/fs/libgnunetfs.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  -lextractor \
@@ -146,16 +151,6 @@ gnunet_helper_fs_publish_LDADD =  \
 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
-
 gnunet_search_SOURCES = \
  gnunet-search.c         
 gnunet_search_LDADD = \
@@ -185,14 +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_stream.c gnunet-service-fs_stream.h 
+ gnunet-service-fs_mesh_client.c gnunet-service-fs_mesh.h \
+ gnunet-service-fs_mesh_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/stream/libgnunetstream.la \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
  $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la \
@@ -214,12 +210,15 @@ libgnunet_plugin_block_fs_la_SOURCES = \
   plugin_block_fs.c
 libgnunet_plugin_block_fs_la_LIBADD = \
   $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/fs/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
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
+  libgnunetfs.la
 
 
 
@@ -231,11 +230,12 @@ if HAVE_BENCHMARKS
  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_stream \
+ test_fs_download_mesh \
  test_fs_download_indexed \
  test_fs_download_persistence \
  test_fs_file_information \
@@ -255,8 +255,9 @@ check_PROGRAMS = \
  test_fs_uri \
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
- test_gnunet_service_fs_p2p_stream \
+ test_gnunet_service_fs_p2p_mesh \
  $(FS_BENCHMARKS)
+endif
 
 test_plugin_block_fs_SOURCES = \
  test_plugin_block_fs.c
@@ -268,8 +269,7 @@ 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 
 endif
 
 if ENABLE_MONKEY
@@ -300,7 +300,7 @@ TESTS = \
  test_fs_test_lib \
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
- test_gnunet_service_fs_p2p_stream \
+ test_gnunet_service_fs_p2p_mesh \
  perf_gnunet_service_fs_p2p \
  perf_gnunet_service_fs_p2p_index \
  perf_gnunet_service_fs_p2p_respect \
@@ -329,9 +329,9 @@ test_fs_download_indexed_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
 
-test_fs_download_stream_SOURCES = \
+test_fs_download_mesh_SOURCES = \
  test_fs_download.c
-test_fs_download_stream_LDADD = \
+test_fs_download_mesh_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la  \
   $(top_builddir)/src/fs/libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
@@ -455,9 +455,9 @@ test_gnunet_service_fs_p2p_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
 
-test_gnunet_service_fs_p2p_stream_SOURCES = \
+test_gnunet_service_fs_p2p_mesh_SOURCES = \
  test_gnunet_service_fs_p2p.c
-test_gnunet_service_fs_p2p_stream_LDADD = \
+test_gnunet_service_fs_p2p_mesh_LDADD = \
   $(top_builddir)/src/fs/libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/fs/libgnunetfs.la  \
@@ -533,7 +533,7 @@ EXTRA_DIST = \
   test_fs_data.conf \
   test_fs_download_data.conf \
   test_fs_download_indexed.conf \
-  test_fs_download_stream.conf \
+  test_fs_download_mesh.conf \
   test_fs_file_information_data.conf \
   fs_test_lib_data.conf \
   test_fs_list_indexed_data.conf \
@@ -543,7 +543,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_stream.conf \
+  test_gnunet_service_fs_p2p_mesh.conf \
   test_gnunet_fs_idx_data.conf \
   test_gnunet_fs_ns_data.conf \
   test_gnunet_fs_psd_data.conf \
@@ -554,6 +554,7 @@ EXTRA_DIST = \
   test_gnunet_fs_rec.py.in \
   test_gnunet_fs_ns.py.in \
   test_gnunet_fs_idx.py.in \
+  test_pseudonym_data.conf \
   $(bin_SCRIPTS) 
 
 CLEANFILES = $(check_SCRIPTS)