fixing parallel build, getting rid of useless _DEPENDENCIES declarations

1 files changed, 46 insertions, 90 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index b7c581788..1dd6065f0 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -89,13 +89,10 @@ bin_SCRIPTS = \
 gnunet_directory_SOURCES = \
  gnunet-directory.c
 gnunet_directory_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   -lextractor \
   $(GN_LIBINTL)
-gnunet_directory_DEPENDENCIES = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_fs_profiler_SOURCES = \
  gnunet-fs-profiler.c
@@ -103,41 +100,30 @@ gnunet_fs_profiler_LDADD = \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_fs_profiler_DEPENDENCIES = \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_fs_SOURCES = \
  gnunet-fs.c
 gnunet_fs_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   -lextractor \
   $(GN_LIBINTL)
-gnunet_fs_DEPENDENCIES = \
-  libgnunetfs.la
 
 gnunet_download_SOURCES =  \
  gnunet-download.c
 gnunet_download_LDADD =  \
- $(top_builddir)/src/fs/libgnunetfs.la \
+ libgnunetfs.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
-gnunet_download_DEPENDENCIES = \
- $(top_builddir)/src/fs/libgnunetfs.la \
- $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_publish_SOURCES =  \
  gnunet-publish.c
 gnunet_publish_LDADD =  \
  $(top_builddir)/src/identity/libgnunetidentity.la \
- $(top_builddir)/src/fs/libgnunetfs.la \
+ libgnunetfs.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  -lextractor \
  $(GN_LIBINTL)
-gnunet_publish_DEPENDENCIES = \
- $(top_builddir)/src/fs/libgnunetfs.la \
- $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_auto_share_SOURCES =  \
  gnunet-auto-share.c
@@ -145,8 +131,6 @@ gnunet_auto_share_LDADD =  \
  $(top_builddir)/src/util/libgnunetutil.la \
  -lextractor \
  $(GN_LIBINTL)
-gnunet_auto_share_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_helper_fs_publish_SOURCES =  \
  gnunet-helper-fs-publish.c
@@ -154,32 +138,22 @@ gnunet_helper_fs_publish_LDADD =  \
  $(top_builddir)/src/util/libgnunetutil.la \
  -lextractor \
  $(GN_LIBINTL)
-gnunet_helper_fs_publish_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_search_SOURCES = \
  gnunet-search.c
 gnunet_search_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
  -lextractor \
   $(GN_LIBINTL)
-gnunet_search_DEPENDENCIES = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
-
 
 gnunet_daemon_fsprofiler_SOURCES =  \
  gnunet-daemon-fsprofiler.c
 gnunet_daemon_fsprofiler_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_daemon_fsprofiler_DEPENDENCIES = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_service_fs_SOURCES =  \
  gnunet-service-fs.c gnunet-service-fs.h \
@@ -193,7 +167,7 @@ gnunet_service_fs_SOURCES =  \
  gnunet-service-fs_cadet_client.c gnunet-service-fs_cadet.h \
  gnunet-service-fs_cadet_server.c
 gnunet_service_fs_LDADD =  \
- $(top_builddir)/src/fs/libgnunetfs.la \
+ libgnunetfs.la \
  $(top_builddir)/src/dht/libgnunetdht.la \
  $(top_builddir)/src/block/libgnunetblock.la \
  $(top_builddir)/src/datastore/libgnunetdatastore.la \
@@ -204,41 +178,23 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
  $(GN_LIBINTL) -lm
-gnunet_service_fs_DEPENDENCIES = \
- $(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 \
- $(top_builddir)/src/cadet/libgnunetcadet.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/peerstore/libgnunetpeerstore.la 
 
 gnunet_unindex_SOURCES = \
  gnunet-unindex.c
 gnunet_unindex_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_unindex_DEPENDENCIES = \
-  $(top_builddir)/src/fs/libgnunetfs.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 libgnunet_plugin_block_fs_la_SOURCES = \
   plugin_block_fs.c
 libgnunet_plugin_block_fs_la_LIBADD = \
   $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_block_fs_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_fs_la_DEPENDENCIES = \
-  $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/fs/libgnunetfs.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 if HAVE_BENCHMARKS
  FS_BENCHMARKS = \
@@ -333,206 +289,206 @@ test_fs_directory_SOURCES = \
  test_fs_directory.c
 test_fs_directory_LDADD = \
   -lextractor \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_download_SOURCES = \
  test_fs_download.c
 test_fs_download_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la  \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_download_indexed_SOURCES = \
  test_fs_download.c
 test_fs_download_indexed_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la  \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_download_cadet_SOURCES = \
  test_fs_download.c
 test_fs_download_cadet_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la  \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  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/testing/libgnunettesting.la  \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_file_information_SOURCES = \
  test_fs_file_information.c
 test_fs_file_information_LDADD = \
   -lextractor \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_getopt_SOURCES = \
  test_fs_getopt.c
 test_fs_getopt_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_list_indexed_SOURCES = \
  test_fs_list_indexed.c
 test_fs_list_indexed_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_namespace_SOURCES = \
  test_fs_namespace.c
 test_fs_namespace_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  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/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_publish_SOURCES = \
  test_fs_publish.c
 test_fs_publish_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.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/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_search_SOURCES = \
  test_fs_search.c
 test_fs_search_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la        \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_search_with_and_SOURCES = \
  test_fs_search_with_and.c
 test_fs_search_with_and_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la        \
   $(top_builddir)/src/util/libgnunetutil.la  
-  
+
 test_fs_search_probes_SOURCES = \
  test_fs_search_probes.c
 test_fs_search_probes_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.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/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.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/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_unindex_SOURCES = \
  test_fs_unindex.c
 test_fs_unindex_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.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/testing/libgnunettesting.la \
-  $(top_builddir)/src/fs/libgnunetfs.la \
+  libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_uri_SOURCES = \
  test_fs_uri.c
 test_fs_uri_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_fs_test_lib_SOURCES = \
  test_fs_test_lib.c
 test_fs_test_lib_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_service_fs_p2p_SOURCES = \
  test_gnunet_service_fs_p2p.c
 test_gnunet_service_fs_p2p_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_service_fs_p2p_cadet_SOURCES = \
  test_gnunet_service_fs_p2p.c
 test_gnunet_service_fs_p2p_cadet_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  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 \
+  libgnunetfstest.a \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_SOURCES = \
  perf_gnunet_service_fs_p2p.c
 perf_gnunet_service_fs_p2p_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_index_SOURCES = \
  perf_gnunet_service_fs_p2p.c
 perf_gnunet_service_fs_p2p_index_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_dht_SOURCES = \
  perf_gnunet_service_fs_p2p.c
 perf_gnunet_service_fs_p2p_dht_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
 perf_gnunet_service_fs_p2p_respect_SOURCES = \
  perf_gnunet_service_fs_p2p_respect.c
 perf_gnunet_service_fs_p2p_respect_LDADD = \
-  $(top_builddir)/src/fs/libgnunetfstest.a \
+  libgnunetfstest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/fs/libgnunetfs.la  \
+  libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la