Fix TESTS_ENVIRONMENT setting (allow GNUNET_PREFIX to be overriden, allow TESTS_ENVIR...

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

diff --git a/src/experimentation/Makefile.am b/src/experimentation/Makefile.am
index 479a4e9be4febee1b400c0d75cfb12637d07cf7c..26a46739347dcfd236043bc309811f5ffcc920bf 100644 (file)
--- a/src/experimentation/Makefile.am
+++ b/src/experimentation/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -18,14 +18,14 @@ endif
 
 
 if HAVE_EXPERIMENTAL
- TEXT_EXP_CLIQUE = test_experimentation_clique_connect 
-#test_experimentation_clique_run
-endif 
+ TEXT_EXP_CLIQUE = test_experimentation_clique_connect test_experimentation_clique_run
+endif
 
 check_PROGRAMS = \
  $(TEXT_EXP_CLIQUE)
- 
+
 if ENABLE_TEST_RUN
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
  TESTS = \
  $(TEXT_EXP_CLIQUE)
 endif
@@ -34,7 +34,7 @@ libexec_PROGRAMS = \
  gnunet-daemon-experimentation
 
 gnunet_daemon_experimentation_SOURCES = \
- gnunet-daemon-experimentation.c \
+ gnunet-daemon-experimentation.c gnunet-daemon-experimentation.h \
  gnunet-daemon-experimentation_capabilities.c \
  gnunet-daemon-experimentation_nodes.c \
  gnunet-daemon-experimentation_scheduler.c \
@@ -43,7 +43,7 @@ gnunet_daemon_experimentation_SOURCES = \
 gnunet_daemon_experimentation_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la 
+  $(top_builddir)/src/util/libgnunetutil.la
 
 test_experimentation_clique_connect_SOURCES = \
  test_experimentation_clique_connect.c
@@ -51,14 +51,21 @@ test_experimentation_clique_connect_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la
- 
+
+test_experimentation_clique_run_SOURCES = \
+ test_experimentation_clique_run.c
+test_experimentation_clique_run_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/testbed/libgnunettestbed.la
+
 #test_experimentation_clique_run_SOURCES = \
 # test_experimentation_clique_run.c
 #test_experimentation_clique_run_LDADD = \
 # $(top_builddir)/src/util/libgnunetutil.la \
 # $(top_builddir)/src/statistics/libgnunetstatistics.la \
-# $(top_builddir)/src/testbed/libgnunettestbed.la 
- 
+# $(top_builddir)/src/testbed/libgnunettestbed.la
+
 
 EXTRA_DIST = \
  test_experimentation_clique.conf \