plane hacking

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 96dc2e1e5eccbd6d6768e6ab0b04d079b53630f1..542c776f30fa2ace9b22f2244b75d39383a55960 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 \
@@ -97,6 +96,7 @@ gnunet_service_fs_SOURCES =  \
  gnunet-service-fs_indexing.c gnunet-service-fs_indexing.h 
 gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/dht/libgnunetdht.la \
  $(top_builddir)/src/block/libgnunetblock.la \
  $(top_builddir)/src/datastore/libgnunetdatastore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -115,7 +115,6 @@ gnunet_unindex_LDADD = \
 
 
 check_PROGRAMS = \
- test_fs_collection \
  test_fs_directory \
  test_fs_download \
  test_fs_download_indexed \
@@ -124,6 +123,7 @@ check_PROGRAMS = \
  test_fs_getopt \
  test_fs_list_indexed \
  test_fs_namespace \
+ test_fs_namespace_list_updateable \
  test_fs_publish \
  test_fs_publish_persistence \
  test_fs_search \
@@ -145,6 +145,7 @@ check_SCRIPTS = \
  test_gnunet_fs_idx.py
 endif
 
+if !DISABLE_TEST_RUN
 TESTS = \
  test_fs_directory \
  test_fs_download \
@@ -153,6 +154,7 @@ TESTS = \
  test_fs_file_information \
  test_fs_list_indexed \
  test_fs_namespace \
+ test_fs_namespace_list_updateable \
  test_fs_publish \
  test_fs_publish_persistence \
  test_fs_search \
@@ -164,15 +166,9 @@ TESTS = \
  test_fs_test_lib \
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
- $(check_SCRIPTS) 
- $(check_PROGRAMS)
-
+ $(check_SCRIPTS)  
+endif
 
-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
@@ -222,6 +218,12 @@ test_fs_namespace_LDADD = \
   $(top_builddir)/src/fs/libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la  
 
+test_fs_namespace_list_updateable_SOURCES = \
+ test_fs_namespace_list_updateable.c
+test_fs_namespace_list_updateable_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 = \
@@ -314,10 +316,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_data_image.jpg \
+  test_fs_file_information_meta_data_image.jpg \
   fs_test_lib_data.conf \
   test_fs_list_indexed_data.conf \
   test_fs_namespace_data.conf \