[GNUnet-SVN] r14314 - gnunet/src/dht

[gnunet]

Author: nevans
Date: 2011-02-02 13:59:36 +0100 (Wed, 02 Feb 2011)
New Revision: 14314

Modified:
   gnunet/src/dht/Makefile.am
Log:
makefile was broken

Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am  2011-02-02 12:50:55 UTC (rev 14313)
+++ gnunet/src/dht/Makefile.am  2011-02-02 12:59:36 UTC (rev 14314)
@@ -52,7 +52,7 @@
   $(XLIB)
 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 = \
@@ -70,7 +70,6 @@
   -version-info 0:0:0
 
 libgnunetdht_la_SOURCES = \
-libgnunetdht_la_SOURCES = \
   dht_api.c dht.h \
   dht_api_get_put.c \
   dht_api_find_peer.c 
@@ -85,10 +84,12 @@
  gnunet-service-dht \
  gnunet-dht-get \
  gnunet-dht-get-peer \
- gnunet-dht-put \
- gnunet-dht-driver
+ gnunet-dht-put 
 
-noinst_PROGRAMS = $(check_PROGRAMS)
+if HAVE_MALICIOUS
+noinst_PROGRAMS = \
+ gnunet-dht-driver 
+endif
 
 gnunet_service_dht_SOURCES = \
  gnunet-service-dht.c         
@@ -152,7 +153,8 @@
  test_dht_twopeer_put_get \
  test_dht_twopeer_path_tracking \
  test_dht_multipeer \
- test_dhtlog
+ test_dhtlog 
+# test_hash_operations
 
 if !DISABLE_TEST_RUN
 TESTS = test_dht_api $(check_SCRIPTS) \
@@ -181,6 +183,13 @@
 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
 test_dht_twopeer_LDADD = \
@@ -196,7 +205,7 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.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 = \