- fix

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

diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am
index dd86f9971b0848626dceb73b9beae46fb5920999..639c53262c99d1a6bf97f950bafdf566f7f0f5a0 100644 (file)
--- a/src/psycstore/Makefile.am
+++ b/src/psycstore/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
 
@@ -26,7 +27,17 @@ SQLITE_TESTS = test_plugin_psycstore_sqlite
 endif
 endif
 
-lib_LTLIBRARIES = libgnunetpsycstore.la
+lib_LTLIBRARIES = libgnunetpsycutil.la libgnunetpsycstore.la
+
+libgnunetpsycutil_la_SOURCES = \
+  psyc_util_lib.c
+libgnunetpsycutil_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/env/libgnunetenv.la \
+  $(GN_LIBINTL) $(XLIB)
+libgnunetpsycutil_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
+  -version-info 0:0:0
 
 libgnunetpsycstore_la_SOURCES = \
   psycstore_api.c \
@@ -37,8 +48,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 =
 
@@ -50,11 +59,8 @@ gnunet_service_psycstore_SOURCES = \
 gnunet_service_psycstore_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetpsycutil.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 +68,24 @@ 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_SQLITE
 if HAVE_TESTING
 check_PROGRAMS = \
  $(SQLITE_TESTS) \
  test_psycstore
 endif
+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,10 +95,6 @@ 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
@@ -102,5 +103,5 @@ EXTRA_DIST = \
 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  
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/util/libgnunetutil.la