fixing common off-by-one error with respect to maximum message size

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 9fca261cbfcf789eefa0f16ce6f1f2a288b118a6..f5e834d4ee44bd143b2beaf900ee926938797a93 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,3 +1,4 @@
+
 INCLUDES = -I$(top_srcdir)/src/include
 
 if MINGW
@@ -12,18 +13,27 @@ endif
 
 lib_LTLIBRARIES = libgnunetfs.la
 
+noinst_LIBRARIES = libgnunetfstest.a
+
 libgnunetfs_la_SOURCES = \
-  fs.c \
+  fs.c fs.h \
   fs_collection.c \
   fs_directory.c \
+  fs_download.c \
   fs_file_information.c \
   fs_getopt.c \
+  fs_list_indexed.c \
   fs_publish.c \
   fs_namespace.c \
+  fs_search.c \
+  fs_tree.c fs_tree.h \
+  fs_unindex.c \
   fs_uri.c 
 
 libgnunetfs_la_LIBADD = \
+  $(top_builddir)/src/datastore/libgnunetdatastore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
+  -lextractor \
   $(GN_LIBINTL) $(XLIB)
 
 libgnunetfs_la_LDFLAGS = \
@@ -31,29 +41,132 @@ libgnunetfs_la_LDFLAGS = \
   -version-info 0:0:0
 
 
-#bin_PROGRAMS =  
-# gnunet-directory 
-# gnunet-download 
-# gnunet-pseudonym 
-# gnunet-publish 
-# gnunet-search
-# gnunet-unindex 
+libgnunetfstest_a_SOURCES = \
+  fs_test_lib.c fs_test_lib.h
+
+libgnunetfstest_a_LIBADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la 
+
+bin_PROGRAMS = \
+  gnunet-directory \
+  gnunet-download \
+  gnunet-publish \
+  gnunet-pseudonym \
+  gnunet-search \
+  gnunet-service-fs \
+  gnunet-unindex 
+
+gnunet_directory_SOURCES = \
+ gnunet-directory.c
+gnunet_directory_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+gnunet_download_SOURCES =  \
+ gnunet-download.c         
+gnunet_download_LDADD =  \
+ $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+gnunet_publish_SOURCES =  \
+ gnunet-publish.c         
+gnunet_publish_LDADD =  \
+ $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+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_search_SOURCES = \
+ gnunet-search.c         
+gnunet_search_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+gnunet_service_fs_SOURCES =  \
+ gnunet-service-fs.c \
+ gnunet-service-fs_indexing.c gnunet-service-fs_indexing.h 
+gnunet_service_fs_LDADD =  \
+ $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/block/libgnunetblock.la \
+ $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+gnunet_unindex_SOURCES = \
+ gnunet-unindex.c         
+gnunet_unindex_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
 
-#gnunet_directory_SOURCES = 
-# gnunet-directory.c         
-#gnunet_directory_LDADD = 
-#  $(top_builddir)/src/fs/libgnunetfs.la 
-#  $(top_builddir)/src/util/libgnunetutil.la 
-#  $(GN_LIBINTL)
 
 
 check_PROGRAMS = \
  test_fs_collection \
  test_fs_directory \
+ test_fs_download \
+ test_fs_download_indexed \
+ test_fs_download_persistence \
+ test_fs_file_information \
  test_fs_getopt \
