moving all the tools in one place

13 files changed, 30 insertions, 28 deletions

diff --git a/configure.ac b/configure.ac
index 4211651e..b74123e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,7 @@ src/backenddb/Makefile
 src/backend/Makefile
 src/samples/Makefile
 src/lib/Makefile
-src/mitm/taler-merchant-mitm
-src/mitm/merchant-mitm.wsgi
-src/mitm/Makefile])
+src/merchant-tools/mitm/taler-merchant-mitm
+src/merchant-tools/mitm/merchant-mitm.wsgi
+src/merchant-tools/mitm/Makefile])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index ea8281e5..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 merchant-tools samples mitm
+SUBDIRS = include backenddb backend lib merchant-tools
diff --git a/src/merchant-tools/Makefile.am b/src/merchant-tools/Makefile.am
index 97f448d9..2adee917 100644
--- a/src/merchant-tools/Makefile.am
+++ b/src/merchant-tools/Makefile.am
@@ -1,10 +1,9 @@
-
-
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 bin_PROGRAMS = \
-  taler-merchant-dbinit
+  taler-merchant-dbinit \
+  taler-merchant-generate-payments
 
 taler_merchant_dbinit_SOURCES = \
   taler-merchant-dbinit.c
@@ -15,3 +14,21 @@ taler_merchant_dbinit_LDADD = \
   -lgnunetutil \
   -ltalerutil \
   -ltalerpq
+
+taler_merchant_generate_payments_SOURCES = \
+  taler-merchant-generate-payments.c
+
+taler_merchant_generate_payments_LDADD = \
+  $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
+  $(top_srcdir)/src/lib/libtalermerchant.la \
+  $(LIBGCRYPT_LIBS) \
+  -ltalerfakebank \
+  -ltalerexchange \
+  -ltalerjson \
+  -ltalerutil \
+  -lgnunetjson \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson
+
+SUBDIRS = mitm
diff --git a/src/samples/README b/src/merchant-tools/README
index d1dfcd95..993a87ed 100644
--- a/src/samples/README
+++ b/src/merchant-tools/README
@@ -1,4 +1,6 @@
 
+** Taler Merchant Payments Generator **
+
 === INTRODUCTION ===
 
 The tool contained in this directory is used to populate the
@@ -43,3 +45,7 @@ taler-merchant-generate-payments -c config/file.conf [-n ITERATIONS]
 
 The -n option instructs the tools about how many iteration of all
 the (internal) commands we want to execute.
+
+** Taler Merchant Dbinit **
+
+TBD
diff --git a/src/mitm/Makefile.in b/src/merchant-tools/mitm/Makefile.in
index 4a9f33a2..4a9f33a2 100644
--- a/src/mitm/Makefile.in
+++ b/src/merchant-tools/mitm/Makefile.in
diff --git a/src/mitm/README b/src/merchant-tools/mitm/README
index 662cbe39..662cbe39 100644
--- a/src/mitm/README
+++ b/src/merchant-tools/mitm/README
diff --git a/src/mitm/merchant-mitm.wsgi.in b/src/merchant-tools/mitm/merchant-mitm.wsgi.in
index 3fb4cfbf..3fb4cfbf 100644
--- a/src/mitm/merchant-mitm.wsgi.in
+++ b/src/merchant-tools/mitm/merchant-mitm.wsgi.in
diff --git a/src/mitm/setup.py b/src/merchant-tools/mitm/setup.py
index f5eedeaa..f5eedeaa 100644
--- a/src/mitm/setup.py
+++ b/src/merchant-tools/mitm/setup.py
diff --git a/src/mitm/taler-merchant-mitm.in b/src/merchant-tools/mitm/taler-merchant-mitm.in
index 39a7275e..39a7275e 100644
--- a/src/mitm/taler-merchant-mitm.in
+++ b/src/merchant-tools/mitm/taler-merchant-mitm.in
diff --git a/src/mitm/talermerchantmitm/__init__.py b/src/merchant-tools/mitm/talermerchantmitm/__init__.py
index e69de29b..e69de29b 100644
--- a/src/mitm/talermerchantmitm/__init__.py
+++ b/src/merchant-tools/mitm/talermerchantmitm/__init__.py
diff --git a/src/mitm/talermerchantmitm/mitm.py b/src/merchant-tools/mitm/talermerchantmitm/mitm.py
index c998a1c5..c998a1c5 100644
--- a/src/mitm/talermerchantmitm/mitm.py
+++ b/src/merchant-tools/mitm/talermerchantmitm/mitm.py
diff --git a/src/samples/generate_payments.c b/src/merchant-tools/taler-merchant-generate-payments.c
index 625ee339..625ee339 100644
--- a/src/samples/generate_payments.c
+++ b/src/merchant-tools/taler-merchant-generate-payments.c
diff --git a/src/samples/Makefile.am b/src/samples/Makefile.am
deleted file mode 100644
index 54c6d8fa..00000000
--- a/src/samples/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-bin_PROGRAMS = \
-  taler-merchant-generate-payments
-
-taler_merchant_generate_payments_SOURCES = \
-  generate_payments.c
-
-taler_merchant_generate_payments_LDADD = \
-  $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
-  $(top_srcdir)/src/lib/libtalermerchant.la \
-  $(LIBGCRYPT_LIBS) \
-  -ltalerfakebank \
-  -ltalerexchange \
-  -ltalerjson \
-  -ltalerutil \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson