maintain argv for helpers

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

diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index 0dc4afb085abb78a9daa57dad8519d621e67e9be..0fa26a90d3883136e54ed84bce9ca5424499c05e 100644 (file)
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -11,6 +11,13 @@ endif
 
 plugindir = $(libdir)/gnunet
 
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  dv.conf
+
 lib_LTLIBRARIES = libgnunetdv.la
 
 plugin_LTLIBRARIES = libgnunet_plugin_transport_dv.la
@@ -26,17 +33,21 @@ libgnunetdv_la_LDFLAGS = \
   -version-info 0:0:0
 
 
-bin_PROGRAMS = \
+libexec_PROGRAMS = \
  gnunet-service-dv
 
 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,22 +58,23 @@ libgnunet_plugin_transport_dv_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 libgnunet_plugin_transport_dv_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
- 
- 
-check_PROGRAMS = \
- test_transport_api_dv
- 
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+libgnunet_plugin_transport_dv_la_DEPENDENCIES = \
+  libgnunetdv.la                                               
 
-test_transport_api_dv_SOURCES = \
- test_transport_api_dv.c
-test_transport_api_dv_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la 
+#check_PROGRAMS = \
+# test_transport_api_dv
+# test_dv_topology
 
-EXTRA_DIST = \
-  test_transport_api_dv_peer1.conf \
-  test_transport_api_dv_peer2.conf \
-  test_transport_api_dv_peer3.conf
+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 
 
+EXTRA_DIST = \
+  test_transport_dv_data.conf