fix

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 364172ec0d86b745126a348744338b0c1430e257..f5e834d4ee44bd143b2beaf900ee926938797a93 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -94,7 +94,6 @@ gnunet_search_LDADD = \
 
 gnunet_service_fs_SOURCES =  \
  gnunet-service-fs.c \
- gnunet-service-fs_drq.c gnunet-service-fs_drq.h \
  gnunet-service-fs_indexing.c gnunet-service-fs_indexing.h 
 gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/fs/libgnunetfs.la \
@@ -119,6 +118,7 @@ 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 \
@@ -133,6 +133,7 @@ check_PROGRAMS = \
  test_fs_unindex \
  test_fs_unindex_persistence \
  test_fs_uri \
+ test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p
 
 
@@ -144,9 +145,10 @@ check_SCRIPTS = \
  test_gnunet_fs_idx.py
 endif
 
-TESTS = $(check_SCRIPTS) \
+TESTS = \
  test_fs_directory \
  test_fs_download \
+ test_fs_download_indexed \
  test_fs_download_persistence \
  test_fs_file_information \
  test_fs_list_indexed \
@@ -154,11 +156,15 @@ TESTS = $(check_SCRIPTS) \
  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_p2p
+ test_gnunet_service_fs_migration \
+ test_gnunet_service_fs_p2p \
+ $(check_SCRIPTS) 
 # $(check_PROGRAMS)
 
 
@@ -178,14 +184,18 @@ test_fs_download_SOURCES = \
  test_fs_download.c
 test_fs_download_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/arm/libgnunetarm.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/arm/libgnunetarm.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_fs_file_information_SOURCES = \
@@ -204,61 +214,52 @@ test_fs_list_indexed_SOURCES = \
  test_fs_list_indexed.c
 test_fs_list_indexed_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/arm/libgnunetarm.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/arm/libgnunetarm.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/arm/libgnunetarm.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/arm/libgnunetarm.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/arm/libgnunetarm.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/arm/libgnunetarm.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/arm/libgnunetarm.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/arm/libgnunetarm.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/arm/libgnunetarm.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_fs_uri_SOURCES = \
@@ -283,6 +284,14 @@ test_gnunet_service_fs_p2p_LDADD = \
   $(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
@@ -308,6 +317,7 @@ EXTRA_DIST = \
   test_fs_collection_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 \
@@ -315,6 +325,7 @@ EXTRA_DIST = \
   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 \