summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-12-08 15:54:48 +0100
committerFlorian Dold <florian@dold.me>2021-12-08 15:54:48 +0100
commita00cebcced1bdee1da998177c06986c1886eb55a (patch)
tree5bfa6f2e51f100686e419469bd149c925660fb1e /src
parent9d3f7d3a56712d6a963e8a4775a8f9757740d648 (diff)
downloadexchange-a00cebcced1bdee1da998177c06986c1886eb55a.tar.gz
exchange-a00cebcced1bdee1da998177c06986c1886eb55a.tar.bz2
exchange-a00cebcced1bdee1da998177c06986c1886eb55a.zip
put crypto worker in exchange-tools, re-enable build
Diffstat (limited to 'src')
-rw-r--r--src/exchange-tools/.gitignore1
-rw-r--r--src/exchange-tools/Makefile.am17
-rw-r--r--src/exchange-tools/taler-crypto-worker.c (renamed from src/util/taler-crypto-worker.c)1
-rw-r--r--src/util/.gitignore1
-rw-r--r--src/util/Makefile.am12
5 files changed, 17 insertions, 15 deletions
diff --git a/src/exchange-tools/.gitignore b/src/exchange-tools/.gitignore
index bf45e9670..69279d792 100644
--- a/src/exchange-tools/.gitignore
+++ b/src/exchange-tools/.gitignore
@@ -1,2 +1,3 @@
taler-exchange-offline
taler-auditor-offline
+taler-crypto-worker
diff --git a/src/exchange-tools/Makefile.am b/src/exchange-tools/Makefile.am
index 82f4cbeb9..846ea6132 100644
--- a/src/exchange-tools/Makefile.am
+++ b/src/exchange-tools/Makefile.am
@@ -15,7 +15,8 @@ endif
bin_PROGRAMS = \
taler-auditor-offline \
taler-exchange-offline \
- taler-exchange-dbinit
+ taler-exchange-dbinit \
+ taler-crypto-worker
taler_exchange_offline_SOURCES = \
taler-exchange-offline.c
@@ -59,6 +60,20 @@ taler_exchange_dbinit_CPPFLAGS = \
-I$(top_srcdir)/src/pq/ \
$(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
diff --git a/src/util/taler-crypto-worker.c b/src/exchange-tools/taler-crypto-worker.c
index 9c49ea374..7ca08b4b6 100644
--- a/src/util/taler-crypto-worker.c
+++ b/src/exchange-tools/taler-crypto-worker.c
@@ -25,7 +25,6 @@
#include "taler_error_codes.h"
#include "taler_json_lib.h"
#include "taler_signatures.h"
-#include "secmod_common.h"
/**
diff --git a/src/util/.gitignore b/src/util/.gitignore
index 946924dcc..f25567f32 100644
--- a/src/util/.gitignore
+++ b/src/util/.gitignore
@@ -1,6 +1,5 @@
taler-config
test_payto
-taler-crypto-worker
taler-exchange-secmod-rsa
taler-exchange-secmod-eddsa
test_helper_rsa
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 790bba735..6c64d77b2 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -58,18 +58,6 @@ taler_exchange_secmod_eddsa_LDADD = \
$(LIBGCRYPT_LIBS) \
$(XLIB)
-taler_crypto_worker_SOURCES = \
- taler-crypto-worker.c
-taler_crypto_worker_LDADD = \
- libtalerutil.la \
- -lgnunetutil \
- -lgnunetjson \
- -ljansson \
- -lpthread \
- $(LIBGCRYPT_LIBS) \
- $(XLIB)
-
-
lib_LTLIBRARIES = \
libtalerutil.la