- Fix contidion for next round

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

diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index a13d6d8b1c3fbc140d2a6bd9e711d0d73dacff87..054a77663e2754c06a9143b5fbd18fcd4ca606a4 100644 (file)
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -9,6 +9,11 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+pkgcfg_DATA = \
+  nse.conf
+
 
 lib_LTLIBRARIES = libgnunetnse.la
 
@@ -23,16 +28,21 @@ libgnunetnse_la_LDFLAGS = \
 
 
 bin_PROGRAMS = \
- gnunet-service-nse
+ gnunet-service-nse 
 
-# gnunet_nse_SOURCES = \
-# gnunet-nse.c         
-# gnunet_nse_LDADD = \
-#  $(top_builddir)/src/nse/libgnunetnse.la \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(GN_LIBINTL)
-# gnunet_nse_DEPENDENCIES = \
-#  libgnunetnse.la                              
+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/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(GN_LIBINTL)
+gnunet_nse_profiler_DEPENDENCIES = \
+  libgnunetnse.la                               
 
 gnunet_service_nse_SOURCES = \
  gnunet-service-nse.c         
@@ -46,12 +56,17 @@ gnunet_service_nse_LDADD = \
 gnunet_service_nse_DEPENDENCIES = \
   libgnunetnse.la                               
 
+if HAVE_BENCHMARKS
+  MULTIPEER_TEST = test_nse_multipeer
+endif
+
 check_PROGRAMS = \
  test_nse_api \
- test_nse_multipeer
+ $(MULTIPEER_TEST)
+
 
 if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+TESTS = $(check_PROGRAMS) 
 endif
 
 test_nse_api_SOURCES = \
@@ -65,10 +80,11 @@ 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/testing/libgnunettesting.la \
+  -lm
 
 EXTRA_DIST = \
   test_nse.conf \
-  $(check_SCRIPTS) 
+  nse_profiler_test.conf