aboutsummaryrefslogtreecommitdiff
path: root/src/regex
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-09-13 13:54:57 +0000
committerChristian Grothoff <christian@grothoff.org>2014-09-13 13:54:57 +0000
commitd94c5185fcdf47c6a57d3233b946fa7e621f7ad9 (patch)
tree1ded577285183d6457bde8787b9bccaa01f12143 /src/regex
parente184df6030ab5c5374fe3b8a94482ff5a30c1580 (diff)
downloadgnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.tar.gz
gnunet-d94c5185fcdf47c6a57d3233b946fa7e621f7ad9.zip
fixing parallel build, getting rid of useless _DEPENDENCIES declarations
Diffstat (limited to 'src/regex')
-rw-r--r--src/regex/Makefile.am88
1 files changed, 26 insertions, 62 deletions
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 428dccda2..82212ee40 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -25,14 +25,12 @@ libexec_PROGRAMS = \
25gnunet_service_regex_SOURCES = \ 25gnunet_service_regex_SOURCES = \
26 gnunet-service-regex.c 26 gnunet-service-regex.c
27gnunet_service_regex_LDADD = -lm \ 27gnunet_service_regex_LDADD = -lm \
28 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 28 libgnunetregex_internal.a \
29 $(top_builddir)/src/regex/libgnunetregexblock.la \ 29 libgnunetregexblock.la \
30 $(top_builddir)/src/dht/libgnunetdht.la \ 30 $(top_builddir)/src/dht/libgnunetdht.la \
31 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 31 $(top_builddir)/src/statistics/libgnunetstatistics.la \
32 $(top_builddir)/src/util/libgnunetutil.la \ 32 $(top_builddir)/src/util/libgnunetutil.la \
33 $(GN_LIBINTL) 33 $(GN_LIBINTL)
34gnunet_service_regex_DEPENDENCIES = \
35 libgnunetregex_internal.a
36 34
37noinst_LIBRARIES = \ 35noinst_LIBRARIES = \
38 libgnunetregex_internal.a \ 36 libgnunetregex_internal.a \
@@ -77,15 +75,11 @@ plugin_LTLIBRARIES = \
77libgnunet_plugin_block_regex_la_SOURCES = \ 75libgnunet_plugin_block_regex_la_SOURCES = \
78 plugin_block_regex.c 76 plugin_block_regex.c
79libgnunet_plugin_block_regex_la_LIBADD = \ 77libgnunet_plugin_block_regex_la_LIBADD = \
80 $(top_builddir)/src/regex/libgnunetregexblock.la \ 78 libgnunetregexblock.la \
81 $(top_builddir)/src/block/libgnunetblock.la \ 79 $(top_builddir)/src/block/libgnunetblock.la \
82 $(top_builddir)/src/util/libgnunetutil.la 80 $(top_builddir)/src/util/libgnunetutil.la
83libgnunet_plugin_block_regex_la_LDFLAGS = \ 81libgnunet_plugin_block_regex_la_LDFLAGS = \
84 $(GN_PLUGIN_LDFLAGS) 82 $(GN_PLUGIN_LDFLAGS)
85libgnunet_plugin_block_regex_la_DEPENDENCIES = \
86 $(top_builddir)/src/regex/libgnunetregexblock.la \
87 $(top_builddir)/src/block/libgnunetblock.la \
88 $(top_builddir)/src/util/libgnunetutil.la
89 83
90if HAVE_MYSQL 84if HAVE_MYSQL
91noinst_mysql_progs = \ 85noinst_mysql_progs = \
@@ -95,12 +89,7 @@ gnunet_regex_simulation_profiler_SOURCES = \
95 gnunet-regex-simulation-profiler.c 89 gnunet-regex-simulation-profiler.c
96gnunet_regex_simulation_profiler_LDADD = \ 90gnunet_regex_simulation_profiler_LDADD = \
97 $(top_builddir)/src/util/libgnunetutil.la \ 91 $(top_builddir)/src/util/libgnunetutil.la \
98 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 92 libgnunetregex_internal.a \
99 $(top_builddir)/src/dht/libgnunetdht.la \
100 $(top_builddir)/src/mysql/libgnunetmysql.la
101gnunet_regex_simulation_profiler_DEPENDENCIES = \
102 $(top_builddir)/src/util/libgnunetutil.la \
103 $(top_builddir)/src/regex/libgnunetregex_internal.a \
104 $(top_builddir)/src/dht/libgnunetdht.la \ 93 $(top_builddir)/src/dht/libgnunetdht.la \
105 $(top_builddir)/src/mysql/libgnunetmysql.la 94 $(top_builddir)/src/mysql/libgnunetmysql.la
106endif 95endif
@@ -111,10 +100,7 @@ libgnunetregextest_a_SOURCES = \
111 regex_test_random.c 100 regex_test_random.c
112libgnunetregextest_a_LIBADD = \ 101libgnunetregextest_a_LIBADD = \
113 $(top_builddir)/src/util/libgnunetutil.la \ 102 $(top_builddir)/src/util/libgnunetutil.la \
114 $(top_builddir)/src/regex/libgnunetregex_internal.a 103 libgnunetregex_internal.a
115libgnunetregextest_a_DEPENDENCIES = \
116 $(top_builddir)/src/util/libgnunetutil.la \
117 libgnunetregex_internal.a
118 104
119if HAVE_TESTING 105if HAVE_TESTING
120noinst_PROGRAMS = $(noinst_mysql_progs) \ 106noinst_PROGRAMS = $(noinst_mysql_progs) \
@@ -125,16 +111,10 @@ endif
125perf_regex_SOURCES = \ 111perf_regex_SOURCES = \
126 perf-regex.c 112 perf-regex.c
127perf_regex_LDADD = -lm \ 113perf_regex_LDADD = -lm \
128 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 114 libgnunetregex_internal.a \
129 $(top_builddir)/src/dht/libgnunetdht.la \
130 $(top_builddir)/src/regex/libgnunetregexblock.la \
131 $(top_builddir)/src/regex/libgnunetregextest.a \
132 $(top_builddir)/src/util/libgnunetutil.la
133perf_regex_DEPENDENCIES = \
134 $(top_builddir)/src/regex/libgnunetregex_internal.a \
135 $(top_builddir)/src/dht/libgnunetdht.la \ 115 $(top_builddir)/src/dht/libgnunetdht.la \
136 $(top_builddir)/src/regex/libgnunetregexblock.la \ 116 libgnunetregexblock.la \
137 $(top_builddir)/src/regex/libgnunetregextest.a \ 117 libgnunetregextest.a \
138 $(top_builddir)/src/util/libgnunetutil.la 118 $(top_builddir)/src/util/libgnunetutil.la
139 119
140gnunet_regex_profiler_SOURCES = \ 120gnunet_regex_profiler_SOURCES = \
@@ -142,36 +122,20 @@ gnunet_regex_profiler_SOURCES = \
142gnunet_regex_profiler_LDADD = -lm \ 122gnunet_regex_profiler_LDADD = -lm \
143 $(top_builddir)/src/arm/libgnunetarm.la \ 123 $(top_builddir)/src/arm/libgnunetarm.la \
144 $(top_builddir)/src/testbed/libgnunettestbed.la \ 124 $(top_builddir)/src/testbed/libgnunettestbed.la \
145 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 125 libgnunetregex_internal.a \
146 $(top_builddir)/src/dht/libgnunetdht.la \
147 $(top_builddir)/src/regex/libgnunetregexblock.la \
148 $(top_builddir)/src/regex/libgnunetregextest.a \
149 $(top_builddir)/src/statistics/libgnunetstatistics.la \
150 $(top_builddir)/src/util/libgnunetutil.la
151gnunet_regex_profiler_DEPENDENCIES = \
152 $(top_builddir)/src/arm/libgnunetarm.la \
153 $(top_builddir)/src/testbed/libgnunettestbed.la \
154 $(top_builddir)/src/regex/libgnunetregex_internal.a \
155 $(top_builddir)/src/dht/libgnunetdht.la \ 126 $(top_builddir)/src/dht/libgnunetdht.la \
156 $(top_builddir)/src/regex/libgnunetregexblock.la \ 127 libgnunetregexblock.la \
157 $(top_builddir)/src/regex/libgnunetregextest.a \ 128 libgnunetregextest.a \
158 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 129 $(top_builddir)/src/statistics/libgnunetstatistics.la \
159 $(top_builddir)/src/util/libgnunetutil.la 130 $(top_builddir)/src/util/libgnunetutil.la
160 131
161gnunet_daemon_regexprofiler_SOURCES = \ 132gnunet_daemon_regexprofiler_SOURCES = \
162 gnunet-daemon-regexprofiler.c 133 gnunet-daemon-regexprofiler.c
163gnunet_daemon_regexprofiler_LDADD = -lm \ 134gnunet_daemon_regexprofiler_LDADD = -lm \
164 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 135 libgnunetregex_internal.a \
165 $(top_builddir)/src/dht/libgnunetdht.la \
166 $(top_builddir)/src/regex/libgnunetregexblock.la \
167 $(top_builddir)/src/regex/libgnunetregextest.a \
168 $(top_builddir)/src/statistics/libgnunetstatistics.la \
169 $(top_builddir)/src/util/libgnunetutil.la
170gnunet_daemon_regexprofiler_DEPENDENCIES = \
171 $(top_builddir)/src/regex/libgnunetregex_internal.a \
172 $(top_builddir)/src/dht/libgnunetdht.la \ 136 $(top_builddir)/src/dht/libgnunetdht.la \
173 $(top_builddir)/src/regex/libgnunetregexblock.la \ 137 libgnunetregexblock.la \
174 $(top_builddir)/src/regex/libgnunetregextest.a \ 138 libgnunetregextest.a \
175 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 139 $(top_builddir)/src/statistics/libgnunetstatistics.la \
176 $(top_builddir)/src/util/libgnunetutil.la 140 $(top_builddir)/src/util/libgnunetutil.la
177 141
@@ -190,43 +154,43 @@ endif
190test_regex_eval_api_SOURCES = \ 154test_regex_eval_api_SOURCES = \
191 test_regex_eval_api.c 155 test_regex_eval_api.c
192test_regex_eval_api_LDADD = -lm \ 156test_regex_eval_api_LDADD = -lm \
193 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 157 libgnunetregex_internal.a \
194 $(top_builddir)/src/dht/libgnunetdht.la \ 158 $(top_builddir)/src/dht/libgnunetdht.la \
195 $(top_builddir)/src/regex/libgnunetregextest.a \ 159 libgnunetregextest.a \
196 $(top_builddir)/src/regex/libgnunetregexblock.la \ 160 libgnunetregexblock.la \
197 $(top_builddir)/src/util/libgnunetutil.la 161 $(top_builddir)/src/util/libgnunetutil.la
198 162
199test_regex_api_SOURCES = \ 163test_regex_api_SOURCES = \
200 test_regex_api.c 164 test_regex_api.c
201test_regex_api_LDADD = -lm \ 165test_regex_api_LDADD = -lm \
202 $(top_builddir)/src/regex/libgnunetregex.la \ 166 libgnunetregex.la \
203 $(top_builddir)/src/testing/libgnunettesting.la \ 167 $(top_builddir)/src/testing/libgnunettesting.la \
204 $(top_builddir)/src/util/libgnunetutil.la 168 $(top_builddir)/src/util/libgnunetutil.la
205 169
206test_regex_iterate_api_SOURCES = \ 170test_regex_iterate_api_SOURCES = \
207 test_regex_iterate_api.c 171 test_regex_iterate_api.c
208test_regex_iterate_api_LDADD = -lm \ 172test_regex_iterate_api_LDADD = -lm \
209 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 173 libgnunetregex_internal.a \
210 $(top_builddir)/src/regex/libgnunetregexblock.la \ 174 libgnunetregexblock.la \
211 $(top_builddir)/src/dht/libgnunetdht.la \ 175 $(top_builddir)/src/dht/libgnunetdht.la \
212 $(top_builddir)/src/util/libgnunetutil.la 176 $(top_builddir)/src/util/libgnunetutil.la
213 177
214test_regex_proofs_SOURCES = \ 178test_regex_proofs_SOURCES = \
215 test_regex_proofs.c 179 test_regex_proofs.c
216test_regex_proofs_LDADD = -lm \ 180test_regex_proofs_LDADD = -lm \
217 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 181 libgnunetregex_internal.a \
218 $(top_builddir)/src/dht/libgnunetdht.la \ 182 $(top_builddir)/src/dht/libgnunetdht.la \
219 $(top_builddir)/src/regex/libgnunetregextest.a \ 183 libgnunetregextest.a \
220 $(top_builddir)/src/regex/libgnunetregexblock.la \ 184 libgnunetregexblock.la \
221 $(top_builddir)/src/util/libgnunetutil.la 185 $(top_builddir)/src/util/libgnunetutil.la
222 186
223test_regex_graph_api_SOURCES = \ 187test_regex_graph_api_SOURCES = \
224 test_regex_graph_api.c 188 test_regex_graph_api.c
225test_regex_graph_api_LDADD = -lm \ 189test_regex_graph_api_LDADD = -lm \
226 $(top_builddir)/src/regex/libgnunetregex_internal.a \ 190 libgnunetregex_internal.a \
227 $(top_builddir)/src/dht/libgnunetdht.la \ 191 $(top_builddir)/src/dht/libgnunetdht.la \
228 $(top_builddir)/src/regex/libgnunetregextest.a \ 192 libgnunetregextest.a \
229 $(top_builddir)/src/regex/libgnunetregexblock.la \ 193 libgnunetregexblock.la \
230 $(top_builddir)/src/util/libgnunetutil.la 194 $(top_builddir)/src/util/libgnunetutil.la
231 195
232 196