Fixed one serious bug, working on another. Still very broken.

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 4613be59c7601f2bdee0e9581b57ac895b72841a..737726e3f2687fb2f1b50b333f27548767859cb0 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,4 +1,5 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 plugindir = $(libdir)/gnunet
 
@@ -45,12 +46,6 @@ gnunet_helper_w32_console_SOURCES = \
 gnunet_helper_w32_console_LDADD = \
   libgnunetutil.la
 
-noinst_PROGRAMS = \
- gnunet-config-diff \
- $(W32CAT) \
- test_common_logging_dummy
-
-
 gnunet_config_diff_SOURCES = \
  gnunet-config-diff.c
 gnunet_config_diff_LDADD = \
@@ -61,8 +56,6 @@ test_common_logging_dummy_SOURCES = \
 test_common_logging_dummy_LDADD = \
  libgnunetutil.la
 
-lib_LTLIBRARIES = libgnunetutil.la
-
 libgnunetutil_la_SOURCES = \
   bandwidth.c \
   bio.c \
@@ -72,6 +65,7 @@ libgnunetutil_la_SOURCES = \
   common_endian.c \
   common_logging.c \
   configuration.c \
+  configuration_loader.c \
   connection.c \
   container_bloomfilter.c \
   container_heap.c \
@@ -79,17 +73,21 @@ libgnunetutil_la_SOURCES = \
   container_multihashmap.c \
   container_multipeermap.c \
   container_multihashmap32.c \
-  container_slist.c \
   crypto_symmetric.c \
   crypto_crc.c \
   crypto_ecc.c \
+  crypto_ecc_dlog.c \
+  crypto_ecc_setup.c \
   crypto_hash.c \
+  crypto_hash_file.c \
   crypto_hkdf.c \
   crypto_kdf.c \
   crypto_mpi.c \
   crypto_paillier.c \
   crypto_random.c \
+  crypto_rsa.c \
   disk.c \
+  disk_iterator.c \
   disk.h \
   getopt.c \
   getopt_helpers.c \
@@ -113,6 +111,7 @@ libgnunetutil_la_SOURCES = \
   signal.c \
   strings.c \
   time.c \
+  socks.c \
   speedup.c speedup.h
 
 libgnunetutil_la_LIBADD = \
@@ -124,13 +123,45 @@ libgnunetutil_la_LIBADD = \
 
 libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
-  -version-info 12:0:0
+  -version-info 13:0:0
+
+
+libgnunetutil_taler_wallet_la_SOURCES = \
+  common_allocation.c \
+  common_endian.c \
+  common_logging.c \
+  container_heap.c \
+  container_multihashmap.c \
+  container_multihashmap32.c \
+  crypto_symmetric.c \
+  crypto_crc.c \
+  crypto_ecc.c \
+  crypto_hash.c \
+  crypto_hkdf.c \
+  crypto_kdf.c \
+  crypto_mpi.c \
+  crypto_random.c \
+  crypto_rsa.c \
+  strings.c \
+  time.c
+
+libgnunetutil_taler_wallet_la_LIBADD = \
+  $(LIBGCRYPT_LIBS) \
+  -lunistring
+
+libgnunetutil_taler_wallet_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS) \
+  -version-info 0:0:0
 
 if HAVE_TESTING
   GNUNET_ECC = gnunet-ecc
   GNUNET_SCRYPT = gnunet-scrypt
 endif
 
+if TALER_ONLY
+lib_LTLIBRARIES = libgnunetutil_taler_wallet.la
+else
+lib_LTLIBRARIES = libgnunetutil.la
 
 libexec_PROGRAMS = \
  gnunet-service-resolver \
@@ -146,6 +177,20 @@ bin_PROGRAMS = \
  $(GNUNET_SCRYPT) \
  gnunet-uri
 
+noinst_PROGRAMS = \
+ gnunet-config-diff \
+ $(W32CAT) \
+ test_common_logging_dummy
+
+
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+TESTS = $(check_PROGRAMS)
+endif
+
+endif
+
+
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
 gnunet-qr: gnunet-qr.py.in Makefile
