diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-05-04 10:26:36 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-05-04 10:26:36 +0200 |
| commit | 13ef8e951688e39302f9ef4ae7af14c581205db2 (patch) | |
| tree | 77b54fdbeeb17011afda8d8b2e3b32f577d257ae | |
| parent | 01568f9714c4c12918d5ff7f3bf8bbd30975cf7c (diff) | |
| download | merchant-13ef8e951688e39302f9ef4ae7af14c581205db2.tar.gz merchant-13ef8e951688e39302f9ef4ae7af14c581205db2.tar.bz2 merchant-13ef8e951688e39302f9ef4ae7af14c581205db2.zip | |
fix issues with 'make dist'
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/backend/Makefile.am | 3 | ||||
| -rw-r--r-- | src/backenddb/Makefile.am | 3 | ||||
| -rw-r--r-- | src/include/Makefile.am | 1 | ||||
| -rw-r--r-- | src/lib/test_merchant_api.c | 4 |
6 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 3950b58d..4081e575 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = src copylib examples ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = AUTHORS COPYING.GPL COPING.AGPL COPYING.LGPL +EXTRA_DIST = AUTHORS COPYING.GPL COPYING.AGPL COPYING.LGPL app: mkdir -p $(PACKAGE)-frontend-$(VERSION)-app diff --git a/src/Makefile.am b/src/Makefile.am index 55f6a82b..d0b0df1e 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 +SUBDIRS = include backenddb backend lib diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index 6dbd7745..7436eaa2 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -6,6 +6,9 @@ pkgcfgdir = $(prefix)/share/taler/config.d/ pkgcfg_DATA = \ merchant.conf +EXTRA_DIST = \ + $(pkgcfg_DATA) + bin_PROGRAMS = \ taler-merchant-httpd diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am index a1a9f54b..a96bcdfb 100644 --- a/src/backenddb/Makefile.am +++ b/src/backenddb/Makefile.am @@ -60,3 +60,6 @@ test_merchantdb_postgres_LDADD = \ TESTS = \ test-merchantdb-postgres + +EXTRA_DIST = \ + test-merchantdb-postgres.conf diff --git a/src/include/Makefile.am b/src/include/Makefile.am index f62655b3..2a6e87a5 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -6,4 +6,5 @@ talerincludedir = $(includedir)/taler talerinclude_HEADERS = \ taler_merchantdb_lib.h \ + taler_merchantdb_plugin.h \ taler_merchant_service.h diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c index 79d64775..b5074861 100644 --- a/src/lib/test_merchant_api.c +++ b/src/lib/test_merchant_api.c @@ -902,7 +902,6 @@ interpreter_run (void *cls) fail (is); return; } - trigger_context_task (); return; case OC_WITHDRAW_STATUS: GNUNET_assert (NULL != @@ -918,7 +917,6 @@ interpreter_run (void *cls) &reserve_pub, &reserve_status_cb, is); - trigger_context_task (); return; case OC_WITHDRAW_SIGN: GNUNET_assert (NULL != @@ -978,7 +976,6 @@ interpreter_run (void *cls) fail (is); return; } - trigger_context_task (); return; case OC_PAY: { @@ -1130,7 +1127,6 @@ interpreter_run (void *cls) fail (is); return; } - trigger_context_task (); return; default: GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |