summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-12-08 16:39:37 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-12-08 16:39:37 +0100
commit1a273fd9543a39900ffc57ea43b99ff618c1e485 (patch)
tree2faf83eb4b3bbc85b44925037c1de8ddae2e9432 /src/Makefile.am
parent14aba6e9089ebb1eb52e258523eac23ce046cea9 (diff)
downloadmerchant-1a273fd9543a39900ffc57ea43b99ff618c1e485.tar.gz
merchant-1a273fd9543a39900ffc57ea43b99ff618c1e485.tar.bz2
merchant-1a273fd9543a39900ffc57ea43b99ff618c1e485.zip
Fix track-transaction conflict
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am2
1 files changed, 1 insertions, 1 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