@@ -203,7 +248,9 @@ libgnunet_plugin_test_la_LDFLAGS = \
 if HAVE_BENCHMARKS
  BENCHMARKS = \
   perf_crypto_hash \
+  perf_crypto_paillier \
   perf_crypto_symmetric \
+  perf_crypto_asymmetric \
   perf_malloc
 endif
 
@@ -220,16 +267,19 @@ check_PROGRAMS = \
  test_container_multihashmap32 \
  test_container_multipeermap \
  test_container_heap \
- test_container_slist \
  test_crypto_symmetric \
  test_crypto_crc \
  test_crypto_ecdsa \
  test_crypto_eddsa \
  test_crypto_ecdhe \
+ test_crypto_ecdh_eddsa \
+ test_crypto_ecc_dlog \
  test_crypto_hash \
+ test_crypto_hash_context \
  test_crypto_hkdf \
  test_crypto_paillier \
  test_crypto_random \
+ test_crypto_rsa \
  test_disk \
  test_getopt \
  test_connection.nc \
@@ -261,10 +311,6 @@ check_PROGRAMS = \
  test_os_start_process \
  test_common_logging_runtime_loglevels
 
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
-TESTS = $(check_PROGRAMS)
-endif
 
 # Declare .nc (NO-CONCURRENCY) as a test extension so that we can impart
 # sequential execution order for them
@@ -356,11 +402,6 @@ test_container_heap_SOURCES = \
 test_container_heap_LDADD = \
  libgnunetutil.la
 
-test_container_slist_SOURCES = \
- test_container_slist.c
-test_container_slist_LDADD = \
- libgnunetutil.la
-
 test_crypto_symmetric_SOURCES = \
  test_crypto_symmetric.c
 test_crypto_symmetric_LDADD = \
@@ -383,17 +424,34 @@ test_crypto_eddsa_LDADD = \
  libgnunetutil.la \
  $(LIBGCRYPT_LIBS)
 
+test_crypto_ecc_dlog_SOURCES = \
+ test_crypto_ecc_dlog.c
+test_crypto_ecc_dlog_LDADD = \
+ libgnunetutil.la \
+ $(LIBGCRYPT_LIBS)
+
 test_crypto_ecdhe_SOURCES = \
  test_crypto_ecdhe.c
 test_crypto_ecdhe_LDADD = \
  libgnunetutil.la \
  $(LIBGCRYPT_LIBS)
 
+test_crypto_ecdh_eddsa_SOURCES = \
+ test_crypto_ecdh_eddsa.c
+test_crypto_ecdh_eddsa_LDADD = \
+ libgnunetutil.la \
+ $(LIBGCRYPT_LIBS)
+
 test_crypto_hash_SOURCES = \
  test_crypto_hash.c
 test_crypto_hash_LDADD = \
  libgnunetutil.la
 
+test_crypto_hash_context_SOURCES = \
+ test_crypto_hash_context.c
+test_crypto_hash_context_LDADD = \
+ libgnunetutil.la
+
 test_crypto_hkdf_SOURCES = \
  test_crypto_hkdf.c
 test_crypto_hkdf_LDADD = \
@@ -410,6 +468,11 @@ test_crypto_random_SOURCES = \
 test_crypto_random_LDADD = \
  libgnunetutil.la
 
+test_crypto_rsa_SOURCES = \
+ test_crypto_rsa.c
+test_crypto_rsa_LDADD = \
+ libgnunetutil.la
+
 test_disk_SOURCES = \
  test_disk.c
 test_disk_LDADD = \
@@ -558,6 +621,17 @@ perf_crypto_symmetric_SOURCES = \
 perf_crypto_symmetric_LDADD = \
  libgnunetutil.la
 
+perf_crypto_asymmetric_SOURCES = \
+ perf_crypto_asymmetric.c
+perf_crypto_asymmetric_LDADD = \
+ libgnunetutil.la
+
+perf_crypto_paillier_SOURCES = \
+ perf_crypto_paillier.c
+perf_crypto_paillier_LDADD = \
+ libgnunetutil.la \
+ -lgcrypt
+
 perf_malloc_SOURCES = \
  perf_malloc.c
 perf_malloc_LDADD = \