eliminating dead HELLO logic, not needed for x-vine/whanau

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

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index f35e1e18cf49006ef04ed8c10904f8c92f3a5fbe..2c820385f8663c233c6978b3af59d284391bb772 100644 (file)
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
@@ -43,19 +44,18 @@ libgnunet_plugin_block_dht_la_LIBADD = \
   $(LTLIBINTL)
 libgnunet_plugin_block_dht_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_block_dht_la_DEPENDENCIES = \
-  $(top_builddir)/src/block/libgnunetblock.la
-
 
 
 libexec_PROGRAMS = \
  gnunet-service-dht \
  gnunet-service-dht-xvine
+# gnunet-service-dht-whanau
 
 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 \
@@ -82,7 +82,6 @@ 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
@@ -99,34 +98,54 @@ gnunet_service_dht_xvine_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   -lm
 
-
+gnunet_service_dht_whanau_SOURCES = \
+ gnunet-service-wdht.c gnunet-service-wdht.h \
+ gnunet-service-wdht_clients.c gnunet-service-wdht_clients.h \
+ gnunet-service-wdht_datacache.c gnunet-service-wdht_datacache.h \
+ gnunet-service-wdht_nse.c gnunet-service-wdht_nse.h \
+ gnunet-service-wdht_neighbours.c gnunet-service-wdht_neighbours.h \
+ gnunet-service-wdht_routing.c gnunet-service-wdht_routing.h
+gnunet_service_dht_whanau_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_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_dht_get_DEPENDENCIES = \
-  libgnunetdht.la
 
 gnunet_dht_put_SOURCES = \
  gnunet-dht-put.c
 gnunet_dht_put_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_dht_put_DEPENDENCIES = \
-  libgnunetdht.la
 
 gnunet_dht_monitor_SOURCES = \
  gnunet-dht-monitor.c
 gnunet_dht_monitor_LDADD = \
-  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la
-gnunet_dht_monitor_DEPENDENCIES = \
-  libgnunetdht.la
+
+gnunet_dht_profiler_SOURCES = \
+  gnunet_dht_profiler.c
+gnunet_dht_profiler_LDADD = \
+  libgnunetdht.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la
 
 if HAVE_TESTING
 noinst_LIBRARIES = libgnunetdhttest.a
@@ -137,9 +156,7 @@ libgnunetdhttest_a_SOURCES = \
 libgnunetdhttest_a_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-libgnunetdhttest_a_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 if HAVE_TESTING
 check_PROGRAMS = \
@@ -158,7 +175,7 @@ if HAVE_EXPERIMENTAL
 endif
 
 if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
+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 \
@@ -172,61 +189,49 @@ test_dht_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(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 \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ 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
 test_dht_2dtorus_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_2dtorus_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 test_dht_line_SOURCES = \
  test_dht_topo.c
 test_dht_line_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_line_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 test_dht_multipeer_SOURCES = \
  test_dht_topo.c
 test_dht_multipeer_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_multipeer_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 test_dht_monitor_SOURCES = \
   test_dht_monitor.c
 test_dht_monitor_LDADD = \
- $(top_builddir)/src/dht/libgnunetdhttest.a \
+ libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/dht/libgnunetdht.la
-test_dht_monitor_DEPENDENCIES = \
-  libgnunetdht.la
+ libgnunetdht.la
 
 EXTRA_DIST = \
   $(check_SCRIPTS) \