projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix
[oweals/gnunet.git]
/
src
/
nse
/
Makefile.am
diff --git
a/src/nse/Makefile.am
b/src/nse/Makefile.am
index 0718a9d51cb127939bc8a18d31432db4ef86bcef..a67ffeaf8e7c29240beab69c6ddd7b9383089e0c 100644
(file)
--- a/
src/nse/Makefile.am
+++ b/
src/nse/Makefile.am
@@
-9,6
+9,13
@@
if USE_COVERAGE
XLIB = -lgcov
endif
XLIB = -lgcov
endif
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+ nse.conf
+
lib_LTLIBRARIES = libgnunetnse.la
lib_LTLIBRARIES = libgnunetnse.la
@@
-22,18
+29,21
@@
libgnunetnse_la_LDFLAGS = \
-version-info 0:0:0
-version-info 0:0:0
-bin_PROGRAMS = \
- gnunet-service-nse \
- nse-profiler
+libexec_PROGRAMS = \
+ gnunet-service-nse
+
+noinst_PROGRAMS = \
+ gnunet-nse-profiler
-nse_profiler_SOURCES = \
- nse-profiler.c
-
nse_profiler_LDADD =
\
+
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/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)
$(GN_LIBINTL)
-nse_profiler_DEPENDENCIES = \
+
gnunet_
nse_profiler_DEPENDENCIES = \
libgnunetnse.la
gnunet_service_nse_SOURCES = \
libgnunetnse.la
gnunet_service_nse_SOURCES = \
@@
-48,18
+58,24
@@
gnunet_service_nse_LDADD = \
gnunet_service_nse_DEPENDENCIES = \
libgnunetnse.la
gnunet_service_nse_DEPENDENCIES = \
libgnunetnse.la
+if HAVE_BENCHMARKS
+ MULTIPEER_TEST = test_nse_multipeer
+endif
+
check_PROGRAMS = \
test_nse_api \
check_PROGRAMS = \
test_nse_api \
- test_nse_multipeer
+ $(MULTIPEER_TEST)
+
if ENABLE_TEST_RUN
if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS)
$(check_SCRIPTS)
+TESTS = $(check_PROGRAMS)
endif
test_nse_api_SOURCES = \
test_nse_api.c
test_nse_api_LDADD = \
$(top_builddir)/src/nse/libgnunetnse.la \
endif
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 = \
$(top_builddir)/src/util/libgnunetutil.la
test_nse_multipeer_SOURCES = \
@@
-67,10
+83,11
@@
test_nse_multipeer_SOURCES = \
test_nse_multipeer_LDADD = \
$(top_builddir)/src/nse/libgnunetnse.la \
$(top_builddir)/src/util/libgnunetutil.la \
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
EXTRA_DIST = \
test_nse.conf \
EXTRA_DIST = \
test_nse.conf \
- $(check_SCRIPTS)
+ nse_profiler_test.conf