From 0554fa7691ee495f545a72972d6417db8b2623c2 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 27 Jan 2016 15:05:39 +0100
Subject: fix syntax issues in Makefile.am

---
 src/bank-lib/Makefile.am       | 14 --------------
 src/include/taler_signatures.h | 27 +++++++++++++++++++++++++++
 src/wire/Makefile.am           |  3 ++-
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am
index 5b3b4d25f..326fdd5af 100644
--- a/src/bank-lib/Makefile.am
+++ b/src/bank-lib/Makefile.am
@@ -31,17 +31,3 @@ libtalerbank_la_LIBADD += -lgnurl
 endif
 endif
 
-#check_PROGRAMS = \
-#  test_bank_api
-
-#TESTS = \
-#  $(check_PROGRAMS)
-
-#test_bank_api_SOURCES = \
-#  test_bank_api.c
-#test_bank_api_LDADD = \
-#  libtalerbank.la \
-#  $(LIBGCRYPT_LIBS) \
-#  $(top_builddir)/src/util/libtalerutil.la \
-#  -lgnunetutil \
-#  -ljansson
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index 29008fc9a..85c681dac 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -859,6 +859,33 @@ struct TALER_ContractPS
    */
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
+  /**
+   * Merchant-generated transaction ID to detect duplicate
+   * transactions, in big endian.  The merchant must communicate a
+   * merchant-unique ID to the customer for each transaction.  Note
+   * that different coins that are part of the same transaction can
+   * use the same transaction ID.  The transaction ID is useful for
+   * later disputes, and the merchant's contract offer (@e h_contract)
+   * with the customer should include the offer's term and transaction
+   * ID signed with a key from the merchant.  This field must match
+   * the corresponding field in the JSON contract.
+   */
+  uint64_t transaction_id GNUNET_PACKED;
+
+  /**
+   * The total amount to be paid to the merchant. Note that if deposit
+   * fees are higher than @e max_fee, the actual total must be higher
+   * to cover the additional fees.  This field must match the
+   * corresponding field in the JSON contract.
+   */
+  struct TALER_AmountNBO total_amount;
+
+  /**
+   * The maximum fee the merchant is willing to cover.  This field
+   * must match the corresponding field in the JSON contract.
+   */
+  struct TALER_AmountNBO max_fee;
+
   /**
    * Hash of the JSON contract in UTF-8 including 0-termination,
    * using JSON_COMPACT | JSON_SORT_KEYS
diff --git a/src/wire/Makefile.am b/src/wire/Makefile.am
index fb6f25616..eb2e893fa 100644
--- a/src/wire/Makefile.am
+++ b/src/wire/Makefile.am
@@ -53,7 +53,7 @@ libtaler_plugin_wire_template_la_LDFLAGS = \
 libtalerwire_la_SOURCES = \
   wire.c
 libtalerwire_la_LIBADD = \
-  -lgnunetutil
+  -lgnunetutil \
   $(XLIB)
 libtalerwire_la_LDFLAGS = \
   -version-info 0:0:0 \
@@ -75,3 +75,4 @@ test_sepa_wireformat_LDADD = \
   -ljansson \
   libtalerwire.la \
   $(top_builddir)/src/util/libtalerutil.la
+
-- 
cgit v1.2.3