gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r34291 - in gnunet/src: arm ats block cadet consensus core


From: gnunet
Subject: [GNUnet-SVN] r34291 - in gnunet/src: arm ats block cadet consensus core datacache datastore dht dns dv env fragmentation fs gns gnsrecord hello identity multicast namecache namestore nat nse peerinfo peerstore psyc psycstore regex revocation scalarproduct secretsharing sensor set social statistics testbed testing transport tun util vpn
Date: Sat, 13 Sep 2014 15:54:57 +0200

Author: grothoff
Date: 2014-09-13 15:54:57 +0200 (Sat, 13 Sep 2014)
New Revision: 34291

Modified:
   gnunet/src/arm/Makefile.am
   gnunet/src/ats/Makefile.am
   gnunet/src/block/Makefile.am
   gnunet/src/cadet/Makefile.am
   gnunet/src/consensus/Makefile.am
   gnunet/src/core/Makefile.am
   gnunet/src/datacache/Makefile.am
   gnunet/src/datastore/Makefile.am
   gnunet/src/dht/Makefile.am
   gnunet/src/dns/Makefile.am
   gnunet/src/dv/Makefile.am
   gnunet/src/env/Makefile.am
   gnunet/src/fragmentation/Makefile.am
   gnunet/src/fs/Makefile.am
   gnunet/src/gns/Makefile.am
   gnunet/src/gnsrecord/Makefile.am
   gnunet/src/hello/Makefile.am
   gnunet/src/identity/Makefile.am
   gnunet/src/multicast/Makefile.am
   gnunet/src/namecache/Makefile.am
   gnunet/src/namestore/Makefile.am
   gnunet/src/nat/Makefile.am
   gnunet/src/nse/Makefile.am
   gnunet/src/peerinfo/Makefile.am
   gnunet/src/peerstore/Makefile.am
   gnunet/src/psyc/Makefile.am
   gnunet/src/psycstore/Makefile.am
   gnunet/src/regex/Makefile.am
   gnunet/src/revocation/Makefile.am
   gnunet/src/scalarproduct/Makefile.am
   gnunet/src/secretsharing/Makefile.am
   gnunet/src/sensor/Makefile.am
   gnunet/src/set/Makefile.am
   gnunet/src/social/Makefile.am
   gnunet/src/statistics/Makefile.am
   gnunet/src/testbed/Makefile.am
   gnunet/src/testing/Makefile.am
   gnunet/src/transport/Makefile.am
   gnunet/src/tun/Makefile.am
   gnunet/src/util/Makefile.am
   gnunet/src/vpn/Makefile.am
Log:
fixing parallel build, getting rid of useless _DEPENDENCIES declarations

Modified: gnunet/src/arm/Makefile.am
===================================================================
--- gnunet/src/arm/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/arm/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -40,21 +40,16 @@
 gnunet_arm_SOURCES = \
  gnunet-arm.c         
 gnunet_arm_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_arm_DEPENDENCIES = \
-  libgnunetarm.la                        
 
 gnunet_service_arm_SOURCES = \
  gnunet-service-arm.c 
 gnunet_service_arm_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_arm_DEPENDENCIES = \
-  libgnunetarm.la                        
 
-
 mockup_service_SOURCES = \
   mockup-service.c
  mockup_service_LDADD = \
@@ -79,19 +74,19 @@
 test_arm_api_SOURCES = \
  test_arm_api.c
 test_arm_api_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_exponential_backoff_SOURCES = \
  test_exponential_backoff.c
 test_exponential_backoff_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_service_arm_SOURCES = \
  test_gnunet_service_arm.c
  test_gnunet_service_arm_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 do_subst = $(SED) -e 's,address@hidden@],$(PYTHON),g'

Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/ats/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -45,13 +45,9 @@
  gnunet-service-ats_normalization.c
 gnunet_ats_solver_eval_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/ats/libgnunetats.la \
+ libgnunetats.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(LTLIBINTL)
-gnunet_ats_solver_eval_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 libgnunetats_la_SOURCES = \
   ats_api_scheduling.c \
@@ -66,14 +62,10 @@
 libgnunet_plugin_ats_proportional_la_SOURCES = \
   plugin_ats_proportional.c
 libgnunet_plugin_ats_proportional_la_LIBADD = \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
-libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_ats_proportional_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
@@ -82,30 +74,22 @@
 libgnunet_plugin_ats_mlp_la_SOURCES = \
   plugin_ats_mlp.c
 libgnunet_plugin_ats_mlp_la_LIBADD = \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  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 = \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la
 endif
 
 libgnunet_plugin_ats_ril_la_SOURCES = \
   plugin_ats_ril.c
 libgnunet_plugin_ats_ril_la_LIBADD = \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  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 = \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la
 
 libexec_PROGRAMS = \
  gnunet-service-ats
@@ -120,12 +104,8 @@
 gnunet_service_ats_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(GN_LIBINTL)
-gnunet_service_ats_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/ats/libgnunetats.la 
 
 if HAVE_TESTING
 TESTING_TESTS = \
@@ -181,7 +161,7 @@
 test_ats_api_scheduling_init_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_SOURCES = \
@@ -190,7 +170,7 @@
 test_ats_api_scheduling_add_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_inbound_SOURCES = \
@@ -199,7 +179,7 @@
 test_ats_api_scheduling_add_address_inbound_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_duplicate_SOURCES = \
@@ -208,7 +188,7 @@
 test_ats_api_scheduling_add_address_duplicate_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_address_SOURCES = \
@@ -217,7 +197,7 @@
 test_ats_api_scheduling_destroy_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_address_twice_SOURCES = \
@@ -226,7 +206,7 @@
 test_ats_api_scheduling_destroy_address_twice_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_session_SOURCES = \
@@ -234,7 +214,7 @@
 test_ats_api_scheduling_add_session_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_session_SOURCES = \
@@ -242,7 +222,7 @@
 test_ats_api_scheduling_destroy_session_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 # performance API tests
@@ -253,7 +233,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_performance_list_peer_addresses_SOURCES = \
@@ -262,7 +242,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_performance_list_all_addresses_active_SOURCES = \
@@ -271,7 +251,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_performance_monitor_SOURCES = \
@@ -280,7 +260,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_performance_monitor_initial_callback_SOURCES = \
@@ -289,7 +269,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 # solver tests
@@ -300,7 +280,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
@@ -311,7 +291,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
@@ -322,7 +302,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_solver_add_address_and_request_proportional_SOURCES = \
@@ -332,7 +312,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
@@ -343,7 +323,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
@@ -354,7 +334,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 
@@ -365,7 +345,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
@@ -376,7 +356,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
@@ -387,8 +367,8 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 
 test_ats_solver_request_and_delete_address_proportional_SOURCES = \
@@ -398,8 +378,8 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
 test_ats_solver_request_and_delete_address_mlp_SOURCES = \
@@ -409,8 +389,8 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
 test_ats_solver_request_and_delete_address_ril_SOURCES = \
@@ -420,8 +400,8 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 
 test_ats_solver_alternative_after_delete_address_proportional_SOURCES = \
@@ -431,8 +411,8 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_solver_preferences_proportional_SOURCES = \
  test_ats_solver_preferences.c \
@@ -441,8 +421,8 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
-       $(top_builddir)/src/statistics/libgnunetstatistics.la
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
 test_ats_solver_alternative_after_delete_address_mlp_SOURCES = \
@@ -452,7 +432,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_solver_preferences_mlp_SOURCES = \
@@ -462,7 +442,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 endif
 
@@ -473,7 +453,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 #perf_ats_mlp_SOURCES = \
@@ -482,7 +462,7 @@
 #  $(GN_LIBGLPK) \
 #  $(top_builddir)/src/util/libgnunetutil.la \
 #  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
+#  libgnunetats.la
 
 perf_ats_solver_mlp_SOURCES = \
   perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -490,7 +470,7 @@
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la
+  libgnunetats.la
 
 perf_ats_solver_proportional_SOURCES = \
   perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -498,7 +478,7 @@
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la
+  libgnunetats.la
 
 perf_ats_solver_ril_SOURCES = \
   perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -506,7 +486,7 @@
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/ats/libgnunetats.la
+  libgnunetats.la
 
 test_ats_solver_preferences_ril_SOURCES = \
  test_ats_solver_preferences.c \
@@ -515,7 +495,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/ats/libgnunetats.la \
+  libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 EXTRA_DIST = \

Modified: gnunet/src/block/Makefile.am
===================================================================
--- gnunet/src/block/Makefile.am        2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/block/Makefile.am        2014-09-13 13:54:57 UTC (rev 34291)
@@ -20,26 +20,20 @@
 libgnunet_plugin_block_template_la_SOURCES = \
   plugin_block_template.c
 libgnunet_plugin_block_template_la_LIBADD = \
-  $(top_builddir)/src/block/libgnunetblock.la \
+  libgnunetblock.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_block_template_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_template_la_DEPENDENCIES = \
-  $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 libgnunet_plugin_block_test_la_SOURCES = \
   plugin_block_test.c
 libgnunet_plugin_block_test_la_LIBADD = \
-  $(top_builddir)/src/block/libgnunetblock.la \
+  libgnunetblock.la \
   $(top_builddir)/src/util/libgnunetutil.la  \
   $(LTLIBINTL)
 libgnunet_plugin_block_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_test_la_DEPENDENCIES = \
-  $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 
 libgnunetblock_la_SOURCES = \

Modified: gnunet/src/cadet/Makefile.am
===================================================================
--- gnunet/src/cadet/Makefile.am        2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/cadet/Makefile.am        2014-09-13 13:54:57 UTC (rev 34291)
@@ -42,10 +42,8 @@
 gnunet_cadet_SOURCES = \
   gnunet-cadet.c
 gnunet_cadet_LDADD = \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  libgnunetcadet.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_cadet_DEPENDENCIES = \
