Returns now GNUNET_SYSERR

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 9aa96d13ad0b480bc83abad02d1c994243fba5c8..427ed25675bedbace46e4712539c3be73fd914af 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -29,7 +29,6 @@ libgnunetutil_la_SOURCES = \
   client.c \
   common_allocation.c \
   common_endian.c \
-  common_gettext.c \
   common_logging.c \
   configuration.c \
   connection.c \
@@ -41,6 +40,8 @@ libgnunetutil_la_SOURCES = \
   crypto_aes.c \
   crypto_crc.c \
   crypto_hash.c \
+  crypto_hkdf.c \
+  crypto_kdf.c \
   crypto_ksk.c \
   crypto_random.c \
   crypto_rsa.c \
@@ -48,9 +49,9 @@ libgnunetutil_la_SOURCES = \
   disk.h \
   getopt.c \
   getopt_helpers.c \
+  load.c \
   network.c \
   os_installation.c \
-  os_load.c \
   os_network.c \
   os_priority.c \
   peer.c \
@@ -72,7 +73,8 @@ libgnunetutil_la_SOURCES = \
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
-  -lgmp -lltdl -lz $(XLIB)
+  $(LTLIBICONV) \
+  -lltdl -lz $(XLIB)
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
@@ -80,7 +82,8 @@ libgnunetutil_la_LDFLAGS = \
 
 
 bin_PROGRAMS = \
- gnunet-service-resolver
+ gnunet-service-resolver \
+ gnunet-resolver
 
 gnunet_service_resolver_SOURCES = \
  gnunet-service-resolver.c         
@@ -89,6 +92,13 @@ gnunet_service_resolver_LDADD = \
   $(GN_LIBINTL)
 
 
+gnunet_resolver_SOURCES = \
+ gnunet-resolver.c         
+gnunet_resolver_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+
 plugin_LTLIBRARIES = \
   libgnunet_plugin_test.la
 
@@ -113,6 +123,7 @@ check_PROGRAMS = \
  test_crypto_aes_weak \
  test_crypto_crc \
  test_crypto_hash \
+ test_crypto_hkdf \
  test_crypto_ksk \
  test_crypto_random \
  test_crypto_rsa \
@@ -124,7 +135,6 @@ check_PROGRAMS = \
  test_connection_timeout \
  test_connection_timeout_no_connect \
  test_connection_transmit_cancel \
- test_os_load \
  test_os_network \
  test_os_priority \
  test_peer \
@@ -143,8 +153,9 @@ check_PROGRAMS = \
  perf_crypto_hash \
  test_os_start_process 
 
+if !DISABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
-
+endif
 
 test_bio_SOURCES = \
  test_bio.c
@@ -156,7 +167,7 @@ test_os_start_process_SOURCES = \
  test_os_start_process.c
 test_os_start_process_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_client_SOURCES = \
  test_client.c
 test_client_LDADD = \
@@ -227,6 +238,11 @@ test_crypto_hash_SOURCES = \
 test_crypto_hash_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_crypto_hkdf_SOURCES = \
+ test_crypto_hkdf.c
+test_crypto_hkdf_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 test_crypto_ksk_SOURCES = \
  test_crypto_ksk.c
 test_crypto_ksk_LDADD = \
@@ -282,11 +298,6 @@ test_connection_transmit_cancel_SOURCES = \
 test_connection_transmit_cancel_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_os_load_SOURCES = \
- test_os_load.c
-test_os_load_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 test_os_network_SOURCES = \
  test_os_network.c
 test_os_network_LDADD = \
@@ -369,10 +380,6 @@ perf_crypto_hash_LDADD = \
 
 
 EXTRA_DIST = \
-  program_lib_argz.c \
-  program_lib_strndup.c \
-  program_lib_strnlen.c \
-  program_lib_mempcpy.c \
   test_configuration_data.conf \
   test_program_data.conf \
   test_pseudonym_data.conf \