-fixing main FS build, updating man page of gnunet-pseudonym

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index f0fa73143e92e9ffaf5749cfd41c7270cfda2524..ce70ff751219783c6a7e29445ddcd6456586436b 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 \
@@ -37,6 +39,7 @@ libgnunetfs_la_SOURCES = \
   fs_pseudonym.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 \
@@ -66,9 +69,11 @@ 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 \
@@ -122,6 +127,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 \
@@ -150,6 +156,7 @@ gnunet_helper_fs_publish_DEPENDENCIES = \
 gnunet_pseudonym_SOURCES = \
  gnunet-pseudonym.c
 gnunet_pseudonym_LDADD = \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/fs/libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   -lextractor \
@@ -186,7 +193,8 @@ 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.c gnunet-service-fs_mesh.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 \
@@ -235,6 +243,7 @@ if HAVE_BENCHMARKS
  perf_gnunet_service_fs_p2p_respect 
 endif
 
+if HAVE_TESTING
 check_PROGRAMS = \
  test_plugin_block_fs \
  test_fs_directory \
@@ -262,6 +271,7 @@ check_PROGRAMS = \
  test_gnunet_service_fs_p2p \
  test_gnunet_service_fs_p2p_mesh \
  $(FS_BENCHMARKS)
+endif
 
 test_plugin_block_fs_SOURCES = \
  test_plugin_block_fs.c