From: Nathan S. Evans <evans@in.tum.de>
Date: Wed, 2 Feb 2011 12:59:36 +0000 (+0000)
Subject: makefile was broken
X-Git-Tag: initial-import-from-subversion-38251~19211
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fc4f99d07a316eb612bc8f936cbf3252caefcad0;p=oweals%2Fgnunet.git

makefile was broken
---

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index ddcfccd46..c0d9bab13 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -52,7 +52,7 @@ libgnunet_plugin_dhtlog_mysql_dump_la_LIBADD = \
   $(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 = \
@@ -69,7 +69,6 @@ libgnunetdhtlog_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) $(WINFLAGS) \
   -version-info 0:0:0
 
-libgnunetdht_la_SOURCES = \
 libgnunetdht_la_SOURCES = \
   dht_api.c dht.h \
   dht_api_get_put.c \
@@ -85,10 +84,12 @@ bin_PROGRAMS = $(STUD_PROGS) \
  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 @@ check_PROGRAMS = $(STUD_TESTS) \
  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_LDADD = \
 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 @@ test_dht_twopeer_put_get_LDADD = \
  $(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 = \