- expire old keys adaptively

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

diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 155fa9acb30ad6deeddc77af629520c62e2f5730..460498d79d2b9b67575bfcd61716a7c04694497b 100644 (file)
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -16,6 +16,16 @@ libexecdir= $(pkglibdir)/libexec/
 pkgcfg_DATA = \
   nse.conf
 
+bin_PROGRAMS = gnunet-nse
+
+gnunet_nse_SOURCES = gnunet-nse.c
+gnunet_nse_LDFLAGS = \
+  libgnunetnse.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIB) $(GN_LIBINTL)
+gnunet_nse_DEPENDENCIES = \
+  libgnunetnse.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 lib_LTLIBRARIES = libgnunetnse.la
 
@@ -30,7 +40,7 @@ libgnunetnse_la_LDFLAGS = \
 
 
 libexec_PROGRAMS = \
- gnunet-service-nse 
+ gnunet-service-nse
 
 if HAVE_TESTING
 noinst_PROGRAMS = \
@@ -46,19 +56,20 @@ gnunet_nse_profiler_LDADD = -lm \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(GN_LIBINTL)
 gnunet_nse_profiler_DEPENDENCIES = \
-  libgnunetnse.la                               
+  libgnunetnse.la
 
 gnunet_service_nse_SOURCES = \
- gnunet-service-nse.c         
+ gnunet-service-nse.c
 gnunet_service_nse_LDADD = \
   $(top_builddir)/src/nse/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                               
+  libgnunetnse.la
 if ENABLE_NSE_HISTOGRAM
   gnunet_service_nse_LDADD += \
     $(top_builddir)/src/testbed/libgnunettestbedlogger.la
@@ -79,7 +90,8 @@ check_PROGRAMS = \
 endif
 
 if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS) 
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+TESTS = $(check_PROGRAMS)
 endif
 
 test_nse_api_SOURCES = \
@@ -87,7 +99,7 @@ test_nse_api_SOURCES = \
 test_nse_api_LDADD = \
   $(top_builddir)/src/nse/libgnunetnse.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_nse_multipeer_SOURCES = \
  test_nse_multipeer.c
@@ -101,7 +113,8 @@ perf_kdf_SOURCES = \
  perf_kdf.c
 perf_kdf_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  -lgcrypt 
+  $(LIBGCRYPT_LIBS) \
+  -lgcrypt
 
 EXTRA_DIST = \
   test_nse.conf \