1 files changed, 25 insertions, 42 deletions
diff --git a/src/exchange-tools/Makefile.am b/src/exchange-tools/Makefile.am
index 2327d8111..955544564 100644
--- a/src/exchange-tools/Makefile.am
+++ b/src/exchange-tools/Makefile.am
@@ -4,7 +4,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 pkgcfgdir = $(prefix)/share/taler/config.d/
 
 pkgcfg_DATA = \
-  coins.conf
+  coins.conf \
+  exchange-offline.conf
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -12,44 +13,37 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
-  taler-exchange-keyup \
-  taler-exchange-keycheck \
-  taler-exchange-wire \
+  taler-auditor-offline \
+  taler-exchange-offline \
   taler-exchange-dbinit
 
-taler_exchange_keyup_SOURCES = \
-  taler-exchange-keyup.c
-taler_exchange_keyup_LDADD = \
-  $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/pq/libtalerpq.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-  -lgnunetutil $(XLIB)
-taler_exchange_keyup_LDFLAGS = $(POSTGRESQL_LDFLAGS)
-
-
-taler_exchange_wire_SOURCES = \
-  taler-exchange-wire.c
-taler_exchange_wire_LDADD = \
+taler_exchange_offline_SOURCES = \
+  taler-exchange-offline.c
+taler_exchange_offline_LDADD = \
   $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/lib/libtalerexchange.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/extensions/libtalerextensions.la \
   -lgnunetjson \
+  -lgnunetcurl \
+  -ljansson \
   -lgnunetutil \
-  -ljansson $(XLIB)
-taler_exchange_wire_LDFLAGS = $(POSTGRESQL_LDFLAGS)
+  $(XLIB)
 
-taler_exchange_keycheck_SOURCES = \
-  taler-exchange-keycheck.c
-taler_exchange_keycheck_LDADD = \
+taler_auditor_offline_SOURCES = \
+  taler-auditor-offline.c
+taler_auditor_offline_LDADD = \
   $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/lib/libtalerexchange.la \
+  $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-  -lgnunetutil  $(XLIB)
-taler_exchange_keycheck_LDFLAGS = $(POSTGRESQL_LDFLAGS)
+  $(top_builddir)/src/extensions/libtalerextensions.la \
+  -lgnunetjson \
+  -lgnunetcurl \
+  -ljansson \
+  -lgnunetutil \
+  $(XLIB)
 
 taler_exchange_dbinit_SOURCES = \
   taler-exchange-dbinit.c
@@ -58,9 +52,8 @@ taler_exchange_dbinit_LDADD = \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/pq/libtalerpq.la \
   $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-  -lgnunetutil  $(XLIB)
-taler_exchange_dbinit_LDFLAGS = \
-  $(POSTGRESQL_LDFLAGS)
+  -lgnunetutil \
+  $(XLIB)
 taler_exchange_dbinit_CPPFLAGS = \
   -I$(top_srcdir)/src/include \
   -I$(top_srcdir)/src/pq/ \
@@ -71,17 +64,7 @@ taler_exchange_dbinit_CPPFLAGS = \
 
 AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
 
-check_SCRIPTS = \
-  test_taler_exchange_keyup.sh
-
-TESTS = \
-  $(check_SCRIPTS)
-
 # Distribution
 
 EXTRA_DIST = \
-  test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv \
-  test_taler_exchange_httpd.conf \
-  key-helper.c \
-  $(check_SCRIPTS) \
   $(pkgcfg_DATA)