diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-08-14 11:17:30 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-08-14 11:17:30 +0200 |
commit | 5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9 (patch) | |
tree | 33d2a86abe831bfd3cd711ad7332433b35891766 /src/namestore/Makefile.am | |
parent | 97e72521285a2ff2189334cb43d0a8f385d73e4a (diff) | |
parent | 4cc09ba10da89ac32b4a40bde9abbe77bba21c78 (diff) | |
download | gnunet-5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9.tar.gz gnunet-5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9.zip |
resolve merge conflict with peerinfo plugin move
Diffstat (limited to 'src/namestore/Makefile.am')
-rw-r--r-- | src/namestore/Makefile.am | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 7f44c2a71..a349921d7 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -97,12 +97,6 @@ check_PROGRAMS = \ | |||
97 | $(FLAT_TESTS) | 97 | $(FLAT_TESTS) |
98 | endif | 98 | endif |
99 | 99 | ||
100 | if HAVE_MHD | ||
101 | if HAVE_JSON | ||
102 | REST_PLUGIN=libgnunet_plugin_rest_namestore.la | ||
103 | endif | ||
104 | endif | ||
105 | |||
106 | if ENABLE_TEST_RUN | 100 | if ENABLE_TEST_RUN |
107 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 101 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
108 | TESTS = \ | 102 | TESTS = \ |
@@ -186,8 +180,7 @@ gnunet_service_namestore_LDADD = \ | |||
186 | plugin_LTLIBRARIES = \ | 180 | plugin_LTLIBRARIES = \ |
187 | $(SQLITE_PLUGIN) \ | 181 | $(SQLITE_PLUGIN) \ |
188 | $(POSTGRES_PLUGIN) \ | 182 | $(POSTGRES_PLUGIN) \ |
189 | $(FLAT_PLUGIN) \ | 183 | $(FLAT_PLUGIN) |
190 | $(REST_PLUGIN) | ||
191 | 184 | ||
192 | 185 | ||
193 | 186 | ||
@@ -224,20 +217,6 @@ libgnunet_plugin_namestore_postgres_la_LIBADD = \ | |||
224 | libgnunet_plugin_namestore_postgres_la_LDFLAGS = \ | 217 | libgnunet_plugin_namestore_postgres_la_LDFLAGS = \ |
225 | $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) | 218 | $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS) |
226 | 219 | ||
227 | libgnunet_plugin_rest_namestore_la_SOURCES = \ | ||
228 | plugin_rest_namestore.c | ||
229 | libgnunet_plugin_rest_namestore_la_LIBADD = \ | ||
230 | libgnunetnamestore.la \ | ||
231 | $(top_builddir)/src/rest/libgnunetrest.la \ | ||
232 | $(top_builddir)/src/identity/libgnunetidentity.la \ | ||
233 | $(top_builddir)/src/json/libgnunetjson.la \ | ||
234 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | ||
235 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ | ||
236 | $(LTLIBINTL) -ljansson -lmicrohttpd | ||
237 | libgnunet_plugin_rest_namestore_la_LDFLAGS = \ | ||
238 | $(GN_PLUGIN_LDFLAGS) | ||
239 | |||
240 | |||
241 | test_namestore_api_store_flat_SOURCES = \ | 220 | test_namestore_api_store_flat_SOURCES = \ |
242 | test_namestore_api_store.c | 221 | test_namestore_api_store.c |
243 | test_namestore_api_store_flat_LDADD = \ | 222 | test_namestore_api_store_flat_LDADD = \ |