X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnse%2FMakefile.am;h=ebff9d2511052536d8caf5641b8679853902c8ec;hb=80d2de6cdc4d253c7fbc6a4bc067d856aab9cca9;hp=a58dd3692887bf34f5137271b9f2a4b53cf246af;hpb=f53e991a59f4befa47b0ce90d8b68318dcd23864;p=oweals%2Fgnunet.git

diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index a58dd3692..ebff9d251 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -1,7 +1,8 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+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
@@ -9,6 +10,20 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+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
 
@@ -22,55 +37,79 @@ 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 = \
-  $(top_builddir)/src/nse/libgnunetnse.la \
+if HAVE_TESTING
+noinst_PROGRAMS = \
+ gnunet-nse-profiler
+endif
+
+gnunet_nse_profiler_SOURCES = \
+ gnunet-nse-profiler.c
+gnunet_nse_profiler_LDADD = -lm \
+  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 = \
-  libgnunetnse.la				 
 
 gnunet_service_nse_SOURCES = \
- gnunet-service-nse.c         
+ 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 \
-  -lm \
+  $(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
+endif
+
+
+if HAVE_BENCHMARKS
+  MULTIPEER_TEST = test_nse_multipeer
+endif
 
+if HAVE_TESTING
 check_PROGRAMS = \
  test_nse_api \
- test_nse_multipeer
+ perf_kdf \
+ $(MULTIPEER_TEST)
+endif
 
 if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+TESTS = $(check_PROGRAMS)
 endif
 
 test_nse_api_SOURCES = \
  test_nse_api.c
 test_nse_api_LDADD = \
-  $(top_builddir)/src/nse/libgnunetnse.la \
-  $(top_builddir)/src/util/libgnunetutil.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
+
+perf_kdf_SOURCES = \
+ perf_kdf.c
+perf_kdf_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testing/libgnunettesting.la
+  $(LIBGCRYPT_LIBS) \
+  -lgcrypt
 
 EXTRA_DIST = \
   test_nse.conf \
-  $(check_SCRIPTS) 
+  nse_profiler_test.conf