X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2FMakefile.am;h=44e22e390c48a977b8eee0ecd19785ee2b1d31d6;hb=72c8645af31896829b674b575c5375706f362a30;hp=42d91c0baf9abc73b8e567a9148c69d0c8dad459;hpb=7d9d8f793ebc261192fe33a87905133e1bf36512;p=oweals%2Fgnunet.git

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 42d91c0ba..44e22e390 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -73,6 +73,7 @@ libgnunetutil_la_SOURCES = \
   container_heap.c \
   container_meta_data.c \
   container_multihashmap.c \
+  container_multihashmap32.c \
   container_slist.c \
   crypto_aes.c \
   crypto_crc.c \
@@ -89,6 +90,7 @@ libgnunetutil_la_SOURCES = \
   getopt_helpers.c \
   helper.c \
   load.c \
+  mq.c \
   network.c \
   os_installation.c \
   os_network.c \
@@ -108,18 +110,24 @@ libgnunetutil_la_SOURCES = \
   time.c \
   speedup.c
 
+libgnunetutil_la_CPPFLAGS = \
+  $(LTDLINCL)
 
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
   $(LTLIBINTL) \
-  -lltdl -lz -lunistring $(XLIB) 
+  $(LIBLTDL) $(Z_LIBS) -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 11:0:2
 
+if HAVE_TESTING
+  GNUNET_ECC = gnunet-ecc
+endif
+
 
 libexec_PROGRAMS = \
  gnunet-service-resolver 
@@ -127,7 +135,7 @@ libexec_PROGRAMS = \
 bin_PROGRAMS = \
  gnunet-resolver \
  gnunet-config \
- gnunet-ecc \
+ $(GNUNET_ECC) \
  gnunet-rsa \
  gnunet-uri 
 
@@ -209,6 +217,7 @@ check_PROGRAMS = \
  test_container_bloomfilter \
  test_container_meta_data \
  test_container_multihashmap \
+ test_container_multihashmap32 \
  test_container_heap \
  test_container_slist \
  test_crypto_aes \
@@ -228,8 +237,9 @@ check_PROGRAMS = \
  test_connection_timeout \
  test_connection_timeout_no_connect \
  test_connection_transmit_cancel \
+ test_mq \
+ test_mq_client \
  test_os_network \
- test_os_priority \
  test_peer \
  test_plugin \
  test_program \
@@ -310,7 +320,12 @@ test_container_meta_data_LDADD = \
 test_container_multihashmap_SOURCES = \
  test_container_multihashmap.c
 test_container_multihashmap_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_container_multihashmap32_SOURCES = \
+ test_container_multihashmap32.c
+test_container_multihashmap32_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
 
 test_container_heap_SOURCES = \
  test_container_heap.c
@@ -409,16 +424,21 @@ test_connection_transmit_cancel_SOURCES = \
 test_connection_transmit_cancel_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_mq_SOURCES = \
+ test_mq.c
+test_mq_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+test_mq_client_SOURCES = \
+ test_mq_client.c
+test_mq_client_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 test_os_network_SOURCES = \
  test_os_network.c
 test_os_network_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_os_priority_SOURCES = \
- test_os_priority.c
-test_os_priority_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 test_peer_SOURCES = \
  test_peer.c
 test_peer_LDADD = \
@@ -516,7 +536,6 @@ perf_malloc_LDADD = \
 EXTRA_DIST = \
   test_configuration_data.conf \
   test_program_data.conf \
-  test_pseudonym_data.conf \
   test_resolver_api_data.conf \
   test_service_data.conf \
   test_speedup_data.conf