put crypto worker in exchange-tools, re-enable build

This commit is contained in:
Florian Dold 2021-12-08 15:54:48 +01:00
parent 9d3f7d3a56
commit a00cebcced
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
5 changed files with 17 additions and 15 deletions

View File

@ -1,2 +1,3 @@
taler-exchange-offline taler-exchange-offline
taler-auditor-offline taler-auditor-offline
taler-crypto-worker

View File

@ -15,7 +15,8 @@ endif
bin_PROGRAMS = \ bin_PROGRAMS = \
taler-auditor-offline \ taler-auditor-offline \
taler-exchange-offline \ taler-exchange-offline \
taler-exchange-dbinit taler-exchange-dbinit \
taler-crypto-worker
taler_exchange_offline_SOURCES = \ taler_exchange_offline_SOURCES = \
taler-exchange-offline.c taler-exchange-offline.c
@ -59,6 +60,20 @@ taler_exchange_dbinit_CPPFLAGS = \
-I$(top_srcdir)/src/pq/ \ -I$(top_srcdir)/src/pq/ \
$(POSTGRESQL_CPPFLAGS) $(POSTGRESQL_CPPFLAGS)
taler_crypto_worker_SOURCES = \
taler-crypto-worker.c
taler_crypto_worker_LDADD = \
$(top_builddir)/src/util/libtalerutil.la \
$(top_builddir)/src/json/libtalerjson.la \
-lgnunetutil \
-lgnunetjson \
-ljansson \
-lpthread \
$(LIBGCRYPT_LIBS) \
$(XLIB)
# Testcases # Testcases

View File

@ -25,7 +25,6 @@
#include "taler_error_codes.h" #include "taler_error_codes.h"
#include "taler_json_lib.h" #include "taler_json_lib.h"
#include "taler_signatures.h" #include "taler_signatures.h"
#include "secmod_common.h"
/** /**

1
src/util/.gitignore vendored
View File

@ -1,6 +1,5 @@
taler-config taler-config
test_payto test_payto
taler-crypto-worker
taler-exchange-secmod-rsa taler-exchange-secmod-rsa
taler-exchange-secmod-eddsa taler-exchange-secmod-eddsa
test_helper_rsa test_helper_rsa

View File

@ -58,18 +58,6 @@ taler_exchange_secmod_eddsa_LDADD = \
$(LIBGCRYPT_LIBS) \ $(LIBGCRYPT_LIBS) \
$(XLIB) $(XLIB)
taler_crypto_worker_SOURCES = \
taler-crypto-worker.c
taler_crypto_worker_LDADD = \
libtalerutil.la \
-lgnunetutil \
-lgnunetjson \
-ljansson \
-lpthread \
$(LIBGCRYPT_LIBS) \
$(XLIB)
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \
libtalerutil.la libtalerutil.la