-style fix

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

diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index e9e2bba3f1365ecb25696342b804019a6abcf8ea..33a291292e78de930d613c511fbebd90551fa07e 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)
@@ -32,42 +32,69 @@ libgnunetdv_la_LDFLAGS = \
   -version-info 0:0:0
 
 
+noinst_PROGRAMS = \
+ gnunet-dv
+
 libexec_PROGRAMS = \
  gnunet-service-dv
 
 gnunet_service_dv_SOURCES = \
  gnunet-service-dv.c dv.h
 gnunet_service_dv_LDADD = \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/set/libgnunetset.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
+gnunet_dv_SOURCES = \
+ gnunet-dv.c dv.h
+gnunet_dv_LDADD = \
+  libgnunetdv.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
 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/util/libgnunetutil.la 
 libgnunet_plugin_transport_dv_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_transport_dv_la_DEPENDENCIES = \
+  $(top_builddir)/src/ats/libgnunetats.la \
   libgnunetdv.la                                               
 
-#check_PROGRAMS = \
-# test_transport_api_dv
-# test_dv_topology
+if HAVE_TESTING
+check_PROGRAMS = \
+ test_transport_blacklist \
+ test_transport_dv
+endif
 
 if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+ TESTS = $(check_PROGRAMS) 
 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 
+test_transport_dv_SOURCES = \
+ test_transport_dv.c
+test_transport_dv_LDADD = \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
+
+test_transport_blacklist_SOURCES = \
+ test_transport_blacklist.c
+test_transport_blacklist_LDADD = \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(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 
+  test_transport_dv_data.conf \
+  test_transport_blacklist_data.conf \
+  template_dv.conf