1 files changed, 59 insertions, 6 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index e94c64a35..d2504588b 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -10,19 +10,24 @@ endif
 pkgcfgdir = $(prefix)/share/taler/config.d/
 
 pkgcfg_DATA = \
+  currencies.conf \
   paths.conf \
   taler-exchange-secmod-eddsa.conf \
-  taler-exchange-secmod-rsa.conf
+  taler-exchange-secmod-rsa.conf \
+  taler-exchange-secmod-cs.conf
 
 EXTRA_DIST = \
   $(pkgcfg_DATA) \
   taler-config.in \
   test_helper_eddsa.conf \
-  test_helper_rsa.conf
+  test_helper_rsa.conf \
+  test_helper_cs.conf \
+  test_conversion.sh
 
 bin_PROGRAMS = \
   taler-exchange-secmod-eddsa \
-  taler-exchange-secmod-rsa
+  taler-exchange-secmod-rsa \
+  taler-exchange-secmod-cs
 
 bin_SCRIPTS = \
   taler-config
@@ -48,6 +53,16 @@ taler_exchange_secmod_rsa_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(XLIB)
 
+taler_exchange_secmod_cs_SOURCES = \
+  taler-exchange-secmod-cs.c taler-exchange-secmod-cs.h \
+  secmod_common.c secmod_common.h
+taler_exchange_secmod_cs_LDADD = \
+  libtalerutil.la \
+  -lgnunetutil \
+  -lpthread \
+  $(LIBGCRYPT_LIBS) \
+  $(XLIB)
+
 taler_exchange_secmod_eddsa_SOURCES = \
   taler-exchange-secmod-eddsa.c taler-exchange-secmod-eddsa.h \
   secmod_common.c secmod_common.h
@@ -62,16 +77,26 @@ lib_LTLIBRARIES = \
   libtalerutil.la
 
 libtalerutil_la_SOURCES = \
+  age_restriction.c \
   amount.c \
+  aml_signatures.c \
   auditor_signatures.c \
   config.c \
+  conversion.c \
   crypto.c \
-  crypto_helper_denom.c \
+  crypto_confirmation.c \
+  crypto_contract.c \
+  crypto_helper_common.c crypto_helper_common.h \
+  crypto_helper_rsa.c \
+  crypto_helper_cs.c \
   crypto_helper_esign.c \
   crypto_wire.c \
+  denom.c \
+  exchange_signatures.c \
   getopt.c \
   lang.c \
   iban.c \
+  merchant_signatures.c \
   mhd.c \
   offline_signatures.c \
   payto.c \
@@ -85,28 +110,49 @@ libtalerutil_la_SOURCES = \
 
 libtalerutil_la_LIBADD = \
   -lgnunetutil \
+  -lgnunetjson \
+  -lsodium \
+  -ljansson \
   $(LIBGCRYPT_LIBS) \
   -lmicrohttpd $(XLIB) \
+  -lunistring \
+  -lz \
   -lm
 
 libtalerutil_la_LDFLAGS = \
-  -version-info 0:0:0 \
+  -version-info 3:3:2 \
   -no-undefined
 
 
 AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
 
 check_PROGRAMS = \
+ test_age_restriction \
  test_amount \
+ test_conversion \
  test_crypto \
  test_helper_eddsa \
  test_helper_rsa \
+ test_helper_cs \
  test_payto \
  test_url
 
 TESTS = \
  $(check_PROGRAMS)
 
+test_age_restriction_SOURCES = \
+  test_age_restriction.c
+test_age_restriction_LDADD = \
+  -lgnunetutil \
+  libtalerutil.la
+
+test_conversion_SOURCES = \
+  test_conversion.c
+test_conversion_LDADD = \
+  -lgnunetjson \
+  -lgnunetutil \
+  -ljansson \
+  libtalerutil.la
 
 test_amount_SOURCES = \
   test_amount.c
@@ -117,8 +163,9 @@ test_amount_LDADD = \
 test_crypto_SOURCES = \
   test_crypto.c
 test_crypto_LDADD = \
+  libtalerutil.la \
   -lgnunetutil \
-  libtalerutil.la
+  -ljansson
 
 test_payto_SOURCES = \
   test_payto.c
@@ -138,6 +185,12 @@ test_helper_rsa_LDADD = \
   -lgnunetutil \
   libtalerutil.la
 
+test_helper_cs_SOURCES = \
+  test_helper_cs.c
+test_helper_cs_LDADD = \
+  -lgnunetutil \
+  libtalerutil.la
+
 test_url_SOURCES = \
   test_url.c
 test_url_LDADD = \