tolerate additional IPv4 address now available for gnunet.org

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

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 736339aabfabca6cdc2172b4076780b7877af897..80316dc2e0a5307658a18e8d48e210bcde32f8a8 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -89,9 +89,6 @@ bin_PROGRAMS = \
   gnunet-fs \
   gnunet-unindex
 
-bin_SCRIPTS = \
-  gnunet-download-manager.scm
-
 gnunet_directory_SOURCES = \
  gnunet-directory.c
 gnunet_directory_LDADD = \
@@ -190,7 +187,6 @@ gnunet_service_fs_SOURCES =  \
  gnunet-service-fs.c gnunet-service-fs.h \
  gnunet-service-fs_cp.c gnunet-service-fs_cp.h \
  gnunet-service-fs_indexing.c gnunet-service-fs_indexing.h \
- gnunet-service-fs_lc.c gnunet-service-fs_lc.h \
  gnunet-service-fs_pe.c gnunet-service-fs_pe.h \
  gnunet-service-fs_pr.c gnunet-service-fs_pr.h \
  gnunet-service-fs_push.c gnunet-service-fs_push.h \
@@ -220,6 +216,7 @@ gnunet_unindex_LDADD = \
 libgnunet_plugin_block_fs_la_SOURCES = \
   plugin_block_fs.c
 libgnunet_plugin_block_fs_la_LIBADD = \
+  $(top_builddir)/src/block/libgnunetblockgroup.la \
   $(top_builddir)/src/block/libgnunetblock.la \
   libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -282,14 +279,9 @@ check_SCRIPTS += \
 endif
 endif
 
-if ENABLE_MONKEY
- MONKEY = @MONKEYPREFIX@
- AM_LDFLAGS = -no-install
-endif
-
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; $(MONKEY)
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; $(MONKEY)
 TESTS = \
  test_fs_directory \
  test_fs_download \
@@ -578,7 +570,6 @@ EXTRA_DIST = \
   test_gnunet_fs_idx.py.in \
   test_gnunet_service_fs_migration_data.conf \
   test_gnunet_service_fs_p2p_cadet.conf \
-  test_pseudonym_data.conf \
-  $(bin_SCRIPTS)
+  test_pseudonym_data.conf
 
 CLEANFILES = $(check_SCRIPTS)