WiP

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

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 592d6ea52341d95c2378f18e8662183dc1da0cf6..8fa84d2fa52bc54d086950fde439cb97807281ab 100644 (file)
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -20,9 +20,22 @@ endif
 
 lib_LTLIBRARIES = libgnunetdht.la \
  libgnunetdhtlog.la
- 
+
 plugin_LTLIBRARIES = \
- libgnunet_plugin_dhtlog_dummy.la $(MYSQL_PLUGIN)
+ $(MYSQL_PLUGIN) \
+ libgnunet_plugin_dhtlog_dummy.la \
+ libgnunet_plugin_dhtlog_mysql_dump.la \
+ libgnunet_plugin_dhtlog_mysql_dump_load.la  
+
+
+libgnunet_plugin_dhtlog_mysql_la_SOURCES = \
+  plugin_dhtlog_mysql.c
+libgnunet_plugin_dhtlog_mysql_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lz -lsqlite3
+libgnunet_plugin_dhtlog_mysql_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS) $(MYSQL_LDFLAGS) -lmysqlclient
+libgnunet_plugin_dhtlog_mysql_la_CPFLAGS = \
+ $(MYSQL_CPPFLAGS)
 
 libgnunet_plugin_dhtlog_dummy_la_SOURCES = \
   plugin_dhtlog_dummy.c
@@ -32,16 +45,22 @@ libgnunet_plugin_dhtlog_dummy_la_LIBADD = \
 libgnunet_plugin_dhtlog_dummy_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
-if HAVE_MYSQL
-libgnunet_plugin_dhtlog_mysql_la_SOURCES = \
-  plugin_dhtlog_mysql.c
-libgnunet_plugin_dhtlog_mysql_la_LIBADD = \
+libgnunet_plugin_dhtlog_mysql_dump_la_SOURCES = \
+  plugin_dhtlog_mysql_dump.c
+libgnunet_plugin_dhtlog_mysql_dump_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB)
-libgnunet_plugin_dhtlog_mysql_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) -lmysqlclient $(ZLIB_LNK)
-endif 
- 
+libgnunet_plugin_dhtlog_mysql_dump_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+libgnunet_plugin_dhtlog_mysql_dump_load_la_SOURCES = \
+  plugin_dhtlog_mysql_dump_load.c
+libgnunet_plugin_dhtlog_mysql_dump_load_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIB)
+libgnunet_plugin_dhtlog_mysql_dump_load_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
 libgnunetdhtlog_la_SOURCES = \
   dhtlog.c dhtlog.h
 libgnunetdhtlog_la_LIBADD = \
@@ -51,7 +70,9 @@ libgnunetdhtlog_la_LDFLAGS = \
   -version-info 0:0:0
 
 libgnunetdht_la_SOURCES = \
-  dht_api.c dht.h
+  dht_api.c dht.h \
+  dht_api_get_put.c \
+  dht_api_find_peer.c 
 libgnunetdht_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(XLIB)
@@ -59,14 +80,16 @@ libgnunetdht_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
-bin_PROGRAMS = \
+bin_PROGRAMS = $(STUD_PROGS) \
  gnunet-service-dht \
  gnunet-dht-get \
  gnunet-dht-get-peer \
- gnunet-dht-put 
+ gnunet-dht-put
 
+if HAVE_MALICIOUS
 noinst_PROGRAMS = \
- gnunet-dht-driver
+ gnunet-dht-driver 
+endif
 
 gnunet_service_dht_SOURCES = \
  gnunet-service-dht.c         
@@ -75,9 +98,12 @@ gnunet_service_dht_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/transport/libgnunettransport.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 \
-  $(top_builddir)/src/dht/libgnunetdhtlog.la
+  $(top_builddir)/src/dht/libgnunetdhtlog.la -lm
+gnunet_service_dht_DEPENDENCIES = \
+  libgnunetdhtlog.la                             
 
 gnunet_dht_get_SOURCES = \
  gnunet-dht-get.c         
