- fix connection.c

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

diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 38d64ab90af10331b51ab4f2beeacda18126865e..155fa9acb30ad6deeddc77af629520c62e2f5730 100644 (file)
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
@@ -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,23 @@ 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 \
+if HAVE_TESTING
+noinst_PROGRAMS = \
+ gnunet-nse-profiler
+endif
+
+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,19 +55,28 @@ 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                               
+if ENABLE_NSE_HISTOGRAM
+  gnunet_service_nse_LDADD += \
+    $(top_builddir)/src/testbed/libgnunettestbedlogger.la
+  gnunet_service_nse_DEPENDENCIES += \
+    $(top_builddir)/src/testbed/libgnunettestbedlogger.la
+endif
+
 
 if HAVE_BENCHMARKS
   MULTIPEER_TEST = test_nse_multipeer
 endif
 
+if HAVE_TESTING
 check_PROGRAMS = \
  test_nse_api \
+ perf_kdf \
  $(MULTIPEER_TEST)
-
+endif
 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS) 
@@ -65,6 +86,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 +94,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