summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-12-13 16:24:05 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-12-13 16:24:05 +0100
commit63c42bce3a0bdb06154d1903a1821b502762df04 (patch)
tree28b021c6b9bf796ee9848d2858e08ead690e3699 /src
parentcfccbfa3020c44445e6dae32e0863491d3607825 (diff)
downloadmerchant-63c42bce3a0bdb06154d1903a1821b502762df04.tar.gz
merchant-63c42bce3a0bdb06154d1903a1821b502762df04.tar.bz2
merchant-63c42bce3a0bdb06154d1903a1821b502762df04.zip
#4835
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/merchant-tools/Makefile.am3
-rw-r--r--src/merchant-tools/taler-merchant-dbinit.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d0b0df1e..e58cf01a 100644
--- 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
index 6b8162e9..97f448d9 100644
--- 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
index 5bffe9d1..35b5a1b6 100644
--- 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"
/**