@@ -85,6 +111,8 @@ gnunet_dht_get_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la 
+gnunet_dht_get_DEPENDENCIES = \
+  libgnunetdht.la                            
 
 gnunet_dht_get_peer_SOURCES = \
  gnunet-dht-get-peer.c         
@@ -93,6 +121,8 @@ gnunet_dht_get_peer_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la 
+gnunet_dht_get_peer_DEPENDENCIES = \
+  libgnunetdht.la                            
 
 gnunet_dht_put_SOURCES = \
  gnunet-dht-put.c         
@@ -100,6 +130,8 @@ gnunet_dht_put_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/util/libgnunetutil.la 
+gnunet_dht_put_DEPENDENCIES = \
+  libgnunetdht.la                            
 
 gnunet_dht_driver_SOURCES = \
  gnunet-dht-driver.c         
@@ -110,15 +142,28 @@ gnunet_dht_driver_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/dht/libgnunetdhtlog.la
+gnunet_dht_driver_DEPENDENCIES = \
+  libgnunetdht.la \
+  libgnunetdhtlog.la  
 
-check_PROGRAMS = \
+
+check_PROGRAMS = $(STUD_TESTS) \
  test_dht_api \
  test_dht_twopeer \
  test_dht_twopeer_put_get \
- test_dht_multipeer
-# test_dhtlog
+ test_dht_twopeer_path_tracking \
+ test_dht_multipeer \
+ test_dhtlog 
+# test_hash_operations
 
-TESTS = test_dht_api $(check_SCRIPTS)
+if !DISABLE_TEST_RUN
+TESTS = test_dht_api $(check_SCRIPTS) \
+ test_dht_twopeer \
+ test_dht_twopeer_put_get \
+ test_dht_twopeer_path_tracking \
+ test_dht_multipeer \
+ test_dhtlog
+endif
 
 test_dht_api_SOURCES = \
  test_dht_api.c
@@ -126,6 +171,8 @@ test_dht_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/dht/libgnunetdht.la
+test_dht_api_DEPENDENCIES = \
+  libgnunetdht.la                          
 
 test_dht_multipeer_SOURCES = \
  test_dht_multipeer.c
@@ -133,6 +180,15 @@ test_dht_multipeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/dht/libgnunetdht.la  
+test_dht_multipeer_DEPENDENCIES = \
+  libgnunetdht.la                          
+ 
+#test_hash_operations_SOURCES = \
+# test_hash_operations.c
+#test_hash_operations_LDADD = \
+# $(top_builddir)/src/util/libgnunetutil.la \
+# $(top_builddir)/src/testing/libgnunettesting.la \
+# $(top_builddir)/src/dht/libgnunetdht.la 
 
 test_dht_twopeer_SOURCES = \
  test_dht_twopeer.c
@@ -140,6 +196,8 @@ test_dht_twopeer_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/dht/libgnunetdht.la    
+test_dht_twopeer_DEPENDENCIES = \
+  libgnunetdht.la                          
 
 test_dht_twopeer_put_get_SOURCES = \
  test_dht_twopeer_put_get.c
@@ -148,13 +206,20 @@ test_dht_twopeer_put_get_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/dht/libgnunetdht.la   
 
-#test_dhtlog_SOURCES = \
-# test_dhtlog.c
-#test_dhtlog_LDADD = \
-# $(top_builddir)/src/util/libgnunetutil.la \
-# $(top_builddir)/src/testing/libgnunettesting.la \
-# $(top_builddir)/src/dht/libgnunetdht.la \
-# $(top_builddir)/src/dht/libgnunetdhtlog.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/dht/libgnunetdht.la   
+
+test_dhtlog_SOURCES = \
+ test_dhtlog.c
+test_dhtlog_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/dht/libgnunetdhtlog.la
 
 EXTRA_DIST = \
   $(check_SCRIPTS) \