dhtlog updates

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 4cae7b19da07e6069e3e69b58e0b52e354ff5894..6d88537e5ce2693e205eaf3574d183aac532a2d9 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -11,7 +11,7 @@ libgnunetutilwin_la_SOURCES = \
 libgnunetutilwin_la_LDFLAGS = \
   -Wl,--no-undefined -Wl,--export-all-symbols 
 libgnunetutilwin_la_LIBADD = \
-  -lshell32 -luuid -liconv -lstdc++ \
+  -lshell32 -liconv -lstdc++ \
   -lcomdlg32 -lgdi32
 WINLIB = libgnunetutilwin.la
 endif
@@ -24,11 +24,11 @@ endif
 lib_LTLIBRARIES = libgnunetutil.la
 
 libgnunetutil_la_SOURCES = \
+  bandwidth.c \
   bio.c \
   client.c \
   common_allocation.c \
   common_endian.c \
-  common_gettext.c \
   common_logging.c \
   configuration.c \
   connection.c \
@@ -40,6 +40,7 @@ libgnunetutil_la_SOURCES = \
   crypto_aes.c \
   crypto_crc.c \
   crypto_hash.c \
+  crypto_hkdf.c \
   crypto_ksk.c \
   crypto_random.c \
   crypto_rsa.c \
@@ -56,22 +57,23 @@ libgnunetutil_la_SOURCES = \
   plugin.c \
   program.c \
   pseudonym.c \
-  resolver_api.c \
+  resolver_api.c resolver.h \
   scheduler.c \
   server.c \
+  server_mst.c \
   server_nc.c \
   server_tc.c \
   service.c \
   signal.c \
   strings.c \
-  time.c \
-  $(WINSRC)
+  time.c
 
 
 libgnunetutil_la_LIBADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LIBGCRYPT_LIBS) \
-  -lgmp -lltdl -lz -lextractor $(XLIB)
+  $(LTLIBICONV) \
+  -lgmp -lltdl -lz $(XLIB)
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
@@ -96,9 +98,6 @@ libgnunet_plugin_test_la_SOURCES = \
 libgnunet_plugin_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
-check_SCRIPTS = \
- prep_script.sh
-
 check_PROGRAMS = \
  test_bio \
  test_client \
@@ -115,6 +114,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 \
@@ -142,10 +142,12 @@ check_PROGRAMS = \
  test_service \
  test_strings \
  test_time \
- perf_crypto_hash
-
-TESTS = $(check_SCRIPTS) $(check_PROGRAMS)
+ perf_crypto_hash \
+ test_os_start_process 
 
+if !DISABLE_TEST_RUN
+TESTS = $(check_PROGRAMS)
+endif
 
 test_bio_SOURCES = \
  test_bio.c
@@ -153,6 +155,11 @@ test_bio_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la
 
 
+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 = \
@@ -186,7 +193,7 @@ test_container_bloomfilter_LDADD = \
 test_container_meta_data_SOURCES = \
  test_container_meta_data.c
 test_container_meta_data_LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la -lextractor
 
 test_container_multihashmap_SOURCES = \
  test_container_multihashmap.c
@@ -223,6 +230,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 = \
@@ -365,12 +377,7 @@ 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_container_meta_data_image.jpg \
   test_program_data.conf \
   test_pseudonym_data.conf \
   test_resolver_api_data.conf \