update tests to use new MQ API

[oweals/gnunet.git] / src / namestore / Makefile.am

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 221e88a91aa7437ccc127f55d696ee48ee23d1b7..50b33a18ad72881f1251c21bdfab746ce5b60cbf 100644 (file)
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -71,6 +71,12 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 endif
 
+if HAVE_MHD
+if HAVE_JSON
+REST_PLUGIN=libgnunet_plugin_rest_namestore.la
+endif
+endif
+
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = \
@@ -81,6 +87,7 @@ endif
 lib_LTLIBRARIES = \
   libgnunetnamestore.la
 
+
 libgnunetnamestore_la_SOURCES = \
   namestore_api.c \
   namestore_api_monitor.c \
@@ -106,21 +113,6 @@ libexec_PROGRAMS += \
  gnunet-namestore-fcfsd
 endif
 
-if HAVE_REST
-REST_PLUGIN = libgnunet_plugin_rest_namestore.la
-endif
-
-libgnunet_plugin_rest_namestore_la_SOURCES = \
-  plugin_rest_namestore.c
-libgnunet_plugin_rest_namestore_la_LIBADD = \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
-       $(top_builddir)/src/identity/libgnunetidentity.la \
-       $(top_builddir)/src/rest/libgnunetrest.la \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lmicrohttpd
-libgnunet_plugin_rest_namestore_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
 
 gnunet_namestore_SOURCES = \
  gnunet-namestore.c
@@ -161,6 +153,8 @@ plugin_LTLIBRARIES = \
        $(FLAT_PLUGIN) \
        $(REST_PLUGIN)
 
+
+
 libgnunet_plugin_namestore_flat_la_SOURCES = \
   plugin_namestore_flat.c
 libgnunet_plugin_namestore_flat_la_LIBADD = \
@@ -187,12 +181,27 @@ libgnunet_plugin_namestore_postgres_la_SOURCES = \
 libgnunet_plugin_namestore_postgres_la_LIBADD = \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la  \
   $(top_builddir)/src/postgres/libgnunetpostgres.la  \
+  $(top_builddir)/src/pq/libgnunetpq.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lpq \
   $(LTLIBINTL)
 libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
 
+libgnunet_plugin_rest_namestore_la_SOURCES = \
+  plugin_rest_namestore.c
+libgnunet_plugin_rest_namestore_la_LIBADD = \
+  libgnunetnamestore.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+       $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \
+  $(top_builddir)/src/jsonapi/libgnunetjsonapiutils.la \  
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson -lmicrohttpd
+libgnunet_plugin_rest_namestore_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
 test_namestore_api_store_SOURCES = \
  test_namestore_api_store.c
 test_namestore_api_store_LDADD = \