trying to do something about #3540

6 files changed, 79 insertions, 46 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 533cddec7..d7a321522 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -45,12 +45,12 @@ gnunet_ats_solver_eval_SOURCES = \
  gnunet-service-ats_normalization.c
 gnunet_ats_solver_eval_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- libgnunetats.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(LTLIBINTL)
 gnunet_ats_solver_eval_DEPENDENCIES = \
  $(top_builddir)/src/util/libgnunetutil.la \
- libgnunetats.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 libgnunetats_la_SOURCES = \
@@ -66,12 +66,12 @@ libgnunetats_la_LDFLAGS = \
 libgnunet_plugin_ats_proportional_la_SOURCES = \
   plugin_ats_proportional.c
 libgnunet_plugin_ats_proportional_la_LIBADD = \
-  libgnunetats.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \
-  libgnunetats.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_ats_proportional_la_LDFLAGS = \
@@ -82,13 +82,13 @@ if HAVE_LIBGLPK
 libgnunet_plugin_ats_mlp_la_SOURCES = \
   plugin_ats_mlp.c
 libgnunet_plugin_ats_mlp_la_LIBADD = \
-  libgnunetats.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_ats_mlp_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS) $(GN_LIBGLPK)
 libgnunet_plugin_ats_mlp_la_DEPENDENCIES = \
-  libgnunetats.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la
 endif
@@ -96,14 +96,14 @@ endif
 libgnunet_plugin_ats_ril_la_SOURCES = \
   plugin_ats_ril.c
 libgnunet_plugin_ats_ril_la_LIBADD = \
-  libgnunetats.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_ats_ril_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_ats_ril_la_DEPENDENCIES = \
-  libgnunetats.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -120,10 +120,12 @@ gnunet_service_ats_SOURCES = \
 gnunet_service_ats_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetats.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(GN_LIBINTL)
 gnunet_service_ats_DEPENDENCIES = \
-  libgnunetats.la
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats/libgnunetats.la 
 
 if HAVE_TESTING
 TESTING_TESTS = \
diff --git a/src/block/Makefile.am b/src/block/Makefile.am
index bc077d3d9..b5863f1fa 100644
--- a/src/block/Makefile.am
+++ b/src/block/Makefile.am
@@ -26,7 +26,8 @@ libgnunet_plugin_block_template_la_LIBADD = \
 libgnunet_plugin_block_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_template_la_DEPENDENCIES = \
-  libgnunetblock.la
+  $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 libgnunet_plugin_block_test_la_SOURCES = \
   plugin_block_test.c
@@ -37,7 +38,8 @@ libgnunet_plugin_block_test_la_LIBADD = \
 libgnunet_plugin_block_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_test_la_DEPENDENCIES = \
-  libgnunetblock.la                                           
+  $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 
 libgnunetblock_la_SOURCES = \
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 7e70be471..b7c581788 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -94,7 +94,8 @@ gnunet_directory_LDADD = \
   -lextractor \
   $(GN_LIBINTL)
 gnunet_directory_DEPENDENCIES = \
-  libgnunetfs.la
+  $(top_builddir)/src/fs/libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_fs_profiler_SOURCES = \
  gnunet-fs-profiler.c
@@ -102,6 +103,9 @@ 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
@@ -120,7 +124,8 @@ gnunet_download_LDADD =  \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
 gnunet_download_DEPENDENCIES = \
-  libgnunetfs.la
+ $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_publish_SOURCES =  \
  gnunet-publish.c
@@ -131,7 +136,8 @@ gnunet_publish_LDADD =  \
  -lextractor \
  $(GN_LIBINTL)
 gnunet_publish_DEPENDENCIES = \
-  libgnunetfs.la
+ $(top_builddir)/src/fs/libgnunetfs.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_auto_share_SOURCES =  \
  gnunet-auto-share.c
@@ -140,7 +146,7 @@ gnunet_auto_share_LDADD =  \
  -lextractor \
  $(GN_LIBINTL)
 gnunet_auto_share_DEPENDENCIES = \
-  libgnunetfs.la
+ $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_helper_fs_publish_SOURCES =  \
  gnunet-helper-fs-publish.c
@@ -149,7 +155,7 @@ gnunet_helper_fs_publish_LDADD =  \
  -lextractor \
  $(GN_LIBINTL)
 gnunet_helper_fs_publish_DEPENDENCIES = \
-  libgnunetfs.la
+ $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_search_SOURCES = \
  gnunet-search.c
@@ -159,7 +165,9 @@ gnunet_search_LDADD = \
  -lextractor \
   $(GN_LIBINTL)
 gnunet_search_DEPENDENCIES = \
-  libgnunetfs.la
+  $(top_builddir)/src/fs/libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
+
 
 gnunet_daemon_fsprofiler_SOURCES =  \
  gnunet-daemon-fsprofiler.c
