avoid failing hard if 'gnunetcheck' db does not exist

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

diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 6c6a9d8e0c3f2d4028baecbb3fefb4b22c1069be..61848978019f7752e6c16df660926be49604e1ab 100644 (file)
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -1,3 +1,4 @@
+# This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
@@ -16,6 +17,13 @@ libexecdir= $(pkglibdir)/libexec/
 pkgcfg_DATA = \
   nse.conf
 
+bin_PROGRAMS = gnunet-nse
+
+gnunet_nse_SOURCES = gnunet-nse.c
+gnunet_nse_LDADD = \
+  libgnunetnse.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIB) $(GN_LIBINTL)
 
 lib_LTLIBRARIES = libgnunetnse.la
 
@@ -40,31 +48,25 @@ endif
 gnunet_nse_profiler_SOURCES = \
  gnunet-nse-profiler.c
 gnunet_nse_profiler_LDADD = -lm \
-  $(top_builddir)/src/nse/libgnunetnse.la \
+  libgnunetnse.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(GN_LIBINTL)
-gnunet_nse_profiler_DEPENDENCIES = \
-  libgnunetnse.la
 
 gnunet_service_nse_SOURCES = \
  gnunet-service-nse.c
 gnunet_service_nse_LDADD = \
-  $(top_builddir)/src/nse/libgnunetnse.la \
+  libgnunetnse.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(LIBGCRYPT_LIBS) \
   -lm -lgcrypt \
   $(GN_LIBINTL)
-gnunet_service_nse_DEPENDENCIES = \
-  libgnunetnse.la
 if ENABLE_NSE_HISTOGRAM
   gnunet_service_nse_LDADD += \
-    $(top_builddir)/src/testbed/libgnunettestbedlogger.la
-  gnunet_service_nse_DEPENDENCIES += \
-    $(top_builddir)/src/testbed/libgnunettestbedlogger.la
+    $(top_builddir)/src/testbed-logger/libgnunettestbedlogger.la
 endif
 
 
@@ -80,21 +82,21 @@ check_PROGRAMS = \
 endif
 
 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_nse_api_SOURCES = \
  test_nse_api.c
 test_nse_api_LDADD = \
-  $(top_builddir)/src/nse/libgnunetnse.la \
+  libgnunetnse.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_nse_multipeer_SOURCES = \
  test_nse_multipeer.c
 test_nse_multipeer_LDADD = \
-  $(top_builddir)/src/nse/libgnunetnse.la \
+  libgnunetnse.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   -lm
@@ -109,5 +111,3 @@ perf_kdf_LDADD = \
 EXTRA_DIST = \
   test_nse.conf \
   nse_profiler_test.conf
-
-