X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdht%2FMakefile.am;h=f8918616f77157b67dc5963e3c3299e55c624efa;hb=52d396bb08d5621f7c0af2920a373d87d321cb63;hp=0baf6b00e0618560f97534395bada34453b271e9;hpb=c6ef80f13164795b0b53bc7c4c7cae2452cf861e;p=oweals%2Fgnunet.git

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 0baf6b00e..f8918616f 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/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 -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
 endif
@@ -10,11 +10,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 libexecdir= $(pkglibdir)/libexec/
 
 pkgcfg_DATA = \
-  dht.conf 
-
-if HAVE_ZLIB
- ZLIB_LNK = -lz
-endif
+  dht.conf
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -22,21 +18,21 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
- libgnunetdht.la 
+ libgnunetdht.la
 
 libgnunetdht_la_SOURCES = \
-  dht_api.c dht.h 
+  dht_api.c dht.h
 libgnunetdht_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB) \
   $(LTLIBINTL)
 libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 1:0:1
+  -version-info 2:0:2
 
 
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dht.la 
+  libgnunet_plugin_block_dht.la
 
 libgnunet_plugin_block_dht_la_SOURCES = \
   plugin_block_dht.c
@@ -48,17 +44,19 @@ libgnunet_plugin_block_dht_la_LIBADD = \
 libgnunet_plugin_block_dht_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_dht_la_DEPENDENCIES = \
-  $(top_builddir)/src/block/libgnunetblock.la 
+  $(top_builddir)/src/block/libgnunetblock.la
 
 
 
 libexec_PROGRAMS = \
- gnunet-service-dht 
+ gnunet-service-dht \
+ gnunet-service-dht-xvine
 
 noinst_PROGRAMS = \
  gnunet-dht-monitor \
  gnunet-dht-get \
- gnunet-dht-put
+ gnunet-dht-put \
+ gnunet-dht-profiler
 
 gnunet_service_dht_SOURCES = \
  gnunet-service-dht.c gnunet-service-dht.h \
@@ -67,7 +65,7 @@ gnunet_service_dht_SOURCES = \
  gnunet-service-dht_hello.c gnunet-service-dht_hello.h \
  gnunet-service-dht_nse.c gnunet-service-dht_nse.h \
  gnunet-service-dht_neighbours.c gnunet-service-dht_neighbours.h \
- gnunet-service-dht_routing.c gnunet-service-dht_routing.h 
+ gnunet-service-dht_routing.c gnunet-service-dht_routing.h
 gnunet_service_dht_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/core/libgnunetcore.la \
@@ -81,35 +79,69 @@ gnunet_service_dht_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   -lm
 
+gnunet_service_dht_xvine_SOURCES = \
+ gnunet-service-xdht.c gnunet-service-xdht.h \
+ gnunet-service-xdht_clients.c gnunet-service-xdht_clients.h \
+ gnunet-service-xdht_datacache.c gnunet-service-xdht_datacache.h \
+ gnunet-service-xdht_hello.c gnunet-service-xdht_hello.h \
+ gnunet-service-xdht_nse.c gnunet-service-xdht_nse.h \
+ gnunet-service-xdht_neighbours.c gnunet-service-xdht_neighbours.h \
+ gnunet-service-xdht_routing.c gnunet-service-xdht_routing.h
+gnunet_service_dht_xvine_LDADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/nse/libgnunetnse.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/datacache/libgnunetdatacache.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  -lm
+
+
+
 gnunet_dht_get_SOURCES = \
- gnunet-dht-get.c         
+ gnunet-dht-get.c
 gnunet_dht_get_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 gnunet_dht_get_DEPENDENCIES = \
-  libgnunetdht.la			      
+  libgnunetdht.la
 
 gnunet_dht_put_SOURCES = \
- gnunet-dht-put.c         
+ gnunet-dht-put.c
 gnunet_dht_put_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 gnunet_dht_put_DEPENDENCIES = \
-  libgnunetdht.la			      
+  libgnunetdht.la
 
 gnunet_dht_monitor_SOURCES = \
- gnunet-dht-monitor.c         
+ gnunet-dht-monitor.c
 gnunet_dht_monitor_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 gnunet_dht_monitor_DEPENDENCIES = \
-  libgnunetdht.la			      
+  libgnunetdht.la
 
+gnunet_dht_profiler_SOURCES = \
+  gnunet_dht_profiler.c
+gnunet_dht_profiler_LDADD = \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la
+gnunet_dht_profiler_DEPENDENCIES = \
+  libgnunetdht.la
 
+if HAVE_TESTING
 noinst_LIBRARIES = libgnunetdhttest.a
+endif
 
 libgnunetdhttest_a_SOURCES = \
   dht_test_lib.c dht_test_lib.h
@@ -118,15 +150,17 @@ libgnunetdhttest_a_LIBADD = \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/dht/libgnunetdht.la
 libgnunetdhttest_a_DEPENDENCIES = \
-  libgnunetdht.la   
+  libgnunetdht.la
 
+if HAVE_TESTING
 check_PROGRAMS = \
  test_dht_api \
  test_dht_twopeer \
  test_dht_multipeer \
  test_dht_line \
- test_dht_2dtorus 
-# test_dht_monitor
+ test_dht_2dtorus \
+ test_dht_monitor
+endif
 
 if HAVE_EXPERIMENTAL
 # These tests still do not work as testbed does
@@ -135,11 +169,12 @@ if HAVE_EXPERIMENTAL
 endif
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer \
  test_dht_line \
- $(NEW_TESTS) 
-# test_dht_monitor
+ test_dht_monitor \
+ $(NEW_TESTS)
 endif
 
 test_dht_api_SOURCES = \
@@ -150,16 +185,18 @@ test_dht_api_LDADD = \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_api_DEPENDENCIES = \
-  libgnunetdht.la			    
+  libgnunetdht.la
 
 test_dht_twopeer_SOURCES = \
  test_dht_topo.c
 test_dht_twopeer_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
- $(top_builddir)/src/dht/libgnunetdht.la    
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_twopeer_DEPENDENCIES = \
-  libgnunetdht.la			    
+  libgnunetdht.la
 
 test_dht_2dtorus_SOURCES = \
  test_dht_topo.c
@@ -177,25 +214,27 @@ test_dht_line_LDADD = \
  $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la 
+ $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_line_DEPENDENCIES = \
   libgnunetdht.la
 
 test_dht_multipeer_SOURCES = \
  test_dht_topo.c
 test_dht_multipeer_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
- $(top_builddir)/src/dht/libgnunetdht.la  
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
+ $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_multipeer_DEPENDENCIES = \
-  libgnunetdht.la			    
+  libgnunetdht.la
 
-# fixme, rewrite based on test_dht_topo.c!
-test_dht_monitor_SOURCES = test_dht_monitor.c
+test_dht_monitor_SOURCES = \
+  test_dht_monitor.c
 test_dht_monitor_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_monitor_DEPENDENCIES = \
   libgnunetdht.la
@@ -204,15 +243,17 @@ EXTRA_DIST = \
   $(check_SCRIPTS) \
   test_dht_api_data.conf \
   test_dht_api_peer1.conf \
-  test_dht_twopeer_data.conf \
+  test_dht_monitor.conf \
   test_dht_multipeer.conf \
   test_dht_2dtorus.conf \
   test_dht_line.conf \
   test_dht_tools.py.in \
   test_dht_multipeer_topology.dat
 
+if HAVE_PYTHON
 check_SCRIPTS = \
   test_dht_tools.py
+endif
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'