move taler-auditor-sign tool to auditor/ direcotory

5 files changed, 19 insertions, 23 deletions

diff --git a/src/auditor/Makefile.am b/src/auditor/Makefile.am
index c0868ce76..724b43205 100644
--- a/src/auditor/Makefile.am
+++ b/src/auditor/Makefile.am
@@ -12,7 +12,8 @@ pkgcfg_DATA = \
   auditor.conf
 
 bin_PROGRAMS = \
-  taler-auditor
+  taler-auditor \
+  taler-auditor-sign
 
 taler_auditor_SOURCES = \
   taler-auditor.c
@@ -24,5 +25,15 @@ taler_auditor_LDADD = \
   $(top_builddir)/src/auditordb/libtalerauditordb.la \
   -lgnunetutil
 
+taler_auditor_sign_SOURCES = \
+  taler-auditor-sign.c
+taler_auditor_sign_LDADD = \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
+  -lgnunetutil $(XLIB)
+
+
+
 EXTRA_DIST = \
   auditor.conf
diff --git a/src/auditor/auditor.conf b/src/auditor/auditor.conf
index 65794c605..22395cc6e 100644
--- a/src/auditor/auditor.conf
+++ b/src/auditor/auditor.conf
@@ -3,3 +3,10 @@
 [auditor]
 # Which database backend do we use for the auditor? 
 DB = postgres
+
+# Where do we store the auditor's private key?
+AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
+
+# What is the Web site of the auditor (i.e. to file complaints about
+# a misbehaving exchange)?
+# AUDITOR_URL = https://auditor.taler.net/
diff --git a/src/exchange-tools/taler-auditor-sign.c b/src/auditor/taler-auditor-sign.c
index 6e4fda754..6e4fda754 100644
--- a/src/exchange-tools/taler-auditor-sign.c
+++ b/src/auditor/taler-auditor-sign.c
diff --git a/src/exchange-tools/Makefile.am b/src/exchange-tools/Makefile.am
index a1e4f67a2..2fd4177ed 100644
--- a/src/exchange-tools/Makefile.am
+++ b/src/exchange-tools/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 pkgcfgdir = $(prefix)/share/taler/config.d/
 
 pkgcfg_DATA = \
-  auditor.conf \
   exchange-signkeys.conf \
   coins.conf
 
@@ -14,7 +13,6 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
-  taler-auditor-sign \
   taler-exchange-keyup \
   taler-exchange-keycheck \
   taler-exchange-reservemod \
@@ -31,14 +29,6 @@ taler_exchange_keyup_LDADD = \
   -lgnunetutil $(XLIB)
 taler_exchange_keyup_LDFLAGS = $(POSTGRESQL_LDFLAGS)
 
-taler_auditor_sign_SOURCES = \
-  taler-auditor-sign.c
-taler_auditor_sign_LDADD = \
-  $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-  -lgnunetutil $(XLIB)
-
 
 taler_exchange_wire_SOURCES = \
   taler-exchange-wire.c
diff --git a/src/exchange-tools/auditor.conf b/src/exchange-tools/auditor.conf
deleted file mode 100644
index 7eb5f8ae9..000000000
--- a/src/exchange-tools/auditor.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# This configuration file is in the public domain
-#
-# It cointains options for the auditor.
-
-[auditor]
-
-# Where do we store the auditor's private key?
-AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
-
-# What is the Web site of the auditor (i.e. to file complaints about
-# a misbehaving exchange)?
-# AUDITOR_URL = https://auditor.taler.net/