doxygen fix

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 0d8da5412c158087cea559aa0fcb20770e2f6cfc..cf6cab8490c74e7b31312718fef80d8573fe4b64 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -9,22 +9,36 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  fs.conf
+
+plugindir = $(libdir)/gnunet
+
 
 lib_LTLIBRARIES = libgnunetfs.la
 
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_fs.la 
+
 noinst_LIBRARIES = libgnunetfstest.a
 
 libgnunetfs_la_SOURCES = \
-  fs.c fs.h \
+  fs_api.c fs_api.h fs.h \
   fs_directory.c \
+  fs_dirmetascan.c \
   fs_download.c \
   fs_file_information.c \
   fs_getopt.c \
   fs_list_indexed.c \
   fs_publish.c \
+  fs_publish_ksk.c \
   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 
@@ -32,12 +46,11 @@ libgnunetfs_la_SOURCES = \
 libgnunetfs_la_LIBADD = \
   $(top_builddir)/src/datastore/libgnunetdatastore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  -lextractor \
-  $(GN_LIBINTL) $(XLIB)
+  $(GN_LIBINTL) $(XLIB) -lunistring -lextractor
 
 libgnunetfs_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-  -version-info 0:0:0
+  -version-info 2:0:0
 
 
 libgnunetfstest_a_SOURCES = \
@@ -50,11 +63,16 @@ bin_PROGRAMS = \
   gnunet-directory \
   gnunet-download \
   gnunet-publish \
+  gnunet-helper-fs-publish \
   gnunet-pseudonym \
   gnunet-search \
   gnunet-service-fs \
+  gnunet-fs \
   gnunet-unindex 
 
+bin_SCRIPTS = \
+  gnunet-download-manager.scm
+
 gnunet_directory_SOURCES = \
  gnunet-directory.c
 gnunet_directory_LDADD = \
@@ -65,6 +83,16 @@ gnunet_directory_LDADD = \
 gnunet_directory_DEPENDENCIES = \
   libgnunetfs.la
 
+gnunet_fs_SOURCES = \
+ gnunet-fs.c
+gnunet_fs_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  -lextractor \
+  $(GN_LIBINTL)
+gnunet_fs_DEPENDENCIES = \
+  libgnunetfs.la
+
 gnunet_download_SOURCES =  \
  gnunet-download.c         
 gnunet_download_LDADD =  \
@@ -84,6 +112,15 @@ gnunet_publish_LDADD =  \
 gnunet_publish_DEPENDENCIES = \
   libgnunetfs.la
 
+gnunet_helper_fs_publish_SOURCES =  \
+ 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 = \
@@ -119,9 +156,10 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/block/libgnunetblock.la \
  $(top_builddir)/src/datastore/libgnunetdatastore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(GN_LIBINTL)
+ $(GN_LIBINTL) -lm
 gnunet_service_fs_DEPENDENCIES = \
   libgnunetfs.la
 
@@ -135,8 +173,26 @@ 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/libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
+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_trust 
+endif
+
 check_PROGRAMS = \
  test_fs_directory \
  test_fs_download \
@@ -150,6 +206,7 @@ check_PROGRAMS = \
  test_fs_publish \
  test_fs_publish_persistence \
  test_fs_search \
+ test_fs_search_probes \
  test_fs_search_persistence \
  test_fs_start_stop \
  test_fs_test_lib \
@@ -158,22 +215,24 @@ check_PROGRAMS = \
  test_fs_uri \
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
- perf_gnunet_service_fs_p2p \
- perf_gnunet_service_fs_p2p_dht \
- perf_gnunet_service_fs_p2p_index \
- perf_gnunet_service_fs_p2p_trust 
+ $(FS_BENCHMARKS)
 
 
 if HAVE_PYTHON_PEXPECT
 check_SCRIPTS = \
  test_gnunet_fs_psd.py \
  test_gnunet_fs_rec.py \
- test_gnunet_fs_idx.py
+ test_gnunet_fs_idx.py \
+ test_gnunet_fs_ns.py 
+endif
+
+if ENABLE_MONKEY
+ TESTS_ENVIRONMENT = @MONKEYPREFIX@
+ AM_LDFLAGS = -no-install
 endif
-# test_gnunet_fs_ns.py 
 
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = \
  test_fs_directory \
  test_fs_download \
@@ -186,6 +245,7 @@ TESTS = \
  test_fs_publish \
  test_fs_publish_persistence \
  test_fs_search \
+ test_fs_search_probes \
  test_fs_search_persistence \
  test_fs_start_stop \
  test_fs_unindex \
@@ -196,9 +256,9 @@ TESTS = \
  test_gnunet_service_fs_p2p \
  perf_gnunet_service_fs_p2p \
  perf_gnunet_service_fs_p2p_index \
+ perf_gnunet_service_fs_p2p_trust \
  $(check_SCRIPTS)  
 endif
-# perf_gnunet_service_fs_p2p_trust \
 
 
 
@@ -276,6 +336,11 @@ test_fs_search_SOURCES = \
 test_fs_search_LDADD = $(top_builddir)/src/fs/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/fs/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/fs/libgnunetfs.la       \
@@ -386,11 +451,11 @@ test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile
 
 
 EXTRA_DIST = \
+  test_fs_defaults.conf \
   fs_test_lib_data.conf \
   test_fs_data.conf \
   test_fs_download_data.conf \
   test_fs_file_information_data.conf \
-  test_fs_file_information_meta_data_image.jpg \
   fs_test_lib_data.conf \
   test_fs_list_indexed_data.conf \
   test_fs_namespace_data.conf \
@@ -407,6 +472,7 @@ EXTRA_DIST = \
   test_gnunet_fs_psd.py.in \
   test_gnunet_fs_rec.py.in \
   test_gnunet_fs_ns.py.in \
-  test_gnunet_fs_idx.py.in
+  test_gnunet_fs_idx.py.in \
+  $(bin_SCRIPTS) 
 
 CLEANFILES = $(check_SCRIPTS)