donau

commit 7d4a97e459cf6bdb1a06c9461f46fcf42bd01261
parent 5048236516c7c5008a02162213f16f6957fc5dab
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
Date:   Mon, 15 Jan 2024 13:44:33 +0100

[testing] solve some linking issues

Diffstat:
M
src/json/Makefile.am
 | 
11
++++++-----
M
src/json/donau_json.c
 | 
16
+---------------
M
src/lib/Makefile.am
 | 
4
+++-
M
src/util/Makefile.am
 | 
7
+++++--

4 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/src/json/Makefile.am b/src/json/Makefile.am
@@ -7,17 +7,18 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
-  libtalerjson.la
+  libdonaujson.la
 
-libtalerjson_la_SOURCES = \
+libdonaujson_la_SOURCES = \
   json.c \
   json_helper.c \
-  json_pack.c
+  json_pack.c \
+  donau_json.c
 
-libtalerjson_la_LDFLAGS = \
+libdonaujson_la_LDFLAGS = \
   -version-info 1:0:1 \
   -no-undefined
-libtalerjson_la_LIBADD = \
+libdonaujson_la_LIBADD = \
   $(top_builddir)/src/util/libdonauutil.la \
   -lgnunetjson \
   -lgnunetutil \
diff --git a/src/json/donau_json.c b/src/json/donau_json.c
@@ -160,7 +160,7 @@ parse_donation_unit_group (void *cls,
                           json_t *root,
                           struct GNUNET_JSON_Specification *spec)
 {
-  struct DonationUnitGroup *group = spec->ptr;
+  struct DONAU_DonationUnitGroup *group = spec->ptr;
   const char *cipher;
   const char *currency = cls;
   struct GNUNET_JSON_Specification gspec[] = {
@@ -213,18 +213,4 @@ DONAU_JSON_spec_donation_unit_group (const char *name,
   };
 
   return ret;
-}
-
-struct GNUNET_JSON_PackSpec
-DONAU_JSON_pack_uint32 (const char *name,
-                         uint32_t num)
-{
-  struct GNUNET_JSON_PackSpec ps = {
-    .field_name = name,
-    .object = json_integer ((json_int_t) num)
-  };
-
-  GNUNET_assert (num <= ULONG_MAX);
-
-  return ps;
 }
 \ No newline at end of file
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -21,11 +21,13 @@ libdonau_la_LDFLAGS = \
 	-no-undefined
 libdonau_la_SOURCES = \
   donau_api_handle.c \
-  donau_api_charity_get.c 
+  donau_api_charity_get.c \
+  donau_api_curl_defaults.c donau_api_curl_defaults.h 
  
 ## maybe need libtalercurl
 libdonau_la_LIBADD = \
 	$(top_builddir)/src/util/libdonauutil.la \
+	$(top_builddir)/src/json/libdonaujson.la \
 	-lgnunetcurl \
 	-lgnunetjson \
 	-lgnunetutil \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
@@ -16,14 +16,17 @@ libdonauutil_la_SOURCES = \
   charity_signatures.c \
   donau_signatures.c \
   donau_os_installation.c \
-  crypto_helper_cs.c \
+  #crypto_helper_cs.c \
   crypto_helper_rsa.c \
-  crypto_helper_esign.c
+  crypto_helper_esign.c \
+  donau_crypto.c
 
 libdonauutil_la_LIBADD = \
   -ltalerutil \
   -lgnunetutil \
+  -ltalerjson \
   -lgnunetjson \
+  -lgnunetcurl \
   -lsodium \
   -ljansson \
   $(LIBGCRYPT_LIBS) \