-fix

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

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index ccb521cee6a90d8ed99c6e2d99c1a98fdbe404a6..a7d22c0edfbf90ade5015b556bdc8e06f14e9f6c 100644 (file)
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -26,7 +26,8 @@ libgnunetdht_la_SOURCES = \
   dht_api.c dht.h 
 libgnunetdht_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
+  $(XLIB) \
+  $(LTLIBINTL)
 libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 1:0:1
@@ -40,7 +41,8 @@ libgnunet_plugin_block_dht_la_SOURCES = \
 libgnunet_plugin_block_dht_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
 libgnunet_plugin_block_dht_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_dht_la_DEPENDENCIES = \
@@ -50,6 +52,7 @@ libgnunet_plugin_block_dht_la_DEPENDENCIES = \
 
 bin_PROGRAMS = \
  gnunet-service-dht \
+ gnunet-dht-monitor \
  gnunet-dht-get \
  gnunet-dht-put
 
@@ -92,6 +95,16 @@ gnunet_dht_put_LDADD = \
 gnunet_dht_put_DEPENDENCIES = \
   libgnunetdht.la                            
 
+gnunet_dht_monitor_SOURCES = \
+ 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 
+gnunet_dht_monitor_DEPENDENCIES = \
+  libgnunetdht.la                            
+
+
 check_PROGRAMS = \
  test_dht_api \
  test_dht_twopeer \
@@ -119,6 +132,7 @@ test_dht_api_SOURCES = \
  test_dht_api.c
 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 = \
@@ -128,7 +142,7 @@ test_dht_twopeer_SOURCES = \
  test_dht_twopeer.c
 test_dht_twopeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/dht/libgnunetdht.la    
 test_dht_twopeer_DEPENDENCIES = \
   libgnunetdht.la                          
@@ -137,21 +151,21 @@ test_dht_twopeer_put_get_SOURCES = \
  test_dht_twopeer_put_get.c
 test_dht_twopeer_put_get_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/dht/libgnunetdht.la   
 
 test_dht_twopeer_get_put_SOURCES = \
  test_dht_twopeer_get_put.c
 test_dht_twopeer_get_put_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/dht/libgnunetdht.la   
 
 test_dht_twopeer_path_tracking_SOURCES = \
  test_dht_twopeer_path_tracking.c
 test_dht_twopeer_path_tracking_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/dht/libgnunetdht.la   
 
 test_dht_multipeer_SOURCES = \
@@ -159,7 +173,7 @@ test_dht_multipeer_SOURCES = \
 test_dht_multipeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/dht/libgnunetdht.la  
 test_dht_multipeer_DEPENDENCIES = \
   libgnunetdht.la                          
@@ -168,7 +182,7 @@ test_dht_2dtorus_SOURCES = \
  test_dht_topo.c
 test_dht_2dtorus_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_2dtorus_DEPENDENCIES = \
   libgnunetdht.la
@@ -177,7 +191,7 @@ test_dht_line_SOURCES = \
  test_dht_topo.c
 test_dht_line_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_line_DEPENDENCIES = \
   libgnunetdht.la
@@ -185,7 +199,7 @@ test_dht_line_DEPENDENCIES = \
 test_dht_monitor_SOURCES = test_dht_monitor.c
 test_dht_monitor_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/dht/libgnunetdht.la
 test_dht_monitor_DEPENDENCIES = \
   libgnunetdht.la
@@ -197,7 +211,19 @@ EXTRA_DIST = \
   test_dht_twopeer_data.conf \
   test_dht_multipeer_data.conf \
   test_dht_2dtorus.conf \
+  test_dht_line.conf \
+  test_dht_tools.py.in \
   multipeer_topo.dat
 
 check_SCRIPTS = \
-  test_dht_tools.sh
+  test_dht_tools.py
+
+do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
+
+%.py: %.py.in Makefile
+       $(do_subst) < $(srcdir)/$< > $@
+       chmod +x $@
+
+test_dht_tools.py: test_dht_tools.py.in Makefile
+       $(do_subst) < $(srcdir)/test_dht_tools.py.in > test_dht_tools.py
+       chmod +x test_dht_tools.py