[GNUnet-SVN] [taler-merchant] branch master updated: moving all the tools in one place

[gnunet]

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

marcello pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new b50bb3a  moving all the tools in one place
b50bb3a is described below

commit b50bb3ad2bc31fceccaa686fa91ceace278c1897
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu May 11 14:03:34 2017 +0200

    moving all the tools in one place
---
 configure.ac                                       |  6 +++---
 src/Makefile.am                                    |  2 +-
 src/merchant-tools/Makefile.am                     | 23 +++++++++++++++++++---
 src/{samples => merchant-tools}/README             |  6 ++++++
 src/{ => merchant-tools}/mitm/Makefile.in          |  0
 src/{ => merchant-tools}/mitm/README               |  0
 .../mitm/merchant-mitm.wsgi.in                     |  0
 src/{ => merchant-tools}/mitm/setup.py             |  0
 .../mitm/taler-merchant-mitm.in                    |  0
 .../mitm/talermerchantmitm/__init__.py             |  0
 .../mitm/talermerchantmitm/mitm.py                 |  0
 .../taler-merchant-generate-payments.c}            |  0
 src/samples/Makefile.am                            | 21 --------------------
 13 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4211651..b74123e 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 ea8281e..e58cf01 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 97f448d..2adee91 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
similarity index 94%
rename from src/samples/README
rename to src/merchant-tools/README
index d1dfcd9..993a87e 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
similarity index 100%
rename from src/mitm/Makefile.in
rename to src/merchant-tools/mitm/Makefile.in
diff --git a/src/mitm/README b/src/merchant-tools/mitm/README
similarity index 100%
rename from src/mitm/README
rename to src/merchant-tools/mitm/README
diff --git a/src/mitm/merchant-mitm.wsgi.in 
b/src/merchant-tools/mitm/merchant-mitm.wsgi.in
similarity index 100%
rename from src/mitm/merchant-mitm.wsgi.in
rename to src/merchant-tools/mitm/merchant-mitm.wsgi.in
diff --git a/src/mitm/setup.py b/src/merchant-tools/mitm/setup.py
similarity index 100%
rename from src/mitm/setup.py
rename to src/merchant-tools/mitm/setup.py
diff --git a/src/mitm/taler-merchant-mitm.in 
b/src/merchant-tools/mitm/taler-merchant-mitm.in
similarity index 100%
rename from src/mitm/taler-merchant-mitm.in
rename to src/merchant-tools/mitm/taler-merchant-mitm.in
diff --git a/src/mitm/talermerchantmitm/__init__.py 
b/src/merchant-tools/mitm/talermerchantmitm/__init__.py
similarity index 100%
rename from src/mitm/talermerchantmitm/__init__.py
rename to src/merchant-tools/mitm/talermerchantmitm/__init__.py
diff --git a/src/mitm/talermerchantmitm/mitm.py 
b/src/merchant-tools/mitm/talermerchantmitm/mitm.py
similarity index 100%
rename from src/mitm/talermerchantmitm/mitm.py
rename to src/merchant-tools/mitm/talermerchantmitm/mitm.py
diff --git a/src/samples/generate_payments.c 
b/src/merchant-tools/taler-merchant-generate-payments.c
similarity index 100%
rename from src/samples/generate_payments.c
rename to 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 54c6d8f..0000000
--- 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

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