X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdv%2FMakefile.am;h=33a291292e78de930d613c511fbebd90551fa07e;hb=38c6188791c21c815d4260593116698fa6b1bf4d;hp=3050f33cc994904f924ee43e595fcbe1bdd21a12;hpb=82bc3225b7b1167f04b92ec5ef7799b0d3c884ef;p=oweals%2Fgnunet.git

diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am
index 3050f33cc..33a291292 100644
--- 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 
@@ -11,6 +11,8 @@ endif
 
 plugindir = $(libdir)/gnunet
 
+libexecdir= $(pkglibdir)/libexec/
+
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 pkgcfg_DATA = \
@@ -21,57 +23,78 @@ lib_LTLIBRARIES = libgnunetdv.la
 plugin_LTLIBRARIES = libgnunet_plugin_transport_dv.la
 
 libgnunetdv_la_SOURCES = \
-  dv_api.c dv.h
+  dv_api.c dv.h 
 libgnunetdv_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
   $(GN_LIBINTL) $(XLIB)
 libgnunetdv_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
 
 
-bin_PROGRAMS = \
+noinst_PROGRAMS = \
+ gnunet-dv
+
+libexec_PROGRAMS = \
  gnunet-service-dv
 
 gnunet_service_dv_SOURCES = \
- gnunet-service-dv.c         
+ 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/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				 
+
+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 = \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/dv/libgnunetdv.la \
-  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  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 
-#EXTRA_DIST = \
-#  test_transport_dv_data.conf
+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_blacklist_data.conf \
+  template_dv.conf
+