X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpeerstore%2FMakefile.am;h=3aef05769e63b71e32ddb0933b882993a8051025;hb=09b6a814e0ddcca0497c5cbf37940c27e6a5d9de;hp=46f126063f08b601d20be1cc1d02f701d6b28600;hpb=5af3601273f0ed5e4d0f4e3e7039525a7b7ff4b3;p=oweals%2Fgnunet.git

diff --git a/src/peerstore/Makefile.am b/src/peerstore/Makefile.am
index 46f126063..3aef05769 100644
--- a/src/peerstore/Makefile.am
+++ b/src/peerstore/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
@@ -10,7 +11,7 @@ dist_pkgcfg_DATA = \
   peerstore.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -18,7 +19,7 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
- gnunet-peerstore 
+ gnunet-peerstore
 
 libexec_PROGRAMS = \
  gnunet-service-peerstore
@@ -35,7 +36,8 @@ gnunet_peerstore_LDADD = \
 
 gnunet_service_peerstore_SOURCES = \
  gnunet-service-peerstore.c \
- peerstore_common.c
+ peerstore_common.c peerstore_common.h \
+ peerstore.h
 gnunet_service_peerstore_CFLAGS = $(AM_CFLAGS)
 gnunet_service_peerstore_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -49,64 +51,100 @@ libgnunetpeerstore_la_LIBADD = \
 libgnunetpeerstore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-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 = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  libgnunetpeerstore.la  \
+  $(top_builddir)/src/sq/libgnunetsq.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_peerstore_sqlite_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetpeerstore.la
+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
 
 test_peerstore_api_store_SOURCES = \
  test_peerstore_api_store.c
 test_peerstore_api_store_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_peerstore_api_iterate_SOURCES = \
  test_peerstore_api_iterate.c
 test_peerstore_api_iterate_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_peerstore_api_watch_SOURCES = \
  test_peerstore_api_watch.c
 test_peerstore_api_watch_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_peerstore_api_sync_SOURCES = \
  test_peerstore_api_sync.c
 test_peerstore_api_sync_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 perf_peerstore_store_SOURCES = \
  perf_peerstore_store.c
 perf_peerstore_store_LDADD = \
-  $(top_builddir)/src/peerstore/libgnunetpeerstore.la  \
+  libgnunetpeerstore.la  \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la