Merge branch 'master' of gnunet.org:gnunet

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

diff --git a/src/peerstore/Makefile.am b/src/peerstore/Makefile.am
index e8d865c465e5afdf6050d30b23013ae0852f1eb5..3aef05769e63b71e32ddb0933b882993a8051025 100644 (file)
--- a/src/peerstore/Makefile.am
+++ b/src/peerstore/Makefile.am
@@ -51,35 +51,66 @@ libgnunetpeerstore_la_LIBADD = \
 libgnunetpeerstore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-if HAVE_SQLITE
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_peerstore_sqlite.la
+if HAVE_EXPERIMENTAL
+FLAT_PLUGIN = libgnunet_plugin_peerstore_flat.la
+FLAT_TESTS = test_plugin_peerstore_flat
+libgnunet_plugin_peerstore_flat_la_SOURCES = \
+  plugin_peerstore_flat.c
+libgnunet_plugin_peerstore_flat_la_LIBADD = \
+  libgnunetpeerstore.la  \
+  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
+libgnunet_plugin_peerstore_flat_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+endif
 
+if HAVE_SQLITE
+SQLITE_PLUGIN = libgnunet_plugin_peerstore_sqlite.la
+if HAVE_TESTING
+SQLITE_TESTS = test_plugin_peerstore_sqlite
+endif
 libgnunet_plugin_peerstore_sqlite_la_SOURCES = \
   plugin_peerstore_sqlite.c
 libgnunet_plugin_peerstore_sqlite_la_LIBADD = \
   libgnunetpeerstore.la  \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  $(top_builddir)/src/sq/libgnunetsq.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-end
-
 endif
 
+plugin_LTLIBRARIES = \
+  $(SQLITE_PLUGIN) \
+       $(FLAT_PLUGIN)
+
+test_plugin_peerstore_sqlite_SOURCES = \
+  test_plugin_peerstore.c
+test_plugin_peerstore_sqlite_LDADD = \
+       $(top_builddir)/src/testing/libgnunettesting.la \
+       $(top_builddir)/src/util/libgnunetutil.la
+
+test_plugin_peerstore_flat_SOURCES = \
+  test_plugin_peerstore.c
+test_plugin_peerstore_flat_LDADD = \
+       $(top_builddir)/src/testing/libgnunettesting.la \
+       $(top_builddir)/src/util/libgnunetutil.la
+
 check_PROGRAMS = \
  test_peerstore_api_store \
  test_peerstore_api_iterate \
  test_peerstore_api_watch \
  test_peerstore_api_sync \
- perf_peerstore_store
+ perf_peerstore_store \
+ $(SQLITE_TESTS) \
+ $(FLAT_TESTS)
 
 EXTRA_DIST = \
  test_peerstore_api_data.conf
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif