diff options
Diffstat (limited to 'src/regex')
-rw-r--r-- | src/regex/Makefile.am | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index 775b0d95d..428dccda2 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am | |||
@@ -83,7 +83,9 @@ libgnunet_plugin_block_regex_la_LIBADD = \ | |||
83 | libgnunet_plugin_block_regex_la_LDFLAGS = \ | 83 | libgnunet_plugin_block_regex_la_LDFLAGS = \ |
84 | $(GN_PLUGIN_LDFLAGS) | 84 | $(GN_PLUGIN_LDFLAGS) |
85 | libgnunet_plugin_block_regex_la_DEPENDENCIES = \ | 85 | libgnunet_plugin_block_regex_la_DEPENDENCIES = \ |
86 | libgnunetregexblock.la | 86 | $(top_builddir)/src/regex/libgnunetregexblock.la \ |
87 | $(top_builddir)/src/block/libgnunetblock.la \ | ||
88 | $(top_builddir)/src/util/libgnunetutil.la | ||
87 | 89 | ||
88 | if HAVE_MYSQL | 90 | if HAVE_MYSQL |
89 | noinst_mysql_progs = \ | 91 | noinst_mysql_progs = \ |
@@ -95,9 +97,12 @@ gnunet_regex_simulation_profiler_LDADD = \ | |||
95 | $(top_builddir)/src/util/libgnunetutil.la \ | 97 | $(top_builddir)/src/util/libgnunetutil.la \ |
96 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | 98 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ |
97 | $(top_builddir)/src/dht/libgnunetdht.la \ | 99 | $(top_builddir)/src/dht/libgnunetdht.la \ |
98 | $(top_builddir)/src/mysql/libgnunetmysql.la | 100 | $(top_builddir)/src/mysql/libgnunetmysql.la |
99 | gnunet_regex_simulation_profiler_DEPENDENCIES = \ | 101 | gnunet_regex_simulation_profiler_DEPENDENCIES = \ |
100 | libgnunetregex_internal.a | 102 | $(top_builddir)/src/util/libgnunetutil.la \ |
103 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | ||
104 | $(top_builddir)/src/dht/libgnunetdht.la \ | ||
105 | $(top_builddir)/src/mysql/libgnunetmysql.la | ||
101 | endif | 106 | endif |
102 | 107 | ||
103 | libgnunetregextest_a_SOURCES = \ | 108 | libgnunetregextest_a_SOURCES = \ |
@@ -108,6 +113,7 @@ libgnunetregextest_a_LIBADD = \ | |||
108 | $(top_builddir)/src/util/libgnunetutil.la \ | 113 | $(top_builddir)/src/util/libgnunetutil.la \ |
109 | $(top_builddir)/src/regex/libgnunetregex_internal.a | 114 | $(top_builddir)/src/regex/libgnunetregex_internal.a |
110 | libgnunetregextest_a_DEPENDENCIES = \ | 115 | libgnunetregextest_a_DEPENDENCIES = \ |
116 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
111 | libgnunetregex_internal.a | 117 | libgnunetregex_internal.a |
112 | 118 | ||
113 | if HAVE_TESTING | 119 | if HAVE_TESTING |
@@ -125,8 +131,11 @@ perf_regex_LDADD = -lm \ | |||
125 | $(top_builddir)/src/regex/libgnunetregextest.a \ | 131 | $(top_builddir)/src/regex/libgnunetregextest.a \ |
126 | $(top_builddir)/src/util/libgnunetutil.la | 132 | $(top_builddir)/src/util/libgnunetutil.la |
127 | perf_regex_DEPENDENCIES = \ | 133 | perf_regex_DEPENDENCIES = \ |
128 | libgnunetregex_internal.a \ | 134 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ |
129 | libgnunetregextest.a | 135 | $(top_builddir)/src/dht/libgnunetdht.la \ |
136 | $(top_builddir)/src/regex/libgnunetregexblock.la \ | ||
137 | $(top_builddir)/src/regex/libgnunetregextest.a \ | ||
138 | $(top_builddir)/src/util/libgnunetutil.la | ||
130 | 139 | ||
131 | gnunet_regex_profiler_SOURCES = \ | 140 | gnunet_regex_profiler_SOURCES = \ |
132 | gnunet-regex-profiler.c | 141 | gnunet-regex-profiler.c |
@@ -141,10 +150,13 @@ gnunet_regex_profiler_LDADD = -lm \ | |||
141 | $(top_builddir)/src/util/libgnunetutil.la | 150 | $(top_builddir)/src/util/libgnunetutil.la |
142 | gnunet_regex_profiler_DEPENDENCIES = \ | 151 | gnunet_regex_profiler_DEPENDENCIES = \ |
143 | $(top_builddir)/src/arm/libgnunetarm.la \ | 152 | $(top_builddir)/src/arm/libgnunetarm.la \ |
153 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
154 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | ||
144 | $(top_builddir)/src/dht/libgnunetdht.la \ | 155 | $(top_builddir)/src/dht/libgnunetdht.la \ |
145 | libgnunetregex_internal.a \ | 156 | $(top_builddir)/src/regex/libgnunetregexblock.la \ |
146 | libgnunetregextest.a | 157 | $(top_builddir)/src/regex/libgnunetregextest.a \ |
147 | 158 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | |
159 | $(top_builddir)/src/util/libgnunetutil.la | ||
148 | 160 | ||
149 | gnunet_daemon_regexprofiler_SOURCES = \ | 161 | gnunet_daemon_regexprofiler_SOURCES = \ |
150 | gnunet-daemon-regexprofiler.c | 162 | gnunet-daemon-regexprofiler.c |
@@ -156,11 +168,12 @@ gnunet_daemon_regexprofiler_LDADD = -lm \ | |||
156 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 168 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
157 | $(top_builddir)/src/util/libgnunetutil.la | 169 | $(top_builddir)/src/util/libgnunetutil.la |
158 | gnunet_daemon_regexprofiler_DEPENDENCIES = \ | 170 | gnunet_daemon_regexprofiler_DEPENDENCIES = \ |
171 | $(top_builddir)/src/regex/libgnunetregex_internal.a \ | ||
159 | $(top_builddir)/src/dht/libgnunetdht.la \ | 172 | $(top_builddir)/src/dht/libgnunetdht.la \ |
160 | libgnunetregextest.a \ | 173 | $(top_builddir)/src/regex/libgnunetregexblock.la \ |
161 | libgnunetregex_internal.a | 174 | $(top_builddir)/src/regex/libgnunetregextest.a \ |
162 | 175 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | |
163 | 176 | $(top_builddir)/src/util/libgnunetutil.la | |
164 | 177 | ||
165 | check_PROGRAMS = \ | 178 | check_PROGRAMS = \ |
166 | test_regex_eval_api \ | 179 | test_regex_eval_api \ |