- test_fs_uri
+ test_fs_list_indexed \
+ test_fs_namespace \
+ test_fs_publish \
+ test_fs_publish_persistence \
+ test_fs_search \
+ test_fs_search_persistence \
+ test_fs_start_stop \
+ test_fs_test_lib \
+ test_fs_unindex \
+ test_fs_unindex_persistence \
+ test_fs_uri \
+ test_gnunet_service_fs_migration \
+ test_gnunet_service_fs_p2p
+
+
+if HAVE_PYTHON_PEXPECT
+check_SCRIPTS = \
+ test_gnunet_fs_psd.py \
+ test_gnunet_fs_rec.py \
+ test_gnunet_fs_ns.py \
+ test_gnunet_fs_idx.py
+endif
+
+TESTS = \
+ test_fs_directory \
+ test_fs_download \
+ test_fs_download_indexed \
+ test_fs_download_persistence \
+ test_fs_file_information \
+ test_fs_list_indexed \
+ test_fs_namespace \
+ test_fs_publish \
+ test_fs_publish_persistence \
+ test_fs_search \
+ test_fs_search_persistence \
+ test_fs_start_stop \
+ test_fs_unindex \
+ test_fs_unindex_persistence \
+ test_fs_uri \
+ test_fs_test_lib \
+ test_gnunet_service_fs_migration \
+ test_gnunet_service_fs_p2p \
+ $(check_SCRIPTS) 
+# $(check_PROGRAMS)
 
-TESTS = $(check_PROGRAMS)
 
 test_fs_collection_SOURCES = \
  test_fs_collection.c
@@ -67,18 +180,160 @@ test_fs_directory_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
 
+test_fs_download_SOURCES = \
+ test_fs_download.c
+test_fs_download_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
+test_fs_download_indexed_SOURCES = \
+ test_fs_download_indexed.c
+test_fs_download_indexed_LDADD = \
+  $(top_builddir)/src/fs/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/fs/libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
+test_fs_file_information_SOURCES = \
+ test_fs_file_information.c
+test_fs_file_information_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.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  
 
+test_fs_list_indexed_SOURCES = \
+ test_fs_list_indexed.c
+test_fs_list_indexed_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
+test_fs_namespace_SOURCES = \
+ test_fs_namespace.c
+test_fs_namespace_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
+test_fs_publish_SOURCES = \
+ test_fs_publish.c
+test_fs_publish_LDADD = \
+  $(top_builddir)/src/fs/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/fs/libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
+test_fs_search_SOURCES = \
+ test_fs_search.c
+test_fs_search_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       \
+  $(top_builddir)/src/util/libgnunetutil.la
+
+test_fs_start_stop_SOURCES = \
+ test_fs_start_stop.c
+test_fs_start_stop_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
+test_fs_unindex_SOURCES = \
+ test_fs_unindex.c
+test_fs_unindex_LDADD = \
+  $(top_builddir)/src/fs/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/fs/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  
 
+test_fs_test_lib_SOURCES = \
+ test_fs_test_lib.c
+test_fs_test_lib_LDADD = \
+  $(top_builddir)/src/fs/libgnunetfstest.a \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/fs/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 \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/fs/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 \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/fs/libgnunetfs.la  \
+  $(top_builddir)/src/util/libgnunetutil.la  
+
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+test_gnunet_fs_psd.py: test_gnunet_fs_psd.py.in Makefile
+       $(do_subst) < $(srcdir)/test_gnunet_fs_psd.py.in > test_gnunet_fs_psd.py
+       chmod +x test_gnunet_fs_psd.py
+
+test_gnunet_fs_rec.py: test_gnunet_fs_rec.py.in Makefile
+       $(do_subst) < $(srcdir)/test_gnunet_fs_rec.py.in > test_gnunet_fs_rec.py
+       chmod +x test_gnunet_fs_rec.py
+
+test_gnunet_fs_ns.py: test_gnunet_fs_ns.py.in Makefile
+       $(do_subst) < $(srcdir)/test_gnunet_fs_ns.py.in > test_gnunet_fs_ns.py
+       chmod +x test_gnunet_fs_ns.py
+
+test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile
+       $(do_subst) < $(srcdir)/test_gnunet_fs_idx.py.in > test_gnunet_fs_idx.py
+       chmod +x test_gnunet_fs_idx.py
+
+
 EXTRA_DIST = \
+  fs_test_lib_data.conf \
+  test_fs_data.conf \
   test_fs_collection_data.conf \
-  test_fs_uri_data.conf
+  test_fs_download_data.conf \
+  test_fs_file_information_data.conf \
+  test_fs_file_information_data_image.jpg \
+  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 \
+  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
+
+CLEANFILES = $(check_SCRIPTS)