-must notify client on timeout

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

diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am
index 238a463ec48422c84696ef473daac45b35a60a94..5f2206712c1d7f357683b1920dae23702aeab018 100644 (file)
--- a/src/arm/Makefile.am
+++ b/src/arm/Makefile.am
@@ -40,20 +40,15 @@ libexec_PROGRAMS = \
 gnunet_arm_SOURCES = \
  gnunet-arm.c         
 gnunet_arm_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_arm_DEPENDENCIES = \
-  libgnunetarm.la                        
 
 gnunet_service_arm_SOURCES = \
  gnunet-service-arm.c 
 gnunet_service_arm_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-gnunet_service_arm_DEPENDENCIES = \
-  libgnunetarm.la                        
-
 
 mockup_service_SOURCES = \
   mockup-service.c
@@ -72,26 +67,26 @@ check_SCRIPTS = \
 endif
 
 if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
 endif
 
 test_arm_api_SOURCES = \
  test_arm_api.c
 test_arm_api_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 test_exponential_backoff_SOURCES = \
  test_exponential_backoff.c
 test_exponential_backoff_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
 test_gnunet_service_arm_SOURCES = \
  test_gnunet_service_arm.c
  test_gnunet_service_arm_LDADD = \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'