diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-11-16 15:09:04 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-11-16 15:09:04 +0100 |
| commit | 1427644e6e6b4a9eb654b2d26c35e51360ef564c (patch) | |
| tree | 3a9db4fa5de798a5cd6a7aaecc49fa43e9f5eb17 | |
| parent | 1b5eec605e5350bd384a89471d63fb488cafa00c (diff) | |
| download | merchant-1427644e6e6b4a9eb654b2d26c35e51360ef564c.tar.gz merchant-1427644e6e6b4a9eb654b2d26c35e51360ef564c.tar.bz2 merchant-1427644e6e6b4a9eb654b2d26c35e51360ef564c.zip | |
no deadcode in makefile
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/backend/merchant.conf | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 101b5c48..5f796c57 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # This Makefile is in the public domain -SUBDIRS = src copylib examples +SUBDIRS = src if WITH_DOC SUBDIRS += doc endif diff --git a/configure.ac b/configure.ac index ebd74ed5..ca8d7f2a 100644 --- a/configure.ac +++ b/configure.ac @@ -274,13 +274,6 @@ AM_CONDITIONAL([HAVE_TSC], [test "x$tsc" = xyes]) AC_CONFIG_FILES([Makefile -examples/Makefile -examples/blog/Makefile -examples/blog/articles/Makefile -examples/blog/web-common/Makefile -examples/shop/Makefile -examples/shop/web-common/Makefile -copylib/Makefile doc/Makefile src/Makefile src/include/Makefile diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf index 0560111b..49849bc3 100644 --- a/src/backend/merchant.conf +++ b/src/backend/merchant.conf @@ -34,4 +34,4 @@ CONFIG = postgres:///talermerchant KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv [merchant-instance-wireformat-default] -TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json +TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tutorial.json |