fix

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 3d825ff10cabf1b77beacc079cd765094161d997..f287b6b319ff1d8baba9ae86a0d8b5fab7c03dd8 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,18 +118,23 @@ check_PROGRAMS = \
  test_fs_collection \
  test_fs_directory \
  test_fs_download \
+ test_fs_download_persistence \
  test_fs_file_information \
  test_fs_getopt \
  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_p2p
 
+
 if HAVE_PYTHON_PEXPECT
 check_SCRIPTS = \
  test_gnunet_fs_psd.py \
@@ -139,19 +143,24 @@ check_SCRIPTS = \
  test_gnunet_fs_idx.py
 endif
 
-TESTS = $(check_SCRIPTS) \
+TESTS = \
  test_fs_directory \
  test_fs_download \
+ 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_p2p
+ test_gnunet_service_fs_p2p \
+ $(check_SCRIPTS) 
 # $(check_PROGRAMS)
 
 
@@ -174,6 +183,13 @@ test_fs_download_LDADD = \
   $(top_builddir)/src/arm/libgnunetarm.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 = \
  test_fs_file_information.c
 test_fs_file_information_LDADD = \
@@ -207,12 +223,25 @@ test_fs_publish_LDADD = \
   $(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 = \
@@ -227,6 +256,13 @@ test_fs_unindex_LDADD = \
   $(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 = \
  test_fs_uri.c
 test_fs_uri_LDADD = \
@@ -249,6 +285,24 @@ test_gnunet_service_fs_p2p_LDADD = \
   $(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 \
@@ -268,4 +322,9 @@ EXTRA_DIST = \
   test_gnunet_fs_psd_data.conf \
   test_gnunet_fs_rec_data.conf \
   test_gnunet_fs_rec_data.tgz \
-  $(check_SCRIPTS)
+  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)