X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdht%2FMakefile.am;h=1a174165cc798651757277fd4220160fa1abf39b;hb=5b32752cd7b02adcb8e6fec7798637638c6f63a0;hp=6e59178b1ed32e0b39c0f6471cf37ed0d2c4e2ec;hpb=d94c5185fcdf47c6a57d3233b946fa7e621f7ad9;p=oweals%2Fgnunet.git

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 6e59178b1..1a174165c 100644
--- 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
@@ -28,7 +29,7 @@ libgnunetdht_la_LIBADD = \
   $(LTLIBINTL)
 libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 2:0:2
+  -version-info 3:0:0
 
 
 plugin_LTLIBRARIES = \
@@ -46,18 +47,26 @@ libgnunet_plugin_block_dht_la_LDFLAGS = \
 
 
 libexec_PROGRAMS = \
- gnunet-service-dht \
- gnunet-service-dht-xvine
+ gnunet-service-dht
+
+if HAVE_EXPERIMENTAL
+libexec_PROGRAMS += \
+ gnunet-service-dht-xvine \
+ gnunet-service-dht-whanau
+endif
 
 noinst_PROGRAMS = \
  gnunet-dht-monitor \
  gnunet-dht-get \
- gnunet-dht-put \
+ gnunet-dht-put
+
+if HAVE_TESTING
+noinst_PROGRAMS += \
  gnunet-dht-profiler
+endif
 
 gnunet_service_dht_SOURCES = \
  gnunet-service-dht.c gnunet-service-dht.h \
- gnunet-service-dht_clients.c gnunet-service-dht_clients.h \
  gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
  gnunet-service-dht_hello.c gnunet-service-dht_hello.h \
  gnunet-service-dht_nse.c gnunet-service-dht_nse.h \
@@ -77,13 +86,12 @@ gnunet_service_dht_LDADD = \
   -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.c gnunet-service-dht.h \
+ gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
+ gnunet-service-dht_nse.c gnunet-service-dht_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 \
@@ -97,7 +105,23 @@ 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-dht_datacache.c gnunet-service-dht_datacache.h \
+ gnunet-service-dht_nse.c gnunet-service-dht_nse.h \
+ gnunet-service-wdht_neighbours.c gnunet-service-dht_neighbours.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