@@ -169,7 +177,9 @@ gnunet_daemon_fsprofiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 gnunet_daemon_fsprofiler_DEPENDENCIES = \
-  libgnunetfs.la
+  $(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 \
@@ -195,7 +205,16 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
  $(GN_LIBINTL) -lm
 gnunet_service_fs_DEPENDENCIES = \
-  libgnunetfs.la
+ $(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
@@ -204,8 +223,8 @@ gnunet_unindex_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 gnunet_unindex_DEPENDENCIES = \
-  libgnunetfs.la
-
+  $(top_builddir)/src/fs/libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 libgnunet_plugin_block_fs_la_SOURCES = \
   plugin_block_fs.c
@@ -217,11 +236,9 @@ libgnunet_plugin_block_fs_la_LIBADD = \
 libgnunet_plugin_block_fs_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_fs_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/block/libgnunetblock.la \
-  libgnunetfs.la
-
-
+  $(top_builddir)/src/fs/libgnunetfs.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 if HAVE_BENCHMARKS
  FS_BENCHMARKS = \
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am
index 4f2c073fa..16015e39f 100644
--- a/src/namecache/Makefile.am
+++ b/src/namecache/Makefile.am
@@ -79,13 +79,12 @@ gnunet_namecache_SOURCES = \
 gnunet_namecache_LDADD = \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamecache.la \
+  $(top_builddir)/src/namecache/libgnunetnamecache.la \
   $(GN_LIBINTL)
 gnunet_namecache_DEPENDENCIES = \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamecache.la
-
+  $(top_builddir)/src/namecache/libgnunetnamecache.la 
 
 gnunet_service_namecache_SOURCES = \
  gnunet-service-namecache.c
@@ -94,12 +93,12 @@ gnunet_service_namecache_LDADD = \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamecache.la \
+  $(top_builddir)/src/namecache/libgnunetnamecache.la \
   $(GN_LIBINTL)
 gnunet_service_namecache_DEPENDENCIES = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamecache.la
+  $(top_builddir)/src/namecache/libgnunetnamecache.la 
 
 
 plugin_LTLIBRARIES = \
@@ -118,7 +117,7 @@ libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \
 libgnunet_plugin_namecache_sqlite_la_DEPENDENCIES = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamecache.la
+  $(top_builddir)/src/namecache/libgnunetnamecache.la 
 
 
 libgnunet_plugin_namecache_postgres_la_SOURCES = \
@@ -135,7 +134,7 @@ libgnunet_plugin_namecache_postgres_la_DEPENDENCIES = \
   $(top_builddir)/src/postgres/libgnunetpostgres.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamecache.la
+  $(top_builddir)/src/namecache/libgnunetnamecache.la 
 
 test_namecache_api_cache_block_SOURCES = \
  test_namecache_api_cache_block.c
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 775b0d95d..428dccda2 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -83,7 +83,9 @@ libgnunet_plugin_block_regex_la_LIBADD = \
 libgnunet_plugin_block_regex_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_regex_la_DEPENDENCIES = \
- libgnunetregexblock.la
+ $(top_builddir)/src/regex/libgnunetregexblock.la \
+ $(top_builddir)/src/block/libgnunetblock.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 if HAVE_MYSQL
 noinst_mysql_progs = \
@@ -95,9 +97,12 @@ gnunet_regex_simulation_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/regex/libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/mysql/libgnunetmysql.la
+  $(top_builddir)/src/mysql/libgnunetmysql.la 
 gnunet_regex_simulation_profiler_DEPENDENCIES = \
-  libgnunetregex_internal.a
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/mysql/libgnunetmysql.la 
 endif
 
 libgnunetregextest_a_SOURCES = \
@@ -108,6 +113,7 @@ libgnunetregextest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/regex/libgnunetregex_internal.a
 libgnunetregextest_a_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetregex_internal.a
 
 if HAVE_TESTING
@@ -125,8 +131,11 @@ perf_regex_LDADD = -lm \
   $(top_builddir)/src/regex/libgnunetregextest.a \
   $(top_builddir)/src/util/libgnunetutil.la 
 perf_regex_DEPENDENCIES = \
-  libgnunetregex_internal.a \
-  libgnunetregextest.a
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_regex_profiler_SOURCES = \
   gnunet-regex-profiler.c
@@ -141,10 +150,13 @@ gnunet_regex_profiler_LDADD = -lm \
   $(top_builddir)/src/util/libgnunetutil.la 
 gnunet_regex_profiler_DEPENDENCIES = \
   $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetregex_internal.a \
-  libgnunetregextest.a
-
+  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_daemon_regexprofiler_SOURCES = \
   gnunet-daemon-regexprofiler.c
@@ -156,11 +168,12 @@ gnunet_daemon_regexprofiler_LDADD = -lm \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 gnunet_daemon_regexprofiler_DEPENDENCIES = \
+  $(top_builddir)/src/regex/libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  libgnunetregextest.a \
-  libgnunetregex_internal.a
-
-
+  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  $(top_builddir)/src/regex/libgnunetregextest.a \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la 
 
 check_PROGRAMS = \
   test_regex_eval_api \
diff --git a/src/util/service.c b/src/util/service.c
index a6165b8d5..4e3c232f9 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -460,7 +460,7 @@ process_acl6 (struct GNUNET_STRINGS_IPv6NetworkPolicy **ret, struct GNUNET_SERVI
  * @param saddrs array to update
  * @param saddrlens where to store the address length
  * @param unixpath path to add
- * @param abstract GNUNET_YES to add an abstract UNIX domain socket.  This
+ * @param abstract #GNUNET_YES to add an abstract UNIX domain socket.  This
  *          parameter is ignore on systems other than LINUX
  */
 static void