donau

commit 5325914fb35d5d1ceb18efaff56d950ec0d2baa5
parent 00ca05be7f26579d35db284c30ee4f84f2ec0c62
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
Date:   Fri, 12 Jan 2024 17:23:13 +0100

fix libtaler in makefiles

Diffstat:
M
src/donau-tools/Makefile.am
 | 
2
+-
M
src/donau/Makefile.am
 | 
3
++-
M
src/donaudb/Makefile.am
 | 
8
++++----
M
src/donaudb/plugin_donaudb_postgres.c
 | 
3
+++
M
src/lib/Makefile.am
 | 
3
++-
M
src/testing/Makefile.am
 | 
2
+-

6 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/donau-tools/Makefile.am b/src/donau-tools/Makefile.am
@@ -19,9 +19,9 @@ donau_dbinit_SOURCES = \
 donau_dbinit_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libdonauutil.la \
-  $(top_builddir)/src/pq/libtalerpq.la \
   $(top_builddir)/src/donaudb/libdonaudb.la \
   -lgnunetutil \
+  -ltalerpq \
   $(XLIB)
 donau_dbinit_CPPFLAGS = \
   -I$(top_srcdir)/src/include \
diff --git a/src/donau/Makefile.am b/src/donau/Makefile.am
@@ -21,12 +21,13 @@ bin_PROGRAMS = \
 
 donau_httpd_LDADD = \
   $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/donaudb/libdonaudb.la \
   $(top_builddir)/src/util/libdonauutil.la \
   -lmicrohttpd \
   -ltalermhd   \
   -ltalerutil  \
+  -ltalerjson  \
+  -ltalerpq \
   -lgnunetcurl \
   -lgnunetutil \
   -lgnunetjson \
diff --git a/src/donaudb/Makefile.am b/src/donaudb/Makefile.am
@@ -95,14 +95,14 @@ libtaler_plugin_donaudb_postgres_la_LIBADD = \
   $(LTLIBINTL)
 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/libdonauutil.la \
   -lpq \
   -lpthread \
   -lgnunetpq \
   -lgnunetutil \
   -ljansson \
+  -ltalerjson \
+  -ltalerpq \
   $(XLIB)
 
 lib_LTLIBRARIES = \
@@ -132,12 +132,12 @@ test_donaudb_postgres_SOURCES = \
   test_donaudb.c
 test_donaudb_postgres_LDADD = \
   libdonaudb.la \
-  $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libdonauutil.la \
-  $(top_builddir)/src/pq/libtalerpq.la \
   -ljansson \
   -lgnunetjson \
   -lgnunetutil \
+  -ltalerjson \
+  -ltalerpq \
   $(XLIB)
 
 EXTRA_test_donaudb_postgres_DEPENDENCIES = \
diff --git a/src/donaudb/plugin_donaudb_postgres.c b/src/donaudb/plugin_donaudb_postgres.c
@@ -58,6 +58,7 @@
 #include "pg_lookup_signing_key.h"
 #include "pg_lookup_charity.h"
 #include "pg_get_charities.h"
+#include "pg_insert_charity.h"
 
 /**
  * Set to 1 to enable Postgres auto_explain module. This will
@@ -296,6 +297,8 @@ libtaler_plugin_donaudb_postgres_init (void *cls)
   //  = &DH_PG_lookup_signing_key;
   plugin->lookup_charity
     = &DH_PG_lookup_charity;
+  plugin->insert_charity
+    = &DH_PG_insert_charity;
   plugin->get_charities
     = &DH_PG_get_charities;
 
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -25,12 +25,13 @@ libdonau_la_SOURCES = \
  
 ## maybe need libtalercurl
 libdonau_la_LIBADD = \
-	$(top_builddir)/src/json/libtalerjson.la \
 	$(top_builddir)/src/util/libdonauutil.la \
 	-lgnunetcurl \
 	-lgnunetjson \
 	-lgnunetutil \
 	-ljansson \
+	-ltalerpq \
+	-ltalerjson \
 	$(LIBGNURLCURL_LIBS) \
 	$(XLIB)
 
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
@@ -40,11 +40,11 @@ test_donau_api_cs_LDADD = \
   libdonautesting.la \
   $(top_builddir)/src/lib/libdonau.la \
   $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libdonauutil.la \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
+  -ltalerjson \
   $(XLIB)
 
 test_donau_api_rsa_SOURCES = \