[taler-taler-mdb] 93/93: merged refactor

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository taler-mdb.

commit a267c2dc1633f2231391b54362b088ece1e1758d
Merge: 345aeee e56ae2f
Author: Boss Marco <address@hidden>
AuthorDate: Mon Nov 18 21:09:39 2019 +0100

    merged refactor

 .gitignore             |    5 +-
 Makefile.am            |    2 +-
 README                 |    5 +-
 configure.ac           |  157 ++++++-
 contrib/uncrustify.cfg |   19 +-
 src/Makefile.am        |   21 +-
 src/communication.c    |  251 -----------
 src/communication.h    |   52 ---
 src/configuration.h    |   53 ---
 src/main.c             | 1166 ++++++++++++++++++++++++++++++++++++++++++++----
 src/nfc.c              |  131 ------
 src/nfc.h              |   35 --
 src/product.c          |  148 ------
 src/product.h          |   68 ---
 src/taler-mdb          |  Bin 0 -> 108040 bytes
 src/target.mk          |    6 -
 src/wallet.c           |  147 ------
 src/wallet.h           |   56 ---
 taler.conf             |   43 ++
 19 files changed, 1279 insertions(+), 1086 deletions(-)

diff --cc contrib/uncrustify.cfg
index 8c9df2c,f56c8e7..cc9552f
--- a/contrib/uncrustify.cfg
+++ b/contrib/uncrustify.cfg
@@@ -80,16 -75,4 +75,4 @@@ sp_func_call_paren = ad
  sp_func_proto_paren = add
  sp_func_proto_paren_empty = add
  sp_func_def_paren = add
--sp_func_def_paren_empty = add
- 
- # We'd want it for "if ( (foo) || (bar) )", but not for "if (m())",
- # so as uncrustify doesn't give exactly what we want => ignore
- sp_paren_paren = ignore
- sp_inside_paren = remove
- sp_bool = force
- 
- nl_func_type_name = force
- #nl_branch_else = add
- nl_else_brace = add
- nl_elseif_brace = add
- nl_for_brace = add
++sp_func_def_paren_empty = add
diff --cc src/Makefile.am
index 3105b63,9eca344..881df65
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,28 -1,29 +1,29 @@@
  # This Makefile.am is in the public domain
--bin_PROGRAMS = taler-nfc
++bin_PROGRAMS = taler-mdb
  
  if USE_COVERAGE
    AM_CFLAGS = --coverage -O0
    XLIB = -lgcov
  endif
  
--taler_nfc_SOURCES = \
-   nfc.c nfc.h \
-   wallet.c wallet.h \
-   product.c product.h \
-   communication.c communication.h \
++taler_mdb_SOURCES = \
    main.c
--taler_nfc_LDADD = \
++taler_mdb_LDADD = \
+   -ltalermerchant \
+   -ltalerjson \
+   -ltalerutil \
+   -lgnunetcurl \
+   -lgnunetutil \
    -ljansson \
    -lnfc \
-   -lpthread \
+   @QR_LIBS@ \
    $(XLIB)
  
  
  if HAVE_LIBCURL
--taler_nfc_LDADD += -lcurl
++taler_mdb_LDADD += -lcurl
  else
  if HAVE_LIBGNURL
--taler_nfc_LDADD += -lgnurl
++taler_mdb_LDADD += -lgnurl
  endif
  endif
diff --cc src/taler-mdb
index 0000000,0000000..e67dc2b
new file mode 100755
Binary files differ
diff --cc src/target.mk
index bb77a0f,bb77a0f..0000000
deleted file mode 100644,100644
--- a/src/target.mk
+++ /dev/null
@@@ -1,6 -1,6 +1,0 @@@
--TARGET_USER = pi
--TARGET_ADDRESS = 192.168.3.10
--SSH_PORT = 22
--CROSS_TOOLS = $(HOME)/embedded/x-tools
--CROSS = armv8-rpi3-linux-gnueabihf
--TARGET_ARCH = armv8

-- 
To stop receiving notification emails like this one, please contact
address@hidden.