LRN: Fix automake deps to allow -j* builds again

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

diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index 99a3e6114c61b0332335fcd95b027548b43ee56a..d505e31c41a0c8d0b9e674b54728932c2410f429 100644 (file)
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -32,11 +32,15 @@ bin_PROGRAMS = \
 gnunet_service_dv_SOURCES = \
  gnunet-service-dv.c         
 gnunet_service_dv_LDADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/dv/libgnunetdv.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+gnunet_service_dv_DEPENDENCIES = \
+  libgnunetdv.la                                
 
 libgnunet_plugin_transport_dv_la_SOURCES = \
   plugin_transport_dv.c
@@ -47,33 +51,24 @@ libgnunet_plugin_transport_dv_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_dv_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
- 
- 
+libgnunet_plugin_transport_dv_la_DEPENDENCIES = \
+  libgnunetdv.la                                               
+
 check_PROGRAMS = \
  test_transport_api_dv
 # test_dv_topology
- 
+
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+endif
 
 test_transport_api_dv_SOURCES = \
  test_transport_api_dv.c
 test_transport_api_dv_LDADD = \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la
 
-#test_dv_topology_SOURCES = \
-# test_dv_topology.c
-#test_dv_topology_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransport.la \
-# $(top_builddir)/src/util/libgnunetutil.la  \
-# $(top_builddir)/src/testing/libgnunettesting.la
-
-
 EXTRA_DIST = \
-  test_transport_dv_data.conf \
-  test_transport_api_dv_peer1.conf \
-  test_transport_api_dv_peer2.conf \
-  test_transport_api_dv_peer3.conf
-
-
+  test_transport_dv_data.conf