diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-06-20 21:37:40 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-06-20 21:37:40 +0000 |
commit | 857d663744c0657f75d298e0f48e3bf444c07f42 (patch) | |
tree | be9f9d1d45fe2ba56e9b64fcc2838f8ee727fdc9 /src/regex/Makefile.am | |
parent | 787064590f251187bfbe6e33da38c5782f80ada2 (diff) | |
download | gnunet-857d663744c0657f75d298e0f48e3bf444c07f42.tar.gz gnunet-857d663744c0657f75d298e0f48e3bf444c07f42.zip |
fix linker issues on W32 -- regex needs DHT
Diffstat (limited to 'src/regex/Makefile.am')
-rw-r--r-- | src/regex/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index 0c45eeb8f..2c20c5904 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am | |||
@@ -92,6 +92,7 @@ gnunet_regex_simulation_profiler_SOURCES = \ | |||
92 | gnunet_regex_simulation_profiler_LDADD = \ | 92 | gnunet_regex_simulation_profiler_LDADD = \ |
93 | $(top_builddir)/src/util/libgnunetutil.la \ | 93 | $(top_builddir)/src/util/libgnunetutil.la \ |
94 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | 94 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ |
95 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
95 | $(top_builddir)/src/mysql/libgnunetmysql.la | 96 | $(top_builddir)/src/mysql/libgnunetmysql.la |
96 | gnunet_regex_simulation_profiler_DEPENDENCIES = \ | 97 | gnunet_regex_simulation_profiler_DEPENDENCIES = \ |
97 | libgnunetregex_internal.a | 98 | libgnunetregex_internal.a |
@@ -117,6 +118,7 @@ perf_regex_SOURCES = \ | |||
117 | perf-regex.c | 118 | perf-regex.c |
118 | perf_regex_LDADD = -lm \ | 119 | perf_regex_LDADD = -lm \ |
119 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | 120 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ |
121 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
120 | $(top_builddir)/src/regex/libgnunetregexblock.la \ | 122 | $(top_builddir)/src/regex/libgnunetregexblock.la \ |
121 | $(top_builddir)/src/regex/libgnunetregextest.a \ | 123 | $(top_builddir)/src/regex/libgnunetregextest.a \ |
122 | $(top_builddir)/src/util/libgnunetutil.la | 124 | $(top_builddir)/src/util/libgnunetutil.la |
@@ -128,9 +130,9 @@ gnunet_regex_profiler_SOURCES = \ | |||
128 | gnunet-regex-profiler.c | 130 | gnunet-regex-profiler.c |
129 | gnunet_regex_profiler_LDADD = -lm \ | 131 | gnunet_regex_profiler_LDADD = -lm \ |
130 | $(top_builddir)/src/arm/libgnunetarm.la \ | 132 | $(top_builddir)/src/arm/libgnunetarm.la \ |
131 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
132 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 133 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
133 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | 134 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ |
135 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
134 | $(top_builddir)/src/regex/libgnunetregexblock.la \ | 136 | $(top_builddir)/src/regex/libgnunetregexblock.la \ |
135 | $(top_builddir)/src/regex/libgnunetregextest.a \ | 137 | $(top_builddir)/src/regex/libgnunetregextest.a \ |
136 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 138 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
@@ -145,8 +147,8 @@ gnunet_regex_profiler_DEPENDENCIES = \ | |||
145 | gnunet_daemon_regexprofiler_SOURCES = \ | 147 | gnunet_daemon_regexprofiler_SOURCES = \ |
146 | gnunet-daemon-regexprofiler.c | 148 | gnunet-daemon-regexprofiler.c |
147 | gnunet_daemon_regexprofiler_LDADD = -lm \ | 149 | gnunet_daemon_regexprofiler_LDADD = -lm \ |
148 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
149 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | 150 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ |
151 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
150 | $(top_builddir)/src/regex/libgnunetregexblock.la \ | 152 | $(top_builddir)/src/regex/libgnunetregexblock.la \ |
151 | $(top_builddir)/src/regex/libgnunetregextest.a \ | 153 | $(top_builddir)/src/regex/libgnunetregextest.a \ |
152 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 154 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
@@ -172,6 +174,7 @@ test_regex_eval_api_SOURCES = \ | |||
172 | test_regex_eval_api.c | 174 | test_regex_eval_api.c |
173 | test_regex_eval_api_LDADD = -lm \ | 175 | test_regex_eval_api_LDADD = -lm \ |
174 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | 176 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ |
177 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
175 | $(top_builddir)/src/regex/libgnunetregextest.a \ | 178 | $(top_builddir)/src/regex/libgnunetregextest.a \ |
176 | $(top_builddir)/src/regex/libgnunetregexblock.la \ | 179 | $(top_builddir)/src/regex/libgnunetregexblock.la \ |
177 | $(top_builddir)/src/util/libgnunetutil.la | 180 | $(top_builddir)/src/util/libgnunetutil.la |
@@ -180,6 +183,7 @@ test_regex_iterate_api_SOURCES = \ | |||
180 | test_regex_iterate_api.c | 183 | test_regex_iterate_api.c |
181 | test_regex_iterate_api_LDADD = -lm \ | 184 | test_regex_iterate_api_LDADD = -lm \ |
182 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | 185 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ |
186 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
183 | $(top_builddir)/src/regex/libgnunetregexblock.la \ | 187 | $(top_builddir)/src/regex/libgnunetregexblock.la \ |
184 | $(top_builddir)/src/util/libgnunetutil.la | 188 | $(top_builddir)/src/util/libgnunetutil.la |
185 | 189 | ||
@@ -187,6 +191,7 @@ test_regex_proofs_SOURCES = \ | |||
187 | test_regex_proofs.c | 191 | test_regex_proofs.c |
188 | test_regex_proofs_LDADD = -lm \ | 192 | test_regex_proofs_LDADD = -lm \ |
189 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | 193 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ |
194 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
190 | $(top_builddir)/src/regex/libgnunetregextest.a \ | 195 | $(top_builddir)/src/regex/libgnunetregextest.a \ |
191 | $(top_builddir)/src/regex/libgnunetregexblock.la \ | 196 | $(top_builddir)/src/regex/libgnunetregexblock.la \ |
192 | $(top_builddir)/src/util/libgnunetutil.la | 197 | $(top_builddir)/src/util/libgnunetutil.la |
@@ -195,6 +200,7 @@ test_regex_graph_api_SOURCES = \ | |||
195 | test_regex_graph_api.c | 200 | test_regex_graph_api.c |
196 | test_regex_graph_api_LDADD = -lm \ | 201 | test_regex_graph_api_LDADD = -lm \ |
197 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | 202 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ |
203 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
198 | $(top_builddir)/src/regex/libgnunetregextest.a \ | 204 | $(top_builddir)/src/regex/libgnunetregextest.a \ |
199 | $(top_builddir)/src/regex/libgnunetregexblock.la \ | 205 | $(top_builddir)/src/regex/libgnunetregexblock.la \ |
200 | $(top_builddir)/src/util/libgnunetutil.la | 206 | $(top_builddir)/src/util/libgnunetutil.la |