consensus: destroy set handles

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index f28861f46da98875962988df7a9fd4b15f740d97..df319fe7792b247755dd96091b1a9d311e6d6428 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -31,6 +31,9 @@ endif
 
 if !MINGW
  SERVER_CLIENT_UNIX = test_server_with_client_unix
+ TEST_CLIENT_UNIC_NC = test_client_unix.nc
+else
+ TEST_CLIENT_UNIC_NC =
 endif
 
 if USE_COVERAGE
@@ -59,7 +62,7 @@ test_common_logging_dummy_LDADD = \
 libgnunetutil_la_SOURCES = \
   bandwidth.c \
   bio.c \
-  client_new.c \
+  client.c \
   common_allocation.c \
   common_endian.c \
   common_logging.c \
@@ -70,6 +73,7 @@ libgnunetutil_la_SOURCES = \
   container_heap.c \
   container_meta_data.c \
   container_multihashmap.c \
+  container_multishortmap.c \
   container_multipeermap.c \
   container_multihashmap32.c \
   crypto_symmetric.c \
@@ -186,7 +190,7 @@ noinst_PROGRAMS = \
 
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -196,7 +200,7 @@ endif
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
 gnunet-qr: gnunet-qr.py.in Makefile
-       $(do_subst) < gnunet-qr.py.in > gnunet-qr
+       $(do_subst) < $(top_srcdir)/src/util/gnunet-qr.py.in > gnunet-qr
        chmod +x gnunet-qr
 
 gnunet_service_resolver_SOURCES = \
@@ -265,13 +269,14 @@ endif
 check_PROGRAMS = \
  test_bio \
  test_client.nc \
- test_client_unix.nc \
+ $(TEST_CLIENT_UNIX_NC) \
  $(SSH_USING_TESTS) \
  test_common_allocation \
  test_common_endian \
  test_common_logging \
  test_configuration \
  test_container_bloomfilter \
+ test_container_dll \
  test_container_meta_data \
  test_container_multihashmap \
  test_container_multihashmap32 \
@@ -397,10 +402,15 @@ test_container_bloomfilter_SOURCES = \
 test_container_bloomfilter_LDADD = \
  libgnunetutil.la
 
+test_container_dll_SOURCES = \
+ test_container_dll.c
+test_container_dll_LDADD = \
+ libgnunetutil.la
+
 test_container_meta_data_SOURCES = \
  test_container_meta_data.c
 test_container_meta_data_LDADD = \
- libgnunetutil.la -lextractor
+ libgnunetutil.la
 
 test_container_multihashmap_SOURCES = \
  test_container_multihashmap.c