-indent, doxygen

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

diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index 72e8fa4a85d089cd2b788bf87ac252d780e0d655..db4e1f1d505592b3f6304cf8e903895f0e6121b3 100644 (file)
--- a/src/dv/Makefile.am
+++ b/src/dv/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
@@ -23,7 +23,7 @@ lib_LTLIBRARIES = libgnunetdv.la
 plugin_LTLIBRARIES = libgnunet_plugin_transport_dv.la
 
 libgnunetdv_la_SOURCES = \
-  dv_api.c dv.h gnunet_dv_service.h
+  dv_api.c dv.h 
 libgnunetdv_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB)
@@ -59,10 +59,14 @@ libgnunet_plugin_transport_dv_la_SOURCES = \
   plugin_transport_dv.c
 libgnunet_plugin_transport_dv_la_LIBADD = \
   libgnunetdv.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
   $(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
@@ -72,6 +76,7 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
  TESTS = $(check_PROGRAMS) 
 endif
 
@@ -93,5 +98,6 @@ test_transport_blacklist_LDADD = \
 
 EXTRA_DIST = \
   test_transport_dv_data.conf \
-  test_transport_blacklist_data.conf 
+  test_transport_blacklist_data.conf \
+  template_dv.conf