aboutsummaryrefslogtreecommitdiff
path: root/src/dht
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2011-02-02 12:59:36 +0000
committerNathan S. Evans <evans@in.tum.de>2011-02-02 12:59:36 +0000
commitfc4f99d07a316eb612bc8f936cbf3252caefcad0 (patch)
tree6e4a1649bb5b55514c983ae2bda6e3d92f15e92f /src/dht
parente0be51ca71644e74940fe0c6545cf1528ec844de (diff)
downloadgnunet-fc4f99d07a316eb612bc8f936cbf3252caefcad0.tar.gz
gnunet-fc4f99d07a316eb612bc8f936cbf3252caefcad0.zip
makefile was broken
Diffstat (limited to 'src/dht')
-rw-r--r--src/dht/Makefile.am23
1 files changed, 16 insertions, 7 deletions
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 = \
52 $(XLIB) 52 $(XLIB)
53libgnunet_plugin_dhtlog_mysql_dump_la_LDFLAGS = \ 53libgnunet_plugin_dhtlog_mysql_dump_la_LDFLAGS = \
54 $(GN_PLUGIN_LDFLAGS) 54 $(GN_PLUGIN_LDFLAGS)
55 55
56libgnunet_plugin_dhtlog_mysql_dump_load_la_SOURCES = \ 56libgnunet_plugin_dhtlog_mysql_dump_load_la_SOURCES = \
57 plugin_dhtlog_mysql_dump_load.c 57 plugin_dhtlog_mysql_dump_load.c
58libgnunet_plugin_dhtlog_mysql_dump_load_la_LIBADD = \ 58libgnunet_plugin_dhtlog_mysql_dump_load_la_LIBADD = \
@@ -70,7 +70,6 @@ libgnunetdhtlog_la_LDFLAGS = \
70 -version-info 0:0:0 70 -version-info 0:0:0
71 71
72libgnunetdht_la_SOURCES = \ 72libgnunetdht_la_SOURCES = \
73libgnunetdht_la_SOURCES = \
74 dht_api.c dht.h \ 73 dht_api.c dht.h \
75 dht_api_get_put.c \ 74 dht_api_get_put.c \
76 dht_api_find_peer.c 75 dht_api_find_peer.c
@@ -85,10 +84,12 @@ bin_PROGRAMS = $(STUD_PROGS) \
85 gnunet-service-dht \ 84 gnunet-service-dht \
86 gnunet-dht-get \ 85 gnunet-dht-get \
87 gnunet-dht-get-peer \ 86 gnunet-dht-get-peer \
88 gnunet-dht-put \ 87 gnunet-dht-put
89 gnunet-dht-driver
90 88
91noinst_PROGRAMS = $(check_PROGRAMS) 89if HAVE_MALICIOUS
90noinst_PROGRAMS = \
91 gnunet-dht-driver
92endif
92 93
93gnunet_service_dht_SOURCES = \ 94gnunet_service_dht_SOURCES = \
94 gnunet-service-dht.c 95 gnunet-service-dht.c
@@ -152,7 +153,8 @@ check_PROGRAMS = $(STUD_TESTS) \
152 test_dht_twopeer_put_get \ 153 test_dht_twopeer_put_get \
153 test_dht_twopeer_path_tracking \ 154 test_dht_twopeer_path_tracking \
154 test_dht_multipeer \ 155 test_dht_multipeer \
155 test_dhtlog 156 test_dhtlog
157# test_hash_operations
156 158
157if !DISABLE_TEST_RUN 159if !DISABLE_TEST_RUN
158TESTS = test_dht_api $(check_SCRIPTS) \ 160TESTS = test_dht_api $(check_SCRIPTS) \
@@ -181,6 +183,13 @@ test_dht_multipeer_LDADD = \
181test_dht_multipeer_DEPENDENCIES = \ 183test_dht_multipeer_DEPENDENCIES = \
182 libgnunetdht.la 184 libgnunetdht.la
183 185
186#test_hash_operations_SOURCES = \
187# test_hash_operations.c
188#test_hash_operations_LDADD = \
189# $(top_builddir)/src/util/libgnunetutil.la \
190# $(top_builddir)/src/testing/libgnunettesting.la \
191# $(top_builddir)/src/dht/libgnunetdht.la
192
184test_dht_twopeer_SOURCES = \ 193test_dht_twopeer_SOURCES = \
185 test_dht_twopeer.c 194 test_dht_twopeer.c
186test_dht_twopeer_LDADD = \ 195test_dht_twopeer_LDADD = \
@@ -196,7 +205,7 @@ test_dht_twopeer_put_get_LDADD = \
196 $(top_builddir)/src/util/libgnunetutil.la \ 205 $(top_builddir)/src/util/libgnunetutil.la \
197 $(top_builddir)/src/testing/libgnunettesting.la \ 206 $(top_builddir)/src/testing/libgnunettesting.la \
198 $(top_builddir)/src/dht/libgnunetdht.la 207 $(top_builddir)/src/dht/libgnunetdht.la
199 208
200test_dht_twopeer_path_tracking_SOURCES = \ 209test_dht_twopeer_path_tracking_SOURCES = \
201 test_dht_twopeer_path_tracking.c 210 test_dht_twopeer_path_tracking.c
202test_dht_twopeer_path_tracking_LDADD = \ 211test_dht_twopeer_path_tracking_LDADD = \