making GNUNET_SCHEDULER_cancel() perform in O(1) instead of O(n) to help or even...

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

diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am
index 48f8d5ff7cabd704edc7eb3854b173bbaa632dfa..8dbd5f053edd11a6ec8b6ff8089c2e80331d8443 100644 (file)
--- a/src/psycstore/Makefile.am
+++ b/src/psycstore/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
 
@@ -22,7 +22,7 @@ endif
 if HAVE_SQLITE
 SQLITE_PLUGIN = libgnunet_plugin_psycstore_sqlite.la
 if HAVE_TESTING
-#SQLITE_TESTS = test_plugin_psycstore_sqlite
+SQLITE_TESTS = test_plugin_psycstore_sqlite
 endif
 endif
 
@@ -37,8 +37,6 @@ libgnunetpsycstore_la_LIBADD = \
 libgnunetpsycstore_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 0:0:0
-libgnunetpsycstore_la_DEPENDENCIES = \
-  $(top_builddir)/src/util/libgnunetutil.la
 
 bin_PROGRAMS =
 
@@ -51,10 +49,6 @@ gnunet_service_psycstore_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_psycstore_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
 
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN)
@@ -62,25 +56,22 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_psycstore_sqlite_la_SOURCES = \
   plugin_psycstore_sqlite.c
 libgnunet_plugin_psycstore_sqlite_la_LIBADD = \
-  $(top_builddir)/src/psycstore/libgnunetpsycstore.la  \
+  libgnunetpsycstore.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_psycstore_sqlite_la_DEPENDENCIES = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  libgnunetpsycstore.la
 
 
 if HAVE_TESTING
 check_PROGRAMS = \
- test_psycstore \
- $(SQLITE_TESTS)
+ $(SQLITE_TESTS) \
+ test_psycstore
 endif
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -90,12 +81,13 @@ test_psycstore_LDADD = \
   libgnunetpsycstore.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
-test_psycstore_DEPENDENCIES = \
-  libgnunetpsycstore.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
 
 EXTRA_DIST = \
   test_psycstore.conf
 
 
+test_plugin_psycstore_sqlite_SOURCES = \
+ test_plugin_psycstore.c
+test_plugin_psycstore_sqlite_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la