fixing 1584

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 6c850a91d9ed0165cf1c4fbdea1b6b87faca8025..9625af830c718b92823534b6fbdd45e3b6c4f730 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -17,7 +17,6 @@ noinst_LIBRARIES = libgnunetfstest.a
 
 libgnunetfs_la_SOURCES = \
   fs.c fs.h \
-  fs_collection.c \
   fs_directory.c \
   fs_download.c \
   fs_file_information.c \
@@ -115,9 +114,9 @@ gnunet_unindex_LDADD = \
 
 
 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 \
@@ -132,6 +131,7 @@ check_PROGRAMS = \
  test_fs_unindex \
  test_fs_unindex_persistence \
  test_fs_uri \
+ test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p
 
 
@@ -143,9 +143,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 \
@@ -159,15 +160,10 @@ TESTS = $(check_SCRIPTS) \
  test_fs_unindex_persistence \
  test_fs_uri \
  test_fs_test_lib \
- test_gnunet_service_fs_p2p
-# $(check_PROGRAMS)
-
+ test_gnunet_service_fs_migration \
+ test_gnunet_service_fs_p2p \
+ $(check_SCRIPTS)  
 
-test_fs_collection_SOURCES = \
- test_fs_collection.c
-test_fs_collection_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
-  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_fs_directory_SOURCES = \
  test_fs_directory.c
@@ -179,14 +175,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 = \
@@ -205,61 +205,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 = \
@@ -284,6 +275,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
@@ -306,9 +305,9 @@ test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile
 EXTRA_DIST = \
   fs_test_lib_data.conf \
   test_fs_data.conf \
-  test_fs_collection_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 \
@@ -316,6 +315,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 \