merchant

commit 63c42bce3a0bdb06154d1903a1821b502762df04
parent cfccbfa3020c44445e6dae32e0863491d3607825
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Tue, 13 Dec 2016 16:24:05 +0100

#4835

Diffstat:
M
configure.ac
 | 
1
+
M
src/Makefile.am
 | 
2
+-
M
src/merchant-tools/Makefile.am
 | 
3
++-
M
src/merchant-tools/taler-merchant-dbinit.c
 | 
3
++-

4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -276,6 +276,7 @@ AM_CONDITIONAL([HAVE_TSC], [test "x$tsc" = xyes])
 AC_CONFIG_FILES([Makefile
 doc/Makefile
 src/Makefile
+src/merchant-tools/Makefile
 src/include/Makefile
 src/backenddb/Makefile
 src/backend/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,3 +1,3 @@
 # This Makefile is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
-SUBDIRS = include backenddb backend lib
+SUBDIRS = include backenddb backend lib merchant-tools
diff --git a/src/merchant-tools/Makefile.am b/src/merchant-tools/Makefile.am
@@ -1,3 +1,5 @@
+
+
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
@@ -7,7 +9,6 @@ bin_PROGRAMS = \
 taler_merchant_dbinit_SOURCES = \
   taler-merchant-dbinit.c
 
-
 taler_merchant_dbinit_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/backenddb/libtalermerchantdb.la \
diff --git a/src/merchant-tools/taler-merchant-dbinit.c b/src/merchant-tools/taler-merchant-dbinit.c
@@ -20,8 +20,9 @@
  * @author Marcello Stanisci
  */
 #include "platform.h"
+#include <taler/taler_util.h>
 #include <gnunet/gnunet_util_lib.h>
-#include "taler_merchantdb_plugin.h"
+#include "taler_merchantdb_lib.h"
 
 
 /**