trying to fix #3006, libltdl detection on FreeBSD

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index e9bb41555859128e48dfbd7e30d9eac57b9e1f83..cb058e40d6533e5acb8de1c399466cd0747d70eb 100644 (file)
--- 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 \
@@ -80,15 +81,14 @@ libgnunetutil_la_SOURCES = \
   crypto_hash.c \
   crypto_hkdf.c \
   crypto_kdf.c \
-  crypto_ksk.c \
   crypto_random.c \
-  crypto_rsa.c \
   disk.c \
   disk.h \
   getopt.c \
   getopt_helpers.c \
   helper.c \
   load.c \
+  mq.c \
   network.c \
   os_installation.c \
   os_network.c \
@@ -96,7 +96,6 @@ libgnunetutil_la_SOURCES = \
   peer.c \
   plugin.c \
   program.c \
-  pseudonym.c \
   resolver_api.c resolver.h \
   scheduler.c \
   server.c \
@@ -109,17 +108,20 @@ libgnunetutil_la_SOURCES = \
   time.c \
   speedup.c
 
-
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
   $(LTLIBICONV) \
   $(LTLIBINTL) \
-  -lltdl -lz -lunistring $(XLIB) 
+  -lltdl $(Z_LIBS) -lunistring $(XLIB) 
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 10:0:1
+  -version-info 11:0:2
+
+if HAVE_TESTING
+  GNUNET_ECC = gnunet-ecc
+endif
 
 
 libexec_PROGRAMS = \
@@ -128,8 +130,7 @@ libexec_PROGRAMS = \
 bin_PROGRAMS = \
  gnunet-resolver \
  gnunet-config \
- gnunet-ecc \
- gnunet-rsa \
+ $(GNUNET_ECC) \
  gnunet-uri 
 
 
@@ -151,15 +152,6 @@ gnunet_resolver_DEPENDENCIES = \
   libgnunetutil.la
 
 
-gnunet_rsa_SOURCES = \
- gnunet-rsa.c         
-gnunet_rsa_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL) -lgcrypt
-gnunet_rsa_DEPENDENCIES = \
-  libgnunetutil.la
-
-
 gnunet_ecc_SOURCES = \
  gnunet-ecc.c         
 gnunet_ecc_LDADD = \
@@ -210,6 +202,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 \
@@ -218,9 +211,7 @@ check_PROGRAMS = \
  test_crypto_ecc \
  test_crypto_hash \
  test_crypto_hkdf \
- test_crypto_ksk \
  test_crypto_random \
- test_crypto_rsa \
  test_disk \
  test_getopt \
  test_connection \
@@ -229,12 +220,12 @@ 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 \
- test_pseudonym \
  test_resolver_api \
  test_scheduler \
  test_scheduler_delay \
@@ -245,6 +236,7 @@ check_PROGRAMS = \
  $(SERVER_CLIENT_UNIX) \
  test_service \
  test_strings \
+ test_strings_to_data \
  test_time \
  test_speedup \
  $(BENCHMARKS) \
@@ -311,7 +303,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
@@ -342,7 +339,8 @@ test_crypto_crc_LDADD = \
 test_crypto_ecc_SOURCES = \
  test_crypto_ecc.c
 test_crypto_ecc_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LIBGCRYPT_LIBS)
 
 test_crypto_hash_SOURCES = \
  test_crypto_hash.c
@@ -354,21 +352,11 @@ test_crypto_hkdf_SOURCES = \
 test_crypto_hkdf_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_crypto_ksk_SOURCES = \
- test_crypto_ksk.c
-test_crypto_ksk_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 test_crypto_random_SOURCES = \
  test_crypto_random.c
 test_crypto_random_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_crypto_rsa_SOURCES = \
- test_crypto_rsa.c
-test_crypto_rsa_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 test_disk_SOURCES = \
  test_disk.c
 test_disk_LDADD = \
@@ -409,16 +397,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 = \
@@ -434,11 +427,6 @@ test_program_SOURCES = \
 test_program_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_pseudonym_SOURCES = \
- test_pseudonym.c
-test_pseudonym_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 test_resolver_api_SOURCES = \
  test_resolver_api.c
 test_resolver_api_LDADD = \
@@ -490,6 +478,13 @@ test_strings_SOURCES = \
 test_strings_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+
+test_strings_to_data_SOURCES = \
+ test_strings_to_data.c
+test_strings_to_data_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
 test_time_SOURCES = \
  test_time.c
 test_time_LDADD = \
@@ -514,7 +509,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