- fix

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

diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 38d64ab90af10331b51ab4f2beeacda18126865e..971d4c1b1b35a9649b6fe93b1d78f7b6c21d26f0 100644 (file)
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -9,6 +9,13 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+  nse.conf
+
 
 lib_LTLIBRARIES = libgnunetnse.la
 
@@ -22,18 +29,21 @@ libgnunetnse_la_LDFLAGS = \
   -version-info 0:0:0
 
 
-bin_PROGRAMS = \
- gnunet-service-nse \
- nse-profiler
+libexec_PROGRAMS = \
+ gnunet-service-nse 
 
-nse_profiler_SOURCES = \
- nse-profiler.c         
-nse_profiler_LDADD = -lm \
+noinst_PROGRAMS = \
+ gnunet-nse-profiler
+
+gnunet_nse_profiler_SOURCES = \
+ gnunet-nse-profiler.c
+gnunet_nse_profiler_LDADD = -lm \
   $(top_builddir)/src/nse/libgnunetnse.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
   $(GN_LIBINTL)
-nse_profiler_DEPENDENCIES = \
+gnunet_nse_profiler_DEPENDENCIES = \
   libgnunetnse.la                               
 
 gnunet_service_nse_SOURCES = \
@@ -43,7 +53,7 @@ gnunet_service_nse_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  -lm \
+  -lm -lgcrypt \
   $(GN_LIBINTL)
 gnunet_service_nse_DEPENDENCIES = \
   libgnunetnse.la                               
@@ -54,6 +64,7 @@ endif
 
 check_PROGRAMS = \
  test_nse_api \
+ perf_kdf \
  $(MULTIPEER_TEST)
 
 
@@ -65,6 +76,7 @@ test_nse_api_SOURCES = \
  test_nse_api.c
 test_nse_api_LDADD = \
   $(top_builddir)/src/nse/libgnunetnse.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
 test_nse_multipeer_SOURCES = \
@@ -72,9 +84,17 @@ test_nse_multipeer_SOURCES = \
 test_nse_multipeer_LDADD = \
   $(top_builddir)/src/nse/libgnunetnse.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  -lm
+
+perf_kdf_SOURCES = \
+ perf_kdf.c
+perf_kdf_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgcrypt 
 
 EXTRA_DIST = \
-  test_nse.conf 
+  test_nse.conf \
+  nse_profiler_test.conf