-  libgnunetcadet.la
 
 gnunet_service_cadet_SOURCES = \
  gnunet-service-cadet_tunnel.c gnunet-service-cadet_tunnel.h \
@@ -68,15 +66,6 @@
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/block/libgnunetblock.la
-gnunet_service_cadet_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/block/libgnunetblock.la
 if LINUX
   gnunet_service_cadet_LDFLAGS = -lrt
 endif
@@ -92,9 +81,7 @@
 libgnunetcadettest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/cadet/libgnunetcadet.la
-libgnunetcadettest_a_DEPENDENCIES = \
-  libgnunetcadet.la
+ libgnunetcadet.la
 
 if HAVE_TESTING
 check_PROGRAMS = \
@@ -121,8 +108,8 @@
 ld_cadet_test_lib = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/cadet/libgnunetcadettest.a \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
+  libgnunetcadettest.a \
+  libgnunetcadet.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 
@@ -135,102 +122,81 @@
 gnunet_cadet_profiler_SOURCES = \
   gnunet-cadet-profiler.c
 gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib)
-gnunet_cadet_profiler_DEPENDENCIES = $(dep_cadet_test_lib)
 
 
 test_cadet_single_SOURCES = \
   test_cadet_single.c
 test_cadet_single_LDADD = $(ld_cadet_test_lib)
-test_cadet_single_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_local_SOURCES = \
   test_cadet_local.c
 test_cadet_local_LDADD = $(ld_cadet_test_lib)
-test_cadet_local_DEPENDENCIES = $(dep_cadet_test_lib)
 
 
-
 test_cadet_2_forward_SOURCES = \
   test_cadet.c
 test_cadet_2_forward_LDADD = $(ld_cadet_test_lib)
-test_cadet_2_forward_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_2_signal_SOURCES = \
   test_cadet.c
 test_cadet_2_signal_LDADD = $(ld_cadet_test_lib)
-test_cadet_2_signal_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_2_keepalive_SOURCES = \
   test_cadet.c
 test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib)
-test_cadet_2_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_2_speed_SOURCES = \
   test_cadet.c
 test_cadet_2_speed_LDADD = $(ld_cadet_test_lib)
-test_cadet_2_speed_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_2_speed_ack_SOURCES = \
   test_cadet.c
 test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib)
-test_cadet_2_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_2_speed_backwards_SOURCES = \
   test_cadet.c
 test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib)
-test_cadet_2_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_2_speed_reliable_SOURCES = \
   test_cadet.c
 test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib)
-test_cadet_2_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_2_speed_reliable_backwards_SOURCES = \
   test_cadet.c
 test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
-test_cadet_2_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
 
 
-
 test_cadet_5_forward_SOURCES = \
   test_cadet.c
 test_cadet_5_forward_LDADD = $(ld_cadet_test_lib)
-test_cadet_5_forward_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_5_signal_SOURCES = \
   test_cadet.c
 test_cadet_5_signal_LDADD = $(ld_cadet_test_lib)
-test_cadet_5_signal_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_5_keepalive_SOURCES = \
   test_cadet.c
 test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib)
-test_cadet_5_keepalive_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_5_speed_SOURCES = \
   test_cadet.c
 test_cadet_5_speed_LDADD = $(ld_cadet_test_lib)
-test_cadet_5_speed_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_5_speed_ack_SOURCES = \
   test_cadet.c
 test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib)
-test_cadet_5_speed_ack_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_5_speed_backwards_SOURCES = \
   test_cadet.c
 test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib)
-test_cadet_5_speed_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_5_speed_reliable_SOURCES = \
   test_cadet.c
 test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib)
-test_cadet_5_speed_reliable_DEPENDENCIES = $(dep_cadet_test_lib)
 
 test_cadet_5_speed_reliable_backwards_SOURCES = \
   test_cadet.c
 test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
-test_cadet_5_speed_reliable_backwards_DEPENDENCIES = $(dep_cadet_test_lib)
 
 
 if ENABLE_TEST_RUN

Modified: gnunet/src/consensus/Makefile.am
===================================================================
--- gnunet/src/consensus/Makefile.am    2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/consensus/Makefile.am    2014-09-13 13:54:57 UTC (rev 34291)
@@ -34,11 +34,9 @@
  gnunet-consensus-profiler.c
 gnunet_consensus_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/consensus/libgnunetconsensus.la \
+  libgnunetconsensus.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(GN_LIBINTL)
-gnunet_consensus_profiler_DEPENDENCIES = \
-  libgnunetconsensus.la
 
 gnunet_service_consensus_SOURCES = \
  gnunet-service-consensus.c
@@ -47,8 +45,6 @@
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/set/libgnunetset.la \
   $(GN_LIBINTL)
-gnunet_service_consensus_DEPENDENCIES = \
-  $(top_builddir)/src/set/libgnunetset.la
 
 gnunet_service_evil_consensus_SOURCES = \
  gnunet-service-consensus.c \
@@ -58,8 +54,6 @@
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/set/libgnunetset.la \
   $(GN_LIBINTL)
-gnunet_service_evil_consensus_DEPENDENCIES = \
-  $(top_builddir)/src/set/libgnunetset.la
 gnunet_service_evil_consensus_CFLAGS = -DEVIL
 
 libgnunetconsensus_la_SOURCES = \
@@ -84,7 +78,7 @@
 test_consensus_api_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/consensus/libgnunetconsensus.la
+  libgnunetconsensus.la
 
 EXTRA_DIST = \
   test_consensus.conf

Modified: gnunet/src/core/Makefile.am
===================================================================
--- gnunet/src/core/Makefile.am 2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/core/Makefile.am 2014-09-13 13:54:57 UTC (rev 34291)
@@ -54,10 +54,8 @@
 gnunet_core_SOURCES = \
  gnunet-core.c         
 gnunet_core_LDADD = \
-  $(top_builddir)/src/core/libgnunetcore.la \
+  libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_core_DEPENDENCIES = \
-  libgnunetcore.la
 
 if HAVE_TESTING
   TESTING_TESTS = test_core_api_send_to_self test_core_api_mq
@@ -80,21 +78,21 @@
 test_core_api_SOURCES = \
  test_core_api.c
 test_core_api_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_core_api_reliability_SOURCES = \
  test_core_api_reliability.c
 test_core_api_reliability_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_core_api_send_to_self_SOURCES = \
  test_core_api_send_to_self.c
 test_core_api_send_to_self_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
@@ -102,7 +100,7 @@
 test_core_api_mq_SOURCES = \
  test_core_api_mq.c
 test_core_api_mq_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
@@ -111,13 +109,13 @@
  test_core_api_start_only.c
 test_core_api_start_only_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_core_quota_compliance_symmetric_SOURCES = \
  test_core_quota_compliance.c
 test_core_quota_compliance_symmetric_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
@@ -125,7 +123,7 @@
 test_core_quota_compliance_asymmetric_send_limited_SOURCES = \
  test_core_quota_compliance.c
 test_core_quota_compliance_asymmetric_send_limited_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la
@@ -133,7 +131,7 @@
 test_core_quota_compliance_asymmetric_recv_limited_SOURCES = \
  test_core_quota_compliance.c
 test_core_quota_compliance_asymmetric_recv_limited_LDADD = \
- $(top_builddir)/src/core/libgnunetcore.la \
+ libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la

Modified: gnunet/src/datacache/Makefile.am
===================================================================
--- gnunet/src/datacache/Makefile.am    2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/datacache/Makefile.am    2014-09-13 13:54:57 UTC (rev 34291)
@@ -130,63 +130,63 @@
  test_datacache.c
 test_datacache_sqlite_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datacache_quota_sqlite_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_sqlite_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_datacache_sqlite_SOURCES = \
  perf_datacache.c
 perf_datacache_sqlite_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datacache_heap_SOURCES = \
  test_datacache.c
 test_datacache_heap_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datacache_quota_heap_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_heap_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_datacache_heap_SOURCES = \
  perf_datacache.c
 perf_datacache_heap_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datacache_postgres_SOURCES = \
  test_datacache.c
 test_datacache_postgres_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datacache_quota_postgres_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_postgres_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_datacache_postgres_SOURCES = \
  perf_datacache.c
 perf_datacache_postgres_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \

Modified: gnunet/src/datastore/Makefile.am
===================================================================
--- gnunet/src/datastore/Makefile.am    2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/datastore/Makefile.am    2014-09-13 13:54:57 UTC (rev 34291)
@@ -48,11 +48,9 @@
 gnunet_datastore_SOURCES = \
  gnunet-datastore.c 
 gnunet_datastore_LDADD = \
-  $(top_builddir)/src/datastore/libgnunetdatastore.la \
+  libgnunetdatastore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_datastore_DEPENDENCIES = \
-  libgnunetdatastore.la
 
 
 if HAVE_MYSQL
@@ -178,21 +176,21 @@
  test_datastore_api.c
 test_datastore_api_heap_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datastore_api_management_heap_SOURCES = \
  test_datastore_api_management.c
 test_datastore_api_management_heap_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_datastore_api_heap_SOURCES = \
  perf_datastore_api.c
 perf_datastore_api_heap_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_plugin_datastore_heap_SOURCES = \
@@ -212,21 +210,21 @@
  test_datastore_api.c
 test_datastore_api_sqlite_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datastore_api_management_sqlite_SOURCES = \
  test_datastore_api_management.c
 test_datastore_api_management_sqlite_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_datastore_api_sqlite_SOURCES = \
  perf_datastore_api.c
 perf_datastore_api_sqlite_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_plugin_datastore_sqlite_SOURCES = \
@@ -246,21 +244,21 @@
  test_datastore_api.c
 test_datastore_api_mysql_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datastore_api_management_mysql_SOURCES = \
  test_datastore_api_management.c
 test_datastore_api_management_mysql_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_datastore_api_mysql_SOURCES = \
  perf_datastore_api.c
 perf_datastore_api_mysql_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_plugin_datastore_mysql_SOURCES = \
@@ -280,21 +278,21 @@
  test_datastore_api.c
 test_datastore_api_postgres_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_datastore_api_management_postgres_SOURCES = \
  test_datastore_api_management.c
 test_datastore_api_management_postgres_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 perf_datastore_api_postgres_SOURCES = \
  perf_datastore_api.c
 perf_datastore_api_postgres_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/datastore/libgnunetdatastore.la \
+ libgnunetdatastore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_plugin_datastore_postgres_SOURCES = \

Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/dht/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -43,11 +43,8 @@
   $(LTLIBINTL)
 libgnunet_plugin_block_dht_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_dht_la_DEPENDENCIES = \
-  $(top_builddir)/src/block/libgnunetblock.la
 
 
-
 libexec_PROGRAMS = \
  gnunet-service-dht \
  gnunet-service-dht-xvine
@@ -105,39 +102,31 @@
 gnunet_dht_get_SOURCES = \
  gnunet-dht-get.c
 gnunet_dht_get_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_dht_get_DEPENDENCIES = \
-  libgnunetdht.la
 
 gnunet_dht_put_SOURCES = \
  gnunet-dht-put.c
 gnunet_dht_put_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_dht_put_DEPENDENCIES = \
-  libgnunetdht.la
 
 gnunet_dht_monitor_SOURCES = \
  gnunet-dht-monitor.c
 gnunet_dht_monitor_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_dht_monitor_DEPENDENCIES = \
-  libgnunetdht.la
 
 gnunet_dht_profiler_SOURCES = \
   gnunet_dht_profiler.c
 gnunet_dht_profiler_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la
-gnunet_dht_profiler_DEPENDENCIES = \
-  libgnunetdht.la
 
 if HAVE_TESTING
 noinst_LIBRARIES = libgnunetdhttest.a
@@ -148,9 +137,7 @@
 libgnunetdhttest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-libgnunetdhttest_a_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 if HAVE_TESTING
 check_PROGRAMS = \
@@ -183,61 +170,49 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_api_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 test_dht_twopeer_SOURCES = \
  test_dht_topo.c
 test_dht_twopeer_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_twopeer_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 test_dht_2dtorus_SOURCES = \
  test_dht_topo.c
 test_dht_2dtorus_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_2dtorus_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 test_dht_line_SOURCES = \
  test_dht_topo.c
 test_dht_line_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_line_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 test_dht_multipeer_SOURCES = \
  test_dht_topo.c
 test_dht_multipeer_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_multipeer_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 test_dht_monitor_SOURCES = \
   test_dht_monitor.c
 test_dht_monitor_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_monitor_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 EXTRA_DIST = \
   $(check_SCRIPTS) \

Modified: gnunet/src/dns/Makefile.am
===================================================================
--- gnunet/src/dns/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/dns/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -54,35 +54,27 @@
 gnunet_dns_monitor_SOURCES = \
  gnunet-dns-monitor.c
 gnunet_dns_monitor_LDADD = \
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \
-  $(top_builddir)/src/dns/libgnunetdns.la \
+  libgnunetdnsparser.la \
+  libgnunetdns.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_dns_monitor_DEPENDENCIES = \
-  libgnunetdnsparser.la \
-  libgnunetdns.la
 
 gnunet_dns_redirector_SOURCES = \
  gnunet-dns-redirector.c
 gnunet_dns_redirector_LDADD = \
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \
-  $(top_builddir)/src/dns/libgnunetdns.la \
+  libgnunetdnsparser.la \
+  libgnunetdns.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_dns_redirector_DEPENDENCIES = \
-  libgnunetdnsparser.la \
-  libgnunetdns.la
 
 gnunet_service_dns_SOURCES = \
  gnunet-service-dns.c
 gnunet_service_dns_LDADD = \
-  $(top_builddir)/src/dns/libgnunetdnsstub.la \
+  libgnunetdnsstub.la \
   $(top_builddir)/src/tun/libgnunettun.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_dns_DEPENDENCIES = \
-  libgnunetdnsstub.la
 
 libgnunetdnsparser_la_SOURCES = \
  dnsparser.c
@@ -131,7 +123,4 @@
 test_hexcoder_LDADD = \
  libgnunetdnsparser.la \
  $(top_builddir)/src/util/libgnunetutil.la
-test_hexcoder_DEPENDENCIES = \
- libgnunetdnsparser.la \
- $(top_builddir)/src/util/libgnunetutil.la
 

Modified: gnunet/src/dv/Makefile.am
===================================================================
--- gnunet/src/dv/Makefile.am   2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/dv/Makefile.am   2014-09-13 13:54:57 UTC (rev 34291)
@@ -64,10 +64,6 @@
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_dv_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_transport_dv_la_DEPENDENCIES = \
-  $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  libgnunetdv.la                                               
 
 if HAVE_TESTING
 check_PROGRAMS = \

Modified: gnunet/src/env/Makefile.am
===================================================================
--- gnunet/src/env/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/env/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -23,8 +23,6 @@
 libgnunetenv_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
-libgnunetenv_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la
 
 if HAVE_TESTING
 check_PROGRAMS = \
@@ -42,7 +40,3 @@
   libgnunetenv.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
-test_env_DEPENDENCIES = \
-  libgnunetenv.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la

Modified: gnunet/src/fragmentation/Makefile.am
===================================================================
--- gnunet/src/fragmentation/Makefile.am        2014-09-13 12:39:21 UTC (rev 
34290)
+++ gnunet/src/fragmentation/Makefile.am        2014-09-13 13:54:57 UTC (rev 
34291)
@@ -32,7 +32,7 @@
 test_fragmentation_SOURCES = \
  test_fragmentation.c
 test_fragmentation_LDADD = \
- $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \
+ libgnunetfragmentation.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = test_fragmentation_data.conf

Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am   2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/fs/Makefile.am   2014-09-13 13:54:57 UTC (rev 34291)
@@ -89,13 +89,10 @@
 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 @@
   $(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 @@
  $(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 @@
  $(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_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 @@
  $(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.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
 
 

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/gns/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -105,17 +105,12 @@
 gnunet_gns_SOURCES = \
  gnunet-gns.c
 gnunet_gns_LDADD = \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_gns_DEPENDENCIES = \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetgns.la
 
 
 gnunet_bcd_SOURCES = \
@@ -123,57 +118,39 @@
 gnunet_bcd_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) -lmicrohttpd
-gnunet_bcd_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la
 
 
 gnunet_dns2gns_SOURCES = \
  gnunet-dns2gns.c
 gnunet_dns2gns_LDADD = \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/dns/libgnunetdnsparser.la \
   $(top_builddir)/src/dns/libgnunetdnsstub.la \
   $(GN_LIBINTL)
-gnunet_dns2gns_DEPENDENCIES = \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \
-  $(top_builddir)/src/dns/libgnunetdnsstub.la \
-  libgnunetgns.la
 
 gnunet_gns_proxy_SOURCES = \
  gnunet-gns-proxy.c
 gnunet_gns_proxy_CPPFLAGS = $(AM_CPPFLAGS) $(CPP_GNURL)
 gnunet_gns_proxy_LDADD = -lmicrohttpd $(LIB_GNURL) -lgnutls \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 if HAVE_GNUTLS_DANE
 gnunet_gns_proxy_LDADD += -lgnutls-dane
 endif
-gnunet_gns_proxy_DEPENDENCIES = \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetgns.la
 
 gnunet_gns_helper_service_w32_SOURCES = \
   gnunet-gns-helper-service-w32.c
 gnunet_gns_helper_service_w32_LDADD = \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  libgnunetgns.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_gns_helper_service_w32_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  libgnunetgns.la
 
 gnunet_gns_import_SOURCES = \
   gnunet-gns-import.c
@@ -183,12 +160,8 @@
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_gns_import_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la
 
+
 w32nsp_install_SOURCES = \
   w32nsp-install.c
 w32nsp_install_LDADD = -lws2_32
@@ -221,20 +194,8 @@
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(USE_VPN) \
   $(GN_LIBINTL)
-gnunet_service_gns_DEPENDENCIES = \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/revocation/libgnunetrevocation.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/tun/libgnunettun.la \
-  $(top_builddir)/src/dns/libgnunetdns.la \
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(USE_VPN)
 
 
-
 libw32nsp_la_SOURCES = \
   w32nsp.c
 libw32nsp_la_LIBADD = \
@@ -250,9 +211,6 @@
  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
 libgnunetgns_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
-libgnunetgns_la_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
 
 
 libgnunet_plugin_block_gns_la_SOURCES = \
@@ -263,10 +221,6 @@
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
 libgnunet_plugin_block_gns_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_gns_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
 
 
 check_SCRIPTS = \

Modified: gnunet/src/gnsrecord/Makefile.am
===================================================================
--- gnunet/src/gnsrecord/Makefile.am    2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/gnsrecord/Makefile.am    2014-09-13 13:54:57 UTC (rev 34291)
@@ -66,14 +66,14 @@
  test_gnsrecord_serialization.c
 test_gnsrecord_serialization_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnsrecord_block_expiration_SOURCES = \
  test_gnsrecord_block_expiration.c
 test_gnsrecord_block_expiration_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 
@@ -81,6 +81,6 @@
  test_gnsrecord_crypto.c
 test_gnsrecord_crypto_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
 

Modified: gnunet/src/hello/Makefile.am
===================================================================
--- gnunet/src/hello/Makefile.am        2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/hello/Makefile.am        2014-09-13 13:54:57 UTC (rev 34291)
@@ -35,21 +35,18 @@
 test_hello_SOURCES = \
  test_hello.c
 test_hello_LDADD = \
- $(top_builddir)/src/hello/libgnunethello.la \
+ libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_friend_hello_SOURCES = \
  test_friend_hello.c
 test_friend_hello_LDADD = \
- $(top_builddir)/src/hello/libgnunethello.la \
+ libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 gnunet_hello_SOURCES = \
  gnunet-hello.c
 gnunet_hello_LDADD = \
- $(top_builddir)/src/hello/libgnunethello.la \
+ libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  
-gnunet_hello_DEPENDENCIES = \
- libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la
 

Modified: gnunet/src/identity/Makefile.am
===================================================================
--- gnunet/src/identity/Makefile.am     2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/identity/Makefile.am     2014-09-13 13:54:57 UTC (rev 34291)
@@ -29,8 +29,6 @@
 libgnunetidentity_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
-libgnunetidentity_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 bin_PROGRAMS = \
  gnunet-identity
@@ -44,9 +42,6 @@
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_identity_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 gnunet_identity_SOURCES = \
  gnunet-identity.c         
@@ -55,10 +50,6 @@
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_identity_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  libgnunetidentity.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 
 if HAVE_TESTING
@@ -78,10 +69,6 @@
   libgnunetidentity.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la 
-test_identity_DEPENDENCIES = \
-  libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 test_identity_defaults_SOURCES = \
  test_identity_defaults.c
@@ -89,10 +76,6 @@
   libgnunetidentity.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la 
-test_identity_defaults_DEPENDENCIES = \
-  libgnunetidentity.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
 
 EXTRA_DIST = \
   test_identity.conf 

Modified: gnunet/src/multicast/Makefile.am
===================================================================
--- gnunet/src/multicast/Makefile.am    2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/multicast/Makefile.am    2014-09-13 13:54:57 UTC (rev 34291)
@@ -39,8 +39,6 @@
 gnunet_multicast_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_multicast_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_service_multicast_SOURCES = \
  gnunet-service-multicast.c
@@ -50,11 +48,6 @@
   $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
-gnunet_service_multicast_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 
 check_PROGRAMS = \
@@ -71,7 +64,4 @@
   libgnunetmulticast.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
-test_multicast_DEPENDENCIES = \
-  libgnunetmulticast.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
+

Modified: gnunet/src/namecache/Makefile.am
===================================================================
--- gnunet/src/namecache/Makefile.am    2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/namecache/Makefile.am    2014-09-13 13:54:57 UTC (rev 34291)
@@ -79,12 +79,8 @@
 gnunet_namecache_LDADD = \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  libgnunetnamecache.la \
   $(GN_LIBINTL)
-gnunet_namecache_DEPENDENCIES = \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la 
 
 gnunet_service_namecache_SOURCES = \
  gnunet-service-namecache.c
@@ -93,12 +89,8 @@
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  libgnunetnamecache.la \
   $(GN_LIBINTL)
-gnunet_service_namecache_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la 
 
 
 plugin_LTLIBRARIES = \
@@ -108,39 +100,30 @@
 libgnunet_plugin_namecache_sqlite_la_SOURCES = \
   plugin_namecache_sqlite.c
 libgnunet_plugin_namecache_sqlite_la_LIBADD = \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la  \
+  libgnunetnamecache.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_namecache_sqlite_la_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la 
 
 
 libgnunet_plugin_namecache_postgres_la_SOURCES = \
   plugin_namecache_postgres.c
 libgnunet_plugin_namecache_postgres_la_LIBADD = \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la  \
+  libgnunetnamecache.la  \
   $(top_builddir)/src/postgres/libgnunetpostgres.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq \
   $(LTLIBINTL)
 libgnunet_plugin_namecache_postgres_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
-libgnunet_plugin_namecache_postgres_la_DEPENDENCIES = \
-  $(top_builddir)/src/postgres/libgnunetpostgres.la  \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la 
 
 test_namecache_api_cache_block_SOURCES = \
  test_namecache_api_cache_block.c
 test_namecache_api_cache_block_LDADD = \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  libgnunetnamecache.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 

Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am    2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/namestore/Makefile.am    2014-09-13 13:54:57 UTC (rev 34291)
@@ -105,10 +105,6 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetnamestore.la \
   $(GN_LIBINTL)
-gnunet_namestore_DEPENDENCIES = \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamestore.la
 
 
 gnunet_namestore_fcfsd_SOURCES = \
@@ -116,12 +112,9 @@
 gnunet_namestore_fcfsd_LDADD = -lmicrohttpd \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  libgnunetnamestore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_namestore_fcfsd_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamestore.la
 
 
 
@@ -135,10 +128,6 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetnamestore.la \
   $(GN_LIBINTL)
-gnunet_service_namestore_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamestore.la
 
 
 plugin_LTLIBRARIES = \
@@ -154,12 +143,7 @@
   $(LTLIBINTL)
 libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_namestore_sqlite_la_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamestore.la
 
-
 libgnunet_plugin_namestore_postgres_la_SOURCES = \
   plugin_namestore_postgres.c
 libgnunet_plugin_namestore_postgres_la_LIBADD = \
@@ -170,11 +154,6 @@
   $(LTLIBINTL)
 libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
-libgnunet_plugin_namestore_postgres_la_DEPENDENCIES = \
-  $(top_builddir)/src/postgres/libgnunetpostgres.la  \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetnamestore.la
 
 test_namestore_api_store_SOURCES = \
  test_namestore_api_store.c
@@ -182,7 +161,7 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_store_update_SOURCES = \
  test_namestore_api_store_update.c
@@ -191,7 +170,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_lookup_public_SOURCES = \
  test_namestore_api_lookup_public.c
@@ -200,7 +179,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_lookup_nick_SOURCES = \
  test_namestore_api_lookup_nick.c
@@ -209,7 +188,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_lookup_private_SOURCES = \
  test_namestore_api_lookup_private.c
@@ -218,7 +197,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_lookup_shadow_SOURCES = \
  test_namestore_api_lookup_shadow.c
@@ -227,7 +206,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_lookup_shadow_filter_SOURCES = \
  test_namestore_api_lookup_shadow_filter.c
@@ -236,7 +215,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_remove_SOURCES = \
  test_namestore_api_remove.c
@@ -244,7 +223,7 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_remove_not_existing_record_SOURCES = \
  test_namestore_api_remove_not_existing_record.c
@@ -252,20 +231,20 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 #test_namestore_api_zone_to_name_SOURCES = \
 # test_namestore_api_zone_to_name.c
 #test_namestore_api_zone_to_name_LDADD = \
 #  $(top_builddir)/src/testing/libgnunettesting.la \
 #  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/namestore/libgnunetnamestore.la
+#  libgnunetnamestore.la
 
 test_namestore_api_monitoring_SOURCES = \
  test_namestore_api_monitoring.c
 test_namestore_api_monitoring_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  libgnunetnamestore.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -273,7 +252,7 @@
  test_namestore_api_monitoring_existing.c
 test_namestore_api_monitoring_existing_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  libgnunetnamestore.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
@@ -283,7 +262,7 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_nick_SOURCES = \
  test_namestore_api_zone_iteration_nick.c
@@ -291,7 +270,7 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 
 test_namestore_api_zone_iteration_specific_zone_SOURCES = \
@@ -300,7 +279,7 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_stop_SOURCES = \
  test_namestore_api_zone_iteration_stop.c
@@ -308,7 +287,7 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  libgnunetnamestore.la
 
 test_plugin_namestore_sqlite_SOURCES = \
  test_plugin_namestore.c

Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/nat/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -41,10 +41,8 @@
 gnunet_nat_server_SOURCES = \
  gnunet-nat-server.c nat.h
 gnunet_nat_server_LDADD = \
-  $(top_builddir)/src/nat/libgnunetnat.la \
+  libgnunetnat.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_nat_server_DEPENDENCIES = \
-  libgnunetnat.la
 
 gnunet_helper_nat_server_SOURCES = \
  $(NATSERVER)
@@ -87,20 +85,20 @@
 test_nat_SOURCES = \
   test_nat.c
 test_nat_LDADD = \
- $(top_builddir)/src/nat/libgnunetnat.la \
+ libgnunetnat.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 test_nat_mini_SOURCES = \
   test_nat_mini.c
 test_nat_mini_LDADD = \
- $(top_builddir)/src/nat/libgnunetnat.la \
+ libgnunetnat.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 
 test_nat_test_SOURCES = \
   test_nat_test.c
 test_nat_test_LDADD = \
- $(top_builddir)/src/nat/libgnunetnat.la \
+ libgnunetnat.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 

Modified: gnunet/src/nse/Makefile.am
===================================================================
--- gnunet/src/nse/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/nse/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -19,13 +19,10 @@
 bin_PROGRAMS = gnunet-nse
 
 gnunet_nse_SOURCES = gnunet-nse.c
-gnunet_nse_LDFLAGS = \
+gnunet_nse_LDADD = \
   libgnunetnse.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB) $(GN_LIBINTL)
-gnunet_nse_DEPENDENCIES = \
-  libgnunetnse.la \
-  $(top_builddir)/src/util/libgnunetutil.la
 
 lib_LTLIBRARIES = libgnunetnse.la
 
@@ -50,31 +47,25 @@
 gnunet_nse_profiler_SOURCES = \
  gnunet-nse-profiler.c
 gnunet_nse_profiler_LDADD = -lm \
-  $(top_builddir)/src/nse/libgnunetnse.la \
+  libgnunetnse.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(GN_LIBINTL)
-gnunet_nse_profiler_DEPENDENCIES = \
-  libgnunetnse.la
 
 gnunet_service_nse_SOURCES = \
  gnunet-service-nse.c
 gnunet_service_nse_LDADD = \
-  $(top_builddir)/src/nse/libgnunetnse.la \
+  libgnunetnse.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(LIBGCRYPT_LIBS) \
   -lm -lgcrypt \
   $(GN_LIBINTL)
-gnunet_service_nse_DEPENDENCIES = \
-  libgnunetnse.la
 if ENABLE_NSE_HISTOGRAM
   gnunet_service_nse_LDADD += \
     $(top_builddir)/src/testbed/libgnunettestbedlogger.la
-  gnunet_service_nse_DEPENDENCIES += \
-    $(top_builddir)/src/testbed/libgnunettestbedlogger.la
 endif
 
 
@@ -97,14 +88,14 @@
 test_nse_api_SOURCES = \
  test_nse_api.c
 test_nse_api_LDADD = \
-  $(top_builddir)/src/nse/libgnunetnse.la \
+  libgnunetnse.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_nse_multipeer_SOURCES = \
  test_nse_multipeer.c
 test_nse_multipeer_LDADD = \
-  $(top_builddir)/src/nse/libgnunetnse.la \
+  libgnunetnse.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   -lm

Modified: gnunet/src/peerinfo/Makefile.am
===================================================================
--- gnunet/src/peerinfo/Makefile.am     2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/peerinfo/Makefile.am     2014-09-13 13:54:57 UTC (rev 34291)
@@ -65,7 +65,7 @@
  test_peerinfo_shipped_hellos.c
 test_peerinfo_shipped_hellos_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ libgnunetpeerinfo.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
@@ -73,7 +73,7 @@
  test_peerinfo_api.c
 test_peerinfo_api_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ libgnunetpeerinfo.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
@@ -81,7 +81,7 @@
  test_peerinfo_api_friend_only.c
 test_peerinfo_api_friend_only_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ libgnunetpeerinfo.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
@@ -89,7 +89,7 @@
  test_peerinfo_api_notify_friend_only.c
 test_peerinfo_api_notify_friend_only_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ libgnunetpeerinfo.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
@@ -97,7 +97,7 @@
  perf_peerinfo_api.c
 perf_peerinfo_api_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ libgnunetpeerinfo.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 

Modified: gnunet/src/peerstore/Makefile.am
===================================================================
--- gnunet/src/peerstore/Makefile.am    2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/peerstore/Makefile.am    2014-09-13 13:54:57 UTC (rev 34291)
@@ -51,18 +51,15 @@
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_peerstore_sqlite.la
-  
+
 libgnunet_plugin_peerstore_sqlite_la_SOURCES = \
   plugin_peerstore_sqlite.c
 libgnunet_plugin_peerstore_sqlite_la_LIBADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_peerstore_sqlite_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetpeerstore.la
 
 check_PROGRAMS = \
  test_peerstore_api_store \
@@ -70,7 +67,7 @@
  test_peerstore_api_watch \
  test_peerstore_api_sync \
  perf_peerstore_store
- 
+
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export 
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export 
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
@@ -79,34 +76,34 @@
 test_peerstore_api_store_SOURCES = \
  test_peerstore_api_store.c
 test_peerstore_api_store_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_peerstore_api_iterate_SOURCES = \
  test_peerstore_api_iterate.c
 test_peerstore_api_iterate_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_peerstore_api_watch_SOURCES = \
  test_peerstore_api_watch.c
 test_peerstore_api_watch_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_peerstore_api_sync_SOURCES = \
  test_peerstore_api_sync.c
 test_peerstore_api_sync_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 perf_peerstore_store_SOURCES = \
  perf_peerstore_store.c
 perf_peerstore_store_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la

Modified: gnunet/src/psyc/Makefile.am
===================================================================
--- gnunet/src/psyc/Makefile.am 2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/psyc/Makefile.am 2014-09-13 13:54:57 UTC (rev 34291)
@@ -28,9 +28,6 @@
 libgnunetpsycutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
-libgnunetpsycutil_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/env/libgnunetenv.la
 
 libgnunetpsyc_la_SOURCES = \
   psyc_api.c psyc.h
@@ -42,10 +39,6 @@
 libgnunetpsyc_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
-libgnunetpsyc_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/env/libgnunetenv.la \
-  libgnunetpsycutil.la
 
 bin_PROGRAMS =
 
@@ -61,12 +54,6 @@
   $(top_builddir)/src/psycstore/libgnunetpsycstore.la \
   libgnunetpsycutil.la \
   $(GN_LIBINTL)
-gnunet_service_psyc_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/multicast/libgnunetmulticast.la \
-  $(top_builddir)/src/psycstore/libgnunetpsycstore.la \
-  libgnunetpsycutil.la
 gnunet_service_psyc_CFLAGS = $(AM_CFLAGS)
 
 
@@ -89,13 +76,6 @@
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/env/libgnunetenv.la \
   $(top_builddir)/src/util/libgnunetutil.la
-test_psyc_DEPENDENCIES = \
-  libgnunetpsyc.la \
-  libgnunetpsycutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/env/libgnunetenv.la \
-  $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
   test_psyc.conf

Modified: gnunet/src/psycstore/Makefile.am
===================================================================
--- gnunet/src/psycstore/Makefile.am    2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/psycstore/Makefile.am    2014-09-13 13:54:57 UTC (rev 34291)
@@ -37,8 +37,6 @@
 libgnunetpsycstore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
-libgnunetpsycstore_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la
 
 bin_PROGRAMS =
 
@@ -51,27 +49,19 @@
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_psycstore_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la
 
-
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN)
 
 libgnunet_plugin_psycstore_sqlite_la_SOURCES = \
   plugin_psycstore_sqlite.c
 libgnunet_plugin_psycstore_sqlite_la_LIBADD = \
-  $(top_builddir)/src/psycstore/libgnunetpsycstore.la  \
+  libgnunetpsycstore.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_psycstore_sqlite_la_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetpsycstore.la
 
 
 if HAVE_TESTING
@@ -91,10 +81,6 @@
   libgnunetpsycstore.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
-test_psycstore_DEPENDENCIES = \
-  libgnunetpsycstore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
   test_psycstore.conf
@@ -103,5 +89,5 @@
 test_plugin_psycstore_sqlite_SOURCES = \
  test_plugin_psycstore.c
 test_plugin_psycstore_sqlite_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la  
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la  

Modified: gnunet/src/regex/Makefile.am
===================================================================
--- gnunet/src/regex/Makefile.am        2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/regex/Makefile.am        2014-09-13 13:54:57 UTC (rev 34291)
@@ -25,14 +25,12 @@
 gnunet_service_regex_SOURCES =  \
  gnunet-service-regex.c
 gnunet_service_regex_LDADD =  -lm \
- $(top_builddir)/src/regex/libgnunetregex_internal.a \
- $(top_builddir)/src/regex/libgnunetregexblock.la \
+ libgnunetregex_internal.a \
+ libgnunetregexblock.la \
  $(top_builddir)/src/dht/libgnunetdht.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL) 
-gnunet_service_regex_DEPENDENCIES = \
-  libgnunetregex_internal.a
 
 noinst_LIBRARIES = \
   libgnunetregex_internal.a \
@@ -77,15 +75,11 @@
 libgnunet_plugin_block_regex_la_SOURCES = \
  plugin_block_regex.c
 libgnunet_plugin_block_regex_la_LIBADD = \
- $(top_builddir)/src/regex/libgnunetregexblock.la \
+ libgnunetregexblock.la \
  $(top_builddir)/src/block/libgnunetblock.la \
  $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_block_regex_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_regex_la_DEPENDENCIES = \
- $(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,14 +89,9 @@
   gnunet-regex-simulation-profiler.c
 gnunet_regex_simulation_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/mysql/libgnunetmysql.la 
-gnunet_regex_simulation_profiler_DEPENDENCIES = \
-  $(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 = \
@@ -111,10 +100,7 @@
   regex_test_random.c 
 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
+ libgnunetregex_internal.a
 
 if HAVE_TESTING
 noinst_PROGRAMS = $(noinst_mysql_progs) \
@@ -125,55 +111,33 @@
 perf_regex_SOURCES = \
   perf-regex.c
 perf_regex_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
+  libgnunetregexblock.la \
+  libgnunetregextest.a \
   $(top_builddir)/src/util/libgnunetutil.la 
-perf_regex_DEPENDENCIES = \
-  $(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
 gnunet_regex_profiler_LDADD = -lm \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
+  libgnunetregexblock.la \
+  libgnunetregextest.a \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(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 \
-  $(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
 gnunet_daemon_regexprofiler_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
+  libgnunetregexblock.la \
+  libgnunetregextest.a \
   $(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 \
-  $(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 \
@@ -190,43 +154,43 @@
 test_regex_eval_api_SOURCES = \
   test_regex_eval_api.c
 test_regex_eval_api_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  libgnunetregextest.a \
+  libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_api_SOURCES = \
   test_regex_api.c
 test_regex_api_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex.la \
+  libgnunetregex.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_iterate_api_SOURCES = \
   test_regex_iterate_api.c
 test_regex_iterate_api_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  libgnunetregex_internal.a \
+  libgnunetregexblock.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_proofs_SOURCES = \
   test_regex_proofs.c
 test_regex_proofs_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  libgnunetregextest.a \
+  libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_regex_graph_api_SOURCES = \
   test_regex_graph_api.c
 test_regex_graph_api_LDADD = -lm \
-  $(top_builddir)/src/regex/libgnunetregex_internal.a \
+  libgnunetregex_internal.a \
   $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/regex/libgnunetregextest.a \
-  $(top_builddir)/src/regex/libgnunetregexblock.la \
+  libgnunetregextest.a \
+  libgnunetregexblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 

Modified: gnunet/src/revocation/Makefile.am
===================================================================
--- gnunet/src/revocation/Makefile.am   2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/revocation/Makefile.am   2014-09-13 13:54:57 UTC (rev 34291)
@@ -47,21 +47,19 @@
 gnunet_service_revocation_SOURCES = \
  gnunet-service-revocation.c
 gnunet_service_revocation_LDADD = \
-  $(top_builddir)/src/revocation/libgnunetrevocation.la \
+  libgnunetrevocation.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/set/libgnunetset.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   -lm \
   $(GN_LIBINTL)
-gnunet_service_revocation_DEPENDENCIES = \
-  libgnunetrevocation.la
 
 test_revocation_SOURCES = \
  test_revocation.c
 test_revocation_LDADD = \
  $(top_builddir)/src/identity/libgnunetidentity.la \
- $(top_builddir)/src/revocation/libgnunetrevocation.la \
+ libgnunetrevocation.la \
  $(top_builddir)/src//core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la

Modified: gnunet/src/scalarproduct/Makefile.am
===================================================================
--- gnunet/src/scalarproduct/Makefile.am        2014-09-13 12:39:21 UTC (rev 
34290)
+++ gnunet/src/scalarproduct/Makefile.am        2014-09-13 13:54:57 UTC (rev 
34291)
@@ -28,12 +28,10 @@
   gnunet-scalarproduct.c
 gnunet_scalarproduct_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/scalarproduct/libgnunetscalarproduct.la \
+  libgnunetscalarproduct.la \
   $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(GN_LIBINTL)
-gnunet_scalarproduct_DEPENDENCIES = \
-  libgnunetscalarproduct.la
 
 gnunet_service_scalarproduct_SOURCES = \
   gnunet-service-scalarproduct.c

Modified: gnunet/src/secretsharing/Makefile.am
===================================================================
--- gnunet/src/secretsharing/Makefile.am        2014-09-13 12:39:21 UTC (rev 
34290)
+++ gnunet/src/secretsharing/Makefile.am        2014-09-13 13:54:57 UTC (rev 
34291)
@@ -30,11 +30,9 @@
  gnunet-secretsharing-profiler.c
 gnunet_secretsharing_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/secretsharing/libgnunetsecretsharing.la \
+  libgnunetsecretsharing.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(GN_LIBINTL)
-gnunet_secretsharing_profiler_DEPENDENCIES = \
-  libgnunetsecretsharing.la
 
 gnunet_service_secretsharing_SOURCES = \
  gnunet-service-secretsharing.c \
@@ -46,8 +44,6 @@
   $(top_builddir)/src/consensus/libgnunetconsensus.la \
   $(LIBGCRYPT_LIBS) \
   $(GN_LIBINTL)
-gnunet_service_secretsharing_DEPENDENCIES = \
-  $(top_builddir)/src/consensus/libgnunetconsensus.la
 
 libgnunetsecretsharing_la_SOURCES = \
   secretsharing_api.c \
@@ -72,7 +68,7 @@
 test_secretsharing_api_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/secretsharing/libgnunetsecretsharing.la
+  libgnunetsecretsharing.la
 
 EXTRA_DIST = \
   test_secretsharing.conf

Modified: gnunet/src/sensor/Makefile.am
===================================================================
--- gnunet/src/sensor/Makefile.am       2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/sensor/Makefile.am       2014-09-13 13:54:57 UTC (rev 34291)
@@ -65,24 +65,18 @@
   $(top_builddir)/src/statistics/libgnunetstatistics.la
 libgnunetsensorutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
-libgnunetsensorutil_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_sensor_model_gaussian.la
-  
+
 libgnunet_plugin_sensor_model_gaussian_la_SOURCES = \
   plugin_sensor_model_gaussian.c
 libgnunet_plugin_sensor_model_gaussian_la_LIBADD = \
-  $(top_builddir)/src/sensor/libgnunetsensor.la  \
+  libgnunetsensor.la  \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL)
 libgnunet_plugin_sensor_model_gaussian_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_sensor_model_gaussian_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetsensor.la
 
 check_PROGRAMS = \
  test_sensor_api \

Modified: gnunet/src/set/Makefile.am
===================================================================
--- gnunet/src/set/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/set/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -28,11 +28,9 @@
  gnunet-set-profiler.c
 gnunet_set_profiler_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/set/libgnunetset.la \
+  libgnunetset.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(GN_LIBINTL)
-gnunet_set_profiler_DEPENDENCIES = \
-  libgnunetset.la
 
 
 gnunet_set_ibf_profiler_SOURCES = \
@@ -79,8 +77,6 @@
 test_set_api_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/set/libgnunetset.la
-test_set_api_DEPENDENCIES = \
   libgnunetset.la
 
 test_set_union_result_full_SOURCES = \
@@ -88,8 +84,6 @@
 test_set_union_result_full_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/set/libgnunetset.la
-test_set_union_result_full_DEPENDENCIES = \
   libgnunetset.la
 
 test_set_intersection_result_full_SOURCES = \
@@ -97,8 +91,6 @@
 test_set_intersection_result_full_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/set/libgnunetset.la
-test_set_intersection_result_full_DEPENDENCIES = \
   libgnunetset.la
 
 EXTRA_DIST = \

Modified: gnunet/src/social/Makefile.am
===================================================================
--- gnunet/src/social/Makefile.am       2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/social/Makefile.am       2014-09-13 13:54:57 UTC (rev 34291)
@@ -33,14 +33,6 @@
 libgnunetsocial_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
-libgnunetsocial_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/env/libgnunetenv.la \
-  $(top_builddir)/src/psyc/libgnunetpsycutil.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
 
 bin_PROGRAMS =
 
@@ -55,12 +47,6 @@
   $(top_builddir)/src/psyc/libgnunetpsyc.la \
   $(top_builddir)/src/psyc/libgnunetpsycutil.la \
   $(GN_LIBINTL)
-gnunet_service_social_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/psyc/libgnunetpsyc.la \
-  $(top_builddir)/src/psyc/libgnunetpsycutil.la
-gnunet_service_social_CFLAGS = $(AM_CFLAGS)
 
 
 if HAVE_TESTING
@@ -83,14 +69,6 @@
   $(top_builddir)/src/psyc/libgnunetpsycutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/identity/libgnunetidentity.la
-test_social_DEPENDENCIES = \
-  libgnunetsocial.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/env/libgnunetenv.la \
-  $(top_builddir)/src/psyc/libgnunetpsycutil.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la
 
 EXTRA_DIST = \
   test_social.conf

Modified: gnunet/src/statistics/Makefile.am
===================================================================
--- gnunet/src/statistics/Makefile.am   2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/statistics/Makefile.am   2014-09-13 13:54:57 UTC (rev 34291)
@@ -36,20 +36,16 @@
 gnunet_statistics_SOURCES = \
  gnunet-statistics.c         
 gnunet_statistics_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_statistics_DEPENDENCIES = \
-  libgnunetstatistics.la                                
 
 gnunet_service_statistics_SOURCES = \
  gnunet-service-statistics.c         
 gnunet_service_statistics_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_statistics_DEPENDENCIES = \
-  libgnunetstatistics.la                                
 
 check_PROGRAMS = \
  test_statistics_api \
@@ -65,25 +61,25 @@
 test_statistics_api_SOURCES = \
  test_statistics_api.c
 test_statistics_api_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_statistics_api_loop_SOURCES = \
  test_statistics_api_loop.c
 test_statistics_api_loop_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_statistics_api_watch_SOURCES = \
  test_statistics_api_watch.c
 test_statistics_api_watch_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_statistics_api_watch_zero_value_SOURCES = \
  test_statistics_api_watch_zero_value.c
 test_statistics_api_watch_zero_value_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 if HAVE_PYTHON

Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am      2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/testbed/Makefile.am      2014-09-13 13:54:57 UTC (rev 34291)
@@ -53,26 +53,19 @@
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la \
+ libgnunettestbed.la \
  $(top_builddir)/src/arm/libgnunetarm.la \
  $(LTLIBINTL) $(Z_LIBS)
-gnunet_service_testbed_DEPENDENCIES = \
- libgnunettestbed.la
 
 gnunet_service_testbed_logger_SOURCES = \
   gnunet-service-testbed-logger.c
 gnunet_service_testbed_logger_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la
-gnunet_service_testbed_logger_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_testbed_profiler_SOURCES = \
   gnunet-testbed-profiler.c
 gnunet_testbed_profiler_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la
-gnunet_testbed_profiler_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
 gnunet_helper_testbed_SOURCES = \
@@ -82,36 +75,24 @@
  $(top_builddir)/src/testing/libgnunettesting.la \
  libgnunettestbed.la \
  $(LTLIBINTL) $(Z_LIBS)
-gnunet_helper_testbed_DEPENDENCIES = \
-  gnunet-service-testbed.$(OBJEXT) \
-  libgnunettestbed.la
 
 gnunet_daemon_testbed_blacklist_SOURCES = gnunet-daemon-testbed-blacklist.c
 gnunet_daemon_testbed_blacklist_LDADD = $(XLIB) \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
-gnunet_daemon_testbed_blacklist_DEPENDENCIES = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_daemon_testbed_underlay_SOURCES = gnunet-daemon-testbed-underlay.c
 gnunet_daemon_testbed_underlay_LDADD = $(XLIB) \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL) -lsqlite3
-gnunet_daemon_testbed_underlay_DEPENDENCIES = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la
 
 gnunet_daemon_latency_logger_SOURCES = gnunet-daemon-latency-logger.c
 gnunet_daemon_latency_logger_LDADD = $(XLIB) \
  $(top_builddir)/src/ats/libgnunetats.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL) -lsqlite3
-gnunet_daemon_latency_logger_DEPENDENCIES = \
- $(top_builddir)/src/ats/libgnunetats.la \
- $(top_builddir)/src/util/libgnunetutil.la
 
 lib_LTLIBRARIES = \
   libgnunettestbed.la \
@@ -154,11 +135,8 @@
 generate_underlay_topology_SOURCES = generate-underlay-topology.c
 generate_underlay_topology_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la \
+ libgnunettestbed.la \
  $(LTLIBINTL) -lsqlite3
-generate_underlay_topology_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la \
- libgnunettestbed.la
 
 check_PROGRAMS = \
   test_testbed_api_hosts \
@@ -399,8 +377,6 @@
 test_testbed_api_barriers_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
-test_testbed_api_barriers_DEPENDENCIES = \
- gnunet-service-test-barriers$(EXEEXT)
 
 gnunet_service_test_barriers_SOURCES = \
   gnunet-service-test-barriers.c \

Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am      2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/testing/Makefile.am      2014-09-13 13:54:57 UTC (rev 34291)
@@ -36,11 +36,9 @@
 gnunet_testing_SOURCES = \
  gnunet-testing.c         
 gnunet_testing_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
-gnunet_testing_DEPENDENCIES = \
- libgnunettesting.la
 
 list_keys_SOURCES = \
  list-keys.c
@@ -68,31 +66,31 @@
 test_testing_portreservation_SOURCES = \
  test_testing_portreservation.c
 test_testing_portreservation_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_peerstartup_SOURCES = \
  test_testing_peerstartup.c
 test_testing_peerstartup_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_peerstartup2_SOURCES = \
  test_testing_peerstartup2.c
 test_testing_peerstartup2_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_servicestartup_SOURCES = \
  test_testing_servicestartup.c
 test_testing_servicestartup_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_sharedservices_SOURCES = \
  test_testing_sharedservices.c
 test_testing_sharedservices_LDADD = \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/transport/Makefile.am    2014-09-13 13:54:57 UTC (rev 34291)
@@ -151,13 +151,11 @@
 libgnunettransporttesting_la_SOURCES = \
   transport-testing.c transport-testing.h
 libgnunettransporttesting_la_LIBADD = \
-  $(top_builddir)/src/transport/libgnunettransport.la \
+  libgnunettransport.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(GN_LIBINTL)
-libgnunettransporttesting_la_DEPENDENCIES = \
-  libgnunettransport.la
 libgnunettransporttesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS)
 
@@ -224,24 +222,20 @@
 gnunet_transport_profiler_SOURCES = \
  gnunet-transport-profiler.c
 gnunet_transport_profiler_LDADD = \
-  $(top_builddir)/src/transport/libgnunettransport.la \
+  libgnunettransport.la \
   $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_transport_profiler_DEPENDENCIES = \
-  libgnunettransport.la
 
 gnunet_transport_SOURCES = \
  gnunet-transport.c
 gnunet_transport_LDADD = \
-  $(top_builddir)/src/transport/libgnunettransport.la \
+  libgnunettransport.la \
   $(top_builddir)/src/nat/libgnunetnat.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_transport_DEPENDENCIES = \
-  libgnunettransport.la
 
 gnunet_service_transport_SOURCES = \
  gnunet-service-transport.c gnunet-service-transport.h \
@@ -258,7 +252,7 @@
 # a crash on unloading of a plugin unless the service links against
 # that library as well.
 gnunet_service_transport_LDADD = \
-  $(top_builddir)/src/transport/libgnunettransport.la \
+  libgnunettransport.la \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
@@ -267,8 +261,6 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_GLPK) \
   $(GN_LIBINTL)
-gnunet_service_transport_DEPENDENCIES = \
- libgnunettransport.la
 gnunet_service_transport_CFLAGS = \
   $(CFLAGS)
 # -DANALYZE
@@ -569,507 +561,507 @@
  test_transport_testing_startstop.c
 test_transport_testing_startstop_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_testing_restart_SOURCES = \
  test_transport_testing_restart.c
 test_transport_testing_restart_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_testing_SOURCES = \
  test_transport_testing.c
 test_transport_testing_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_blacklisting_SOURCES = \
  test_transport_api_blacklisting.c
 test_transport_api_blacklisting_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_no_bl_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_no_bl_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_outbound_bl_full_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_outbound_bl_full_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_outbound_bl_plugin_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_outbound_bl_plugin_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_inbound_bl_full_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_inbound_bl_full_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_inbound_bl_plugin_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_inbound_bl_plugin_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_blacklisting_multiple_plugins_SOURCES = \
  test_transport_blacklisting.c
 test_transport_blacklisting_multiple_plugins_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 
 test_transport_api_disconnect_tcp_SOURCES = \
  test_transport_api_disconnect.c
 test_transport_api_disconnect_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_startonly_SOURCES = \
  test_transport_startonly.c
 test_transport_startonly_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_plugin_tcp_SOURCES = \
  test_plugin_transport.c
 test_plugin_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_plugin_udp_SOURCES = \
  test_plugin_transport.c
 test_plugin_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_plugin_unix_SOURCES = \
  test_plugin_transport.c
 test_plugin_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_plugin_wlan_SOURCES = \
  test_plugin_transport.c
 test_plugin_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_plugin_bluetooth_SOURCES = \
  test_plugin_transport.c
 test_plugin_bluetooth_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_http_common_SOURCES = \
  test_http_common.c plugin_transport_http_common.c
 test_http_common_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_plugin_http_server_SOURCES = \
  test_plugin_transport.c
 test_plugin_http_server_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_plugin_https_server_SOURCES = \
  test_plugin_transport.c
 test_plugin_https_server_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_plugin_http_client_SOURCES = \
  test_plugin_transport.c
 test_plugin_http_client_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_plugin_https_client_SOURCES = \
  test_plugin_transport.c
 test_plugin_https_client_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_tcp_SOURCES = \
  test_transport_api.c
 test_transport_api_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_bidirectional_connect_SOURCES = \
  test_transport_api_bidirectional_connect.c
 test_transport_api_bidirectional_connect_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_restart_1peer_SOURCES = \
  test_transport_api_restart_1peer.c
 test_transport_api_restart_1peer_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_restart_2peers_SOURCES = \
  test_transport_api_restart_2peers.c
 test_transport_api_restart_2peers_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_limited_sockets_tcp_SOURCES = \
  test_transport_api_limited_sockets.c
 test_transport_api_limited_sockets_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_tcp_nat_SOURCES = \
  test_transport_api.c
 test_transport_api_tcp_nat_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_manipulation_send_tcp_SOURCES = \
  test_transport_api_manipulation_send_tcp.c
 test_transport_api_manipulation_send_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_manipulation_recv_tcp_SOURCES = \
  test_transport_api_manipulation_recv_tcp.c
 test_transport_api_manipulation_recv_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_manipulation_cfg_SOURCES = \
  test_transport_api_manipulation_cfg.c
 test_transport_api_manipulation_cfg_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_tcp_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_tcp_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_unix_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_wlan_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_bluetooth_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_bluetooth_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_tcp_nat_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_tcp_nat_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_bluetooth_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_bluetooth_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_wlan_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_udp_SOURCES = \
  test_transport_api.c
 test_transport_api_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_udp_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_udp_nat_SOURCES = \
  test_transport_api.c
 test_transport_api_udp_nat_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_unix_SOURCES = \
  test_transport_api.c
 test_transport_api_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_unix_abstract_SOURCES = \
  test_transport_api.c
 test_transport_api_unix_abstract_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 # HTTP tests
 test_transport_api_http_SOURCES = \
  test_transport_api.c
 test_transport_api_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_http_reverse_SOURCES = \
  test_transport_api.c
 test_transport_api_http_reverse_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_http_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_http_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_http_xhr_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_http_xhr_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_http_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_http_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_http_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_https_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_https_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_https_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 # HTTPS tests
 test_transport_api_https_SOURCES = \
  test_transport_api.c
 test_transport_api_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_timeout_https_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 
 test_transport_api_reliability_https_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_https_xhr_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_https_xhr_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_unix_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_reliability_udp_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 if LINUX
 test_transport_api_wlan_SOURCES = \
  test_transport_api.c
 test_transport_api_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 endif
 
 if LINUX
@@ -1077,146 +1069,146 @@
 test_transport_api_bluetooth_SOURCES = \
  test_transport_api.c
 test_transport_api_bluetooth_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 endif
 endif
 
 test_transport_address_switch_tcp_SOURCES = \
  test_transport_address_switch.c
 test_transport_address_switch_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
  test_transport_address_switch_udp_SOURCES = \
  test_transport_address_switch.c
 test_transport_address_switch_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 
  test_transport_address_switch_http_SOURCES = \
  test_transport_address_switch.c
 test_transport_address_switch_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
  test_transport_address_switch_https_SOURCES = \
  test_transport_address_switch.c
 test_transport_address_switch_https_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_tcp_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_tcp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_tcp_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_tcp_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_udp_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_udp_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_unix_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_unix_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_unix_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_unix_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_wlan_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_wlan_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_wlan_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_wlan_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_bluetooth_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_bluetooth_LDADD = \
  $(top_builddir)/src/nat/libgnunetnat.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_quota_compliance_bluetooth_asymmetric_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_bluetooth_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_multi_SOURCES = \
  test_transport_api.c
 test_transport_api_multi_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_monitor_peers_SOURCES = \
  test_transport_api_monitor_peers.c
 test_transport_api_monitor_peers_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 test_transport_api_monitor_validation_SOURCES = \
  test_transport_api_monitor_validation.c
 test_transport_api_monitor_validation_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
+ libgnunettransport.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
+ libgnunettransporttesting.la
 
 
 EXTRA_DIST = \

Modified: gnunet/src/tun/Makefile.am
===================================================================
--- gnunet/src/tun/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/tun/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -35,11 +35,11 @@
  test_tun.c
 test_tun_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/tun/libgnunettun.la
+ libgnunettun.la
 
 
 test_regex_SOURCES = \
  test_regex.c
 test_regex_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/tun/libgnunettun.la
+ libgnunettun.la

Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/util/Makefile.am 2014-09-13 13:54:57 UTC (rev 34291)
@@ -43,9 +43,7 @@
   gnunet-helper-w32-console.c \
   gnunet-helper-w32-console.h
 gnunet_helper_w32_console_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-gnunet_helper_w32_console_DEPENDENCIES = \
- libgnunetutil.la
+  libgnunetutil.la
 
 noinst_PROGRAMS = \
  gnunet-config-diff \
@@ -56,15 +54,11 @@
 gnunet_config_diff_SOURCES = \
  gnunet-config-diff.c
 gnunet_config_diff_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-gnunet_config_diff_DEPENDENCIES = \
  libgnunetutil.la
 
 test_common_logging_dummy_SOURCES = \
  test_common_logging_dummy.c
 test_common_logging_dummy_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-test_common_logging_dummy_DEPENDENCIES = \
  libgnunetutil.la
 
 lib_LTLIBRARIES = libgnunetutil.la
@@ -161,54 +155,42 @@
 gnunet_service_resolver_SOURCES = \
  gnunet-service-resolver.c
 gnunet_service_resolver_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_resolver_DEPENDENCIES = \
-  libgnunetutil.la
 
 
 gnunet_resolver_SOURCES = \
  gnunet-resolver.c
 gnunet_resolver_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_resolver_DEPENDENCIES = \
-  libgnunetutil.la
 
 
 gnunet_ecc_SOURCES = \
  gnunet-ecc.c
 gnunet_ecc_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetutil.la \
   $(GN_LIBINTL) -lgcrypt
-gnunet_ecc_DEPENDENCIES = \
-  libgnunetutil.la
 
 gnunet_scrypt_SOURCES = \
  gnunet-scrypt.c
 gnunet_scrypt_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetutil.la \
   $(GN_LIBINTL) -lgcrypt
-gnunet_scrypt_DEPENDENCIES = \
-  libgnunetutil.la
 
 
 gnunet_config_SOURCES = \
  gnunet-config.c
 gnunet_config_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_config_DEPENDENCIES = \
-  libgnunetutil.la
 
 
 gnunet_uri_SOURCES = \
  gnunet-uri.c
 gnunet_uri_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_uri_DEPENDENCIES = \
-  libgnunetutil.la
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
@@ -303,282 +285,283 @@
 test_bio_SOURCES = \
  test_bio.c
 test_bio_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 
 test_os_start_process_SOURCES = \
  test_os_start_process.c
 test_os_start_process_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la 
 test_os_start_process_DEPENDENCIES = \
+ libgnunetutil.la \
  $(WINCAT)
 
 test_client_nc_SOURCES = \
  test_client.c
 test_client_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_common_allocation_SOURCES = \
  test_common_allocation.c
 test_common_allocation_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_common_endian_SOURCES = \
  test_common_endian.c
 test_common_endian_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_common_logging_SOURCES = \
  test_common_logging.c
 test_common_logging_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_common_logging_runtime_loglevels_SOURCES = \
  test_common_logging_runtime_loglevels.c
 test_common_logging_runtime_loglevels_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_configuration_SOURCES = \
  test_configuration.c
 test_configuration_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_container_bloomfilter_SOURCES = \
  test_container_bloomfilter.c
 test_container_bloomfilter_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_container_meta_data_SOURCES = \
  test_container_meta_data.c
 test_container_meta_data_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la -lextractor
+ libgnunetutil.la -lextractor
 
 test_container_multihashmap_SOURCES = \
  test_container_multihashmap.c
 test_container_multihashmap_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_container_multihashmap32_SOURCES = \
  test_container_multihashmap32.c
 test_container_multihashmap32_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_container_multipeermap_SOURCES = \
  test_container_multipeermap.c
 test_container_multipeermap_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_container_heap_SOURCES = \
  test_container_heap.c
 test_container_heap_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_container_slist_SOURCES = \
  test_container_slist.c
 test_container_slist_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_crypto_symmetric_SOURCES = \
  test_crypto_symmetric.c
 test_crypto_symmetric_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_crypto_crc_SOURCES = \
  test_crypto_crc.c
 test_crypto_crc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_crypto_ecdsa_SOURCES = \
  test_crypto_ecdsa.c
 test_crypto_ecdsa_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunetutil.la \
  $(LIBGCRYPT_LIBS)
 
 test_crypto_eddsa_SOURCES = \
  test_crypto_eddsa.c
 test_crypto_eddsa_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunetutil.la \
  $(LIBGCRYPT_LIBS)
 
 test_crypto_ecdhe_SOURCES = \
  test_crypto_ecdhe.c
 test_crypto_ecdhe_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunetutil.la \
  $(LIBGCRYPT_LIBS)
 
 test_crypto_hash_SOURCES = \
  test_crypto_hash.c
 test_crypto_hash_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_crypto_hkdf_SOURCES = \
  test_crypto_hkdf.c
 test_crypto_hkdf_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_crypto_paillier_SOURCES = \
  test_crypto_paillier.c
 test_crypto_paillier_LDADD = \
  $(LIBGCRYPT_LIBS) \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_crypto_random_SOURCES = \
  test_crypto_random.c
 test_crypto_random_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_disk_SOURCES = \
  test_disk.c
 test_disk_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_getopt_SOURCES = \
  test_getopt.c
 test_getopt_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_connection_nc_SOURCES = \
  test_connection.c
 test_connection_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_connection_addressing_nc_SOURCES = \
  test_connection_addressing.c
 test_connection_addressing_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_connection_receive_cancel_nc_SOURCES = \
  test_connection_receive_cancel.c
 test_connection_receive_cancel_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_connection_timeout_nc_SOURCES = \
  test_connection_timeout.c
 test_connection_timeout_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_connection_timeout_no_connect_nc_SOURCES = \
  test_connection_timeout_no_connect.c
 test_connection_timeout_no_connect_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_connection_transmit_cancel_nc_SOURCES = \
  test_connection_transmit_cancel.c
 test_connection_transmit_cancel_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_mq_SOURCES = \
  test_mq.c
 test_mq_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_mq_client_nc_SOURCES = \
  test_mq_client.c
 test_mq_client_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_os_network_SOURCES = \
  test_os_network.c
 test_os_network_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_peer_SOURCES = \
  test_peer.c
 test_peer_LDADD = \
-$(top_builddir)/src/util/libgnunetutil.la -lgcrypt
+ libgnunetutil.la -lgcrypt
 
 test_plugin_SOURCES = \
  test_plugin.c
 test_plugin_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_program_SOURCES = \
  test_program.c
 test_program_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_resolver_api_nc_SOURCES = \
  test_resolver_api.c
 test_resolver_api_nc_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_scheduler_SOURCES = \
  test_scheduler.c
 test_scheduler_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_scheduler_delay_SOURCES = \
  test_scheduler_delay.c
 test_scheduler_delay_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_server_mst_interrupt_nc_SOURCES = \
  test_server_mst_interrupt.c
 test_server_mst_interrupt_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_server_nc_SOURCES = \
  test_server.c
 test_server_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_server_disconnect_nc_SOURCES = \
  test_server_disconnect.c
 test_server_disconnect_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_server_with_client_nc_SOURCES = \
  test_server_with_client.c
 test_server_with_client_nc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_server_with_client_unix_SOURCES = \
  test_server_with_client_unix.c
 test_server_with_client_unix_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 
 test_service_SOURCES = \
  test_service.c
 test_service_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_strings_SOURCES = \
  test_strings.c
 test_strings_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 
 test_strings_to_data_SOURCES = \
  test_strings_to_data.c
 test_strings_to_data_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 
 test_time_SOURCES = \
  test_time.c
 test_time_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 test_speedup_SOURCES = \
  test_speedup.c
 test_speedup_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 perf_crypto_hash_SOURCES = \
  perf_crypto_hash.c
 perf_crypto_hash_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 perf_crypto_symmetric_SOURCES = \
  perf_crypto_symmetric.c
 perf_crypto_symmetric_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 perf_malloc_SOURCES = \
  perf_malloc.c
 perf_malloc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+ libgnunetutil.la
 
 
 EXTRA_DIST = \

Modified: gnunet/src/vpn/Makefile.am
===================================================================
--- gnunet/src/vpn/Makefile.am  2014-09-13 12:39:21 UTC (rev 34290)
+++ gnunet/src/vpn/Makefile.am  2014-09-13 13:54:57 UTC (rev 34291)
@@ -67,12 +67,10 @@
 gnunet_vpn_SOURCES = \
  gnunet-vpn.c
 gnunet_vpn_LDADD = \
-  $(top_builddir)/src/vpn/libgnunetvpn.la \
+  libgnunetvpn.la \
   $(top_builddir)/src/tun/libgnunettun.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_vpn_DEPENDENCIES = \
-  libgnunetvpn.la
 
 libgnunetvpn_la_SOURCES = \
  vpn_api.c vpn.h




reply via email to

[Prev in Thread] Current Thread [Next in Thread]