aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-06-20 15:17:35 +0200
committerChristian Grothoff <christian@grothoff.org>2022-06-20 15:17:35 +0200
commit3d660340939a6e4394b8f8ecd53ae7955e47eeae (patch)
tree208e9841656e97421bb32aaed6f1cf0333bf735f
parent360382192f2465c66bf61d6100ccc5d9038f57a7 (diff)
-fix build issues
-rw-r--r--debian/libtalerexchange.install1
-rw-r--r--doc/Makefile.am3
m---------doc/prebuilt0
-rw-r--r--src/exchange-tools/Makefile.am1
-rw-r--r--src/extensions/Makefile.am3
-rw-r--r--src/testing/Makefile.am1
6 files changed, 8 insertions, 1 deletions
diff --git a/debian/libtalerexchange.install b/debian/libtalerexchange.install
index 35961e827..62dd84a61 100644
--- a/debian/libtalerexchange.install
+++ b/debian/libtalerexchange.install
@@ -5,5 +5,6 @@ usr/share/taler/config.d/paths.conf
usr/share/taler/config.d/taler.conf
debian/etc-libtalerexchange/* etc/
usr/bin/taler-config
+usr/bin/taler-crypto-worker
usr/share/man/man5/taler.conf.5
usr/share/man/man1/taler-config*
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 70f10c34f..edb226a86 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,10 +21,13 @@ man_MANS = \
prebuilt/man/taler-exchange-benchmark.1 \
prebuilt/man/taler-exchange-closer.1 \
prebuilt/man/taler-exchange-dbinit.1 \
+ prebuilt/man/taler-exchange-expire.1 \
prebuilt/man/taler-exchange-httpd.1 \
prebuilt/man/taler-exchange-offline.1 \
+ prebuilt/man/taler-exchange-secmod-cs.1\
prebuilt/man/taler-exchange-secmod-eddsa.1\
prebuilt/man/taler-exchange-secmod-rsa.1 \
+ prebuilt/man/taler-exchange-router.1\
prebuilt/man/taler-exchange-transfer.1\
prebuilt/man/taler-exchange-wirewatch.1 \
prebuilt/man/taler-exchange-wire-gateway-client.1\
diff --git a/doc/prebuilt b/doc/prebuilt
-Subproject 74d9c44ebc257a3d8b9c2c0a806508bd0cc5269
+Subproject 1ed97b23f19c80fa84b21a5eb0c686d5491e8ec
diff --git a/src/exchange-tools/Makefile.am b/src/exchange-tools/Makefile.am
index 15e34cb35..8e7790081 100644
--- a/src/exchange-tools/Makefile.am
+++ b/src/exchange-tools/Makefile.am
@@ -68,7 +68,6 @@ taler_crypto_worker_LDADD = \
-lgnunetutil \
-lgnunetjson \
-ljansson \
- -lpthread \
$(LIBGCRYPT_LIBS) \
$(XLIB)
diff --git a/src/extensions/Makefile.am b/src/extensions/Makefile.am
index 792b7eeb3..5d4ed128e 100644
--- a/src/extensions/Makefile.am
+++ b/src/extensions/Makefile.am
@@ -25,6 +25,9 @@ libtalerextensions_la_SOURCES = \
extension_age_restriction.c
libtalerextensions_la_LIBADD = \
+ $(top_builddir)/src/json/libtalerjson.la \
+ $(top_builddir)/src/util/libtalerutil.la \
-lgnunetjson \
+ -lgnunetutil \
-ljansson \
$(XLIB)
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index fb628aedc..96b26473e 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -120,6 +120,7 @@ libtalertesting_la_LIBADD = \
-lgnunetjson \
-lgnunetutil \
-ljansson \
+ -lmicrohttpd \
$(XLIB)