donau

commit 634d91c2184d1723e7236b9764c0ec6f120fb3b9
parent 69eb6823438aa1f567cbf66c600b81f53039df17
Author: Pius Loosli <loosp2@bfh.ch>
Date:   Mon, 27 Nov 2023 22:21:23 +0100

[build] libtalerutil.la in various Makefiles

Diffstat:
M
src/donau-tools/Makefile.am
 | 
6
+++---
M
src/donau/Makefile.am
 | 
23
++++++++---------------
M
src/donaudb/Makefile.am
 | 
15
+++++++--------
M
src/json/Makefile.am
 | 
2
+-
M
src/lib/Makefile.am
 | 
6
+++---
M
src/pq/Makefile.am
 | 
2
+-

6 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/src/donau-tools/Makefile.am b/src/donau-tools/Makefile.am
@@ -23,7 +23,7 @@ taler_donau_offline_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/lib/libtalerdonau.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
   -lgnunetjson \
   -lgnunetcurl \
@@ -37,7 +37,7 @@ taler_auditor_offline_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/lib/libtalerdonau.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
   -lgnunetjson \
   -lgnunetcurl \
@@ -49,7 +49,7 @@ taler_donau_dbinit_SOURCES = \
   taler-donau-dbinit.c
 taler_donau_dbinit_LDADD = \
   $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/pq/libtalerpq.la \
   $(top_builddir)/src/donaudb/libtalerdonaudb.la \
   -lgnunetutil \
diff --git a/src/donau/Makefile.am b/src/donau/Makefile.am
@@ -27,8 +27,7 @@ bin_PROGRAMS = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/kyclogic/libtalerkyclogic.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/donaudb/libtalerdonaudb.la \
   -ljansson \
   -lgnunetcurl \
@@ -41,8 +40,7 @@ bin_PROGRAMS = \
 # taler_donau_closer_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \  
   $(top_builddir)/src/donaudb/libtalerdonaudb.la \
   -ljansson \
   -lgnunetcurl \
@@ -54,8 +52,7 @@ bin_PROGRAMS = \
 # taler_donau_drain_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/donaudb/libtalerdonaudb.la \
   -ljansson \
   -lgnunetcurl \
@@ -67,8 +64,7 @@ bin_PROGRAMS = \
 # taler_donau_expire_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \  
   $(top_builddir)/src/donaudb/libtalerdonaudb.la \
   -ljansson \
   -lgnunetcurl \
@@ -80,8 +76,7 @@ bin_PROGRAMS = \
 # taler_donau_router_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \  
   $(top_builddir)/src/donaudb/libtalerdonaudb.la \
   -ljansson \
   -lgnunetcurl \
@@ -93,8 +88,7 @@ bin_PROGRAMS = \
 # taler_donau_transfer_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \  
   $(top_builddir)/src/donaudb/libtalerdonaudb.la \
   -ljansson \
   -lgnunetcurl \
@@ -106,8 +100,7 @@ bin_PROGRAMS = \
 # taler_donau_wirewatch_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \  
   $(top_builddir)/src/donaudb/libtalerdonaudb.la \
   -ljansson \
   -lgnunetcurl \
@@ -181,7 +174,7 @@ taler_donau_httpd_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/donaudb/libtalerdonaudb.la \
   $(top_builddir)/src/templating/libtalertemplating.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
   -lmicrohttpd \
   -lgnunetcurl \
diff --git a/src/donaudb/Makefile.am b/src/donaudb/Makefile.am
@@ -257,7 +257,7 @@ libtaler_plugin_donaudb_postgres_la_LDFLAGS = \
   $(TALER_PLUGIN_LDFLAGS) \
   $(top_builddir)/src/pq/libtalerpq.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   -lpq \
   -lpthread \
   -lgnunetpq \
@@ -272,8 +272,7 @@ libtalerdonaudb_la_SOURCES = \
   donaudb_plugin.c \
   donaudb_transactions.c
 libtalerdonaudb_la_LIBADD = \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   -lgnunetutil \
   $(XLIB)
 libtalerdonaudb_la_LDFLAGS = \
@@ -295,7 +294,7 @@ test_donaudb_postgres_SOURCES = \
 test_donaudb_postgres_LDADD = \
   libtalerdonaudb.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/pq/libtalerpq.la \
   -ljansson \
   -lgnunetjson \
@@ -307,7 +306,7 @@ perf_reserves_in_insert_postgres_SOURCES = \
 perf_reserves_in_insert_postgres_LDADD = \
   libtalerdonaudb.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/pq/libtalerpq.la \
   -ljansson \
   -lgnunetjson \
@@ -320,7 +319,7 @@ perf_select_refunds_by_coin_postgres_SOURCES = \
 perf_select_refunds_by_coin_postgres_LDADD = \
   libtalerdonaudb.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/pq/libtalerpq.la \
   -ljansson \
   -lgnunetjson \
@@ -333,7 +332,7 @@ perf_get_link_data_postgres_SOURCES = \
 perf_get_link_data_postgres_LDADD = \
   libtalerdonaudb.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/pq/libtalerpq.la \
   -ljansson \
   -lgnunetjson \
@@ -346,7 +345,7 @@ perf_deposits_get_ready_postgres_SOURCES = \
 perf_deposits_get_ready_postgres_LDADD = \
   libtalerdonaudb.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/pq/libtalerpq.la \
   -ljansson \
   -lgnunetjson \
diff --git a/src/json/Makefile.am b/src/json/Makefile.am
@@ -36,6 +36,6 @@ test_json_SOURCES = \
 test_json_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   -lgnunetjson \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   -lgnunetutil \
   -ljansson
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -83,7 +83,7 @@ libtalerdonau_la_LIBADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/kyclogic/libtalerkyclogic.la \
   $(top_builddir)/src/curl/libtalercurl.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
   -lgnunetcurl \
   -lgnunetjson \
@@ -103,7 +103,7 @@ libtalerauditor_la_SOURCES = \
 libtalerauditor_la_LIBADD = \
   $(top_builddir)/src/curl/libtalercurl.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   -lgnunetcurl \
   -lgnunetjson \
   -lgnunetutil \
@@ -124,5 +124,5 @@ test_stefan_SOURCES = \
   test_stefan.c
 test_stefan_LDADD = \
   $(top_builddir)/src/lib/libtalerdonau.la \
-  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/util/libtalerdonauutil.la \
   -lgnunetutil
diff --git a/src/pq/Makefile.am b/src/pq/Makefile.am
@@ -33,7 +33,7 @@ test_pq_SOURCES = \
   test_pq.c
 test_pq_LDADD = \
   libtalerpq.la \
-  $(top_builddir)/src/util/libtalerutil.la  \
+  $(top_builddir)/src/util/libtalerdonauutil.la  \
   -lgnunetpq \
   -lgnunetutil \
   -ljansson \