summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------contrib/gana0
-rw-r--r--src/auditor/Makefile.am24
-rw-r--r--src/auditordb/Makefile.am8
-rw-r--r--src/exchange-tools/Makefile.am12
-rw-r--r--src/exchange/Makefile.am15
-rw-r--r--src/exchangedb/Makefile.am21
-rw-r--r--src/pq/Makefile.am14
-rw-r--r--src/sq/Makefile.am14
-rw-r--r--src/testing/Makefile.am42
9 files changed, 94 insertions, 56 deletions
diff --git a/contrib/gana b/contrib/gana
-Subproject aef5dac1c9a1945c1605a92f552d8a184d09e3e
+Subproject 05da9c93fc7fff258e54a9413d11ea72a82fe03
diff --git a/src/auditor/Makefile.am b/src/auditor/Makefile.am
index c0644cc2..76c3a30d 100644
--- a/src/auditor/Makefile.am
+++ b/src/auditor/Makefile.am
@@ -73,7 +73,8 @@ taler_helper_auditor_reserves_LDADD = \
libauditorreport.la \
-ljansson \
-lgnunetjson \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
taler_helper_auditor_coins_SOURCES = \
taler-helper-auditor-coins.c
@@ -87,7 +88,8 @@ taler_helper_auditor_coins_LDADD = \
libauditorreport.la \
-ljansson \
-lgnunetjson \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
taler_helper_auditor_aggregation_SOURCES = \
taler-helper-auditor-aggregation.c
@@ -101,7 +103,8 @@ taler_helper_auditor_aggregation_LDADD = \
libauditorreport.la \
-ljansson \
-lgnunetjson \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
taler_helper_auditor_deposits_SOURCES = \
taler-helper-auditor-deposits.c
@@ -115,7 +118,8 @@ taler_helper_auditor_deposits_LDADD = \
libauditorreport.la \
-ljansson \
-lgnunetjson \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
taler_helper_auditor_wire_SOURCES = \
taler-helper-auditor-wire.c
@@ -130,7 +134,8 @@ taler_helper_auditor_wire_LDADD = \
-ljansson \
-lgnunetjson \
-lgnunetcurl \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
taler_auditor_httpd_SOURCES = \
@@ -148,7 +153,8 @@ taler_auditor_httpd_LDADD = \
-ljansson \
-lgnunetjson \
-lgnunetutil \
- -lz
+ -lz \
+ $(XLIB)
taler_auditor_sign_SOURCES = \
taler-auditor-sign.c
@@ -157,7 +163,8 @@ taler_auditor_sign_LDADD = \
$(top_builddir)/src/util/libtalerutil.la \
$(top_builddir)/src/auditordb/libtalerauditordb.la \
$(top_builddir)/src/exchangedb/libtalerexchangedb.la \
- -lgnunetutil $(XLIB)
+ -lgnunetutil \
+ $(XLIB)
taler_auditor_exchange_SOURCES = \
@@ -166,7 +173,8 @@ taler_auditor_exchange_LDADD = \
$(LIBGCRYPT_LIBS) \
$(top_builddir)/src/util/libtalerutil.la \
$(top_builddir)/src/auditordb/libtalerauditordb.la \
- -lgnunetutil $(XLIB)
+ -lgnunetutil \
+ $(XLIB)
check_SCRIPTS = \
test-auditor.sh \
diff --git a/src/auditordb/Makefile.am b/src/auditordb/Makefile.am
index c7a2e024..66e9de79 100644
--- a/src/auditordb/Makefile.am
+++ b/src/auditordb/Makefile.am
@@ -42,18 +42,17 @@ libtaler_plugin_auditordb_postgres_la_LDFLAGS = \
$(top_builddir)/src/util/libtalerutil.la \
-lpq \
-lgnunetpq \
- -lgnunetutil $(XLIB)
+ -lgnunetutil \
+ $(XLIB)
lib_LTLIBRARIES = \
libtalerauditordb.la
libtalerauditordb_la_SOURCES = \
auditordb_plugin.c
-
libtalerauditordb_la_LIBADD = \
$(top_builddir)/src/util/libtalerutil.la \
-lgnunetutil $(XLIB)
-
libtalerauditordb_la_LDFLAGS = \
$(POSTGRESQL_LDFLAGS) \
-version-info 0:0:0 \
@@ -77,4 +76,5 @@ test_auditordb_postgres_LDADD = \
libtalerauditordb.la \
$(top_srcdir)/src/pq/libtalerpq.la \
$(top_srcdir)/src/util/libtalerutil.la \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
diff --git a/src/exchange-tools/Makefile.am b/src/exchange-tools/Makefile.am
index 94398256..a3689d81 100644
--- a/src/exchange-tools/Makefile.am
+++ b/src/exchange-tools/Makefile.am
@@ -26,7 +26,8 @@ taler_exchange_keyup_LDADD = \
$(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/pq/libtalerpq.la \
$(top_builddir)/src/util/libtalerutil.la \
- -lgnunetutil $(XLIB)
+ -lgnunetutil \
+ $(XLIB)
taler_exchange_keyup_LDFLAGS = $(POSTGRESQL_LDFLAGS)
@@ -40,7 +41,8 @@ taler_exchange_wire_LDADD = \
$(top_builddir)/src/util/libtalerutil.la \
-lgnunetjson \
-lgnunetutil \
- -ljansson $(XLIB)
+ -ljansson \
+ $(XLIB)
taler_exchange_wire_LDFLAGS = $(POSTGRESQL_LDFLAGS)
taler_exchange_keycheck_SOURCES = \
@@ -49,7 +51,8 @@ taler_exchange_keycheck_LDADD = \
$(LIBGCRYPT_LIBS) \
$(top_builddir)/src/util/libtalerutil.la \
$(top_builddir)/src/exchangedb/libtalerexchangedb.la \
- -lgnunetutil $(XLIB)
+ -lgnunetutil \
+ $(XLIB)
taler_exchange_keycheck_LDFLAGS = $(POSTGRESQL_LDFLAGS)
taler_exchange_dbinit_SOURCES = \
@@ -59,7 +62,8 @@ taler_exchange_dbinit_LDADD = \
$(top_builddir)/src/util/libtalerutil.la \
$(top_builddir)/src/pq/libtalerpq.la \
$(top_builddir)/src/exchangedb/libtalerexchangedb.la \
- -lgnunetutil $(XLIB)
+ -lgnunetutil \
+ $(XLIB)
taler_exchange_dbinit_LDFLAGS = \
$(POSTGRESQL_LDFLAGS)
taler_exchange_dbinit_CPPFLAGS = \
diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am
index 4876b307..17960404 100644
--- a/src/exchange/Makefile.am
+++ b/src/exchange/Makefile.am
@@ -33,7 +33,8 @@ taler_exchange_aggregator_LDADD = \
$(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-ljansson \
-lgnunetcurl \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
taler_exchange_closer_SOURCES = \
@@ -46,7 +47,8 @@ taler_exchange_closer_LDADD = \
$(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-ljansson \
-lgnunetcurl \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
taler_exchange_wirewatch_SOURCES = \
taler-exchange-wirewatch.c
@@ -58,7 +60,8 @@ taler_exchange_wirewatch_LDADD = \
$(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-ljansson \
-lgnunetcurl \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
taler_exchange_transfer_SOURCES = \
taler-exchange-transfer.c
@@ -70,7 +73,8 @@ taler_exchange_transfer_LDADD = \
$(top_builddir)/src/exchangedb/libtalerexchangedb.la \
-ljansson \
-lgnunetcurl \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
taler_exchange_httpd_SOURCES = \
taler-exchange-httpd.c taler-exchange-httpd.h \
@@ -103,7 +107,8 @@ taler_exchange_httpd_LDADD = \
-lgnunetjson \
-ljansson \
-lz \
- -lpthread
+ -lpthread \
+ $(XLIB)
# Testcases
diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am
index c3d0b430..74512636 100644
--- a/src/exchangedb/Makefile.am
+++ b/src/exchangedb/Makefile.am
@@ -43,7 +43,8 @@ libtaler_plugin_exchangedb_postgres_la_LDFLAGS = \
$(top_builddir)/src/util/libtalerutil.la \
-lpq \
-lgnunetpq \
- -lgnunetutil $(XLIB)
+ -lgnunetutil \
+ $(XLIB)
lib_LTLIBRARIES = \
libtalerexchangedb.la
@@ -59,7 +60,8 @@ libtalerexchangedb_la_SOURCES = \
libtalerexchangedb_la_LIBADD = \
$(top_builddir)/src/bank-lib/libtalerbank.la \
$(top_builddir)/src/util/libtalerutil.la \
- -lgnunetutil $(XLIB)
+ -lgnunetutil \
+ $(XLIB)
libtalerexchangedb_la_LDFLAGS = \
$(POSTGRESQL_LDFLAGS) \
-version-info 1:0:0 \
@@ -86,28 +88,32 @@ test_exchangedb_auditors_SOURCES = \
test_exchangedb_auditors_LDADD = \
libtalerexchangedb.la \
$(top_srcdir)/src/util/libtalerutil.la \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
test_exchangedb_denomkeys_SOURCES = \
test_exchangedb_denomkeys.c
test_exchangedb_denomkeys_LDADD = \
libtalerexchangedb.la \
$(top_srcdir)/src/util/libtalerutil.la \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
test_exchangedb_fees_SOURCES = \
test_exchangedb_fees.c
test_exchangedb_fees_LDADD = \
libtalerexchangedb.la \
$(top_srcdir)/src/util/libtalerutil.la \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
test_exchangedb_signkeys_SOURCES = \
test_exchangedb_signkeys.c
test_exchangedb_signkeys_LDADD = \
libtalerexchangedb.la \
$(top_srcdir)/src/util/libtalerutil.la \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
test_exchangedb_postgres_SOURCES = \
test_exchangedb.c
@@ -117,7 +123,8 @@ test_exchangedb_postgres_LDADD = \
$(top_srcdir)/src/util/libtalerutil.la \
$(top_srcdir)/src/pq/libtalerpq.la \
-ljansson \
- -lgnunetutil
+ -lgnunetutil \
+ $(XLIB)
EXTRA_test_exchangedb_postgres_DEPENDENCIES = \
libtaler_plugin_exchangedb_postgres.la
diff --git a/src/pq/Makefile.am b/src/pq/Makefile.am
index 2ade01e0..3082e0b4 100644
--- a/src/pq/Makefile.am
+++ b/src/pq/Makefile.am
@@ -12,23 +12,22 @@ lib_LTLIBRARIES = \
libtalerpq_la_SOURCES = \
pq_query_helper.c \
pq_result_helper.c
-
libtalerpq_la_LIBADD = \
$(top_builddir)/src/util/libtalerutil.la \
-lgnunetutil -ljansson \
- -lpq $(XLIB)
-
+ -lpq \
+ $(XLIB)
libtalerpq_la_LDFLAGS = \
$(POSTGRESQL_LDFLAGS) \
-version-info 0:0:0 \
-export-dynamic -no-undefined
-TESTS = \
- test_pq
-
check_PROGRAMS= \
test_pq
+TESTS = \
+ $(check_PROGRAMS)
+
test_pq_SOURCES = \
test_pq.c
test_pq_LDADD = \
@@ -37,4 +36,5 @@ test_pq_LDADD = \
-lgnunetpq \
-lgnunetutil \
-ljansson \
- -lpq $(XLIB)
+ -lpq \
+ $(XLIB)
diff --git a/src/sq/Makefile.am b/src/sq/Makefile.am
index ee4c5eba..93948e77 100644
--- a/src/sq/Makefile.am
+++ b/src/sq/Makefile.am
@@ -12,23 +12,22 @@ lib_LTLIBRARIES = \
libtalersq_la_SOURCES = \
sq_query_helper.c \
sq_result_helper.c
-
libtalersq_la_LIBADD = \
$(top_builddir)/src/util/libtalerutil.la \
-lgnunetutil -ljansson \
- -lsqlite3 $(XLIB)
-
+ -lsqlite3 \
+ $(XLIB)
libtalersq_la_LDFLAGS = \
$(SQLITE_LDFLAGS) \
-version-info 0:0:0 \
-export-dynamic -no-undefined
-TESTS = \
- test_sq
-
check_PROGRAMS= \
test_sq
+TESTS = \
+ $(check_PROGRAMS)
+
test_sq_SOURCES = \
test_sq.c
test_sq_LDADD = \
@@ -37,4 +36,5 @@ test_sq_LDADD = \
-lgnunetsq \
-lgnunetutil \
-ljansson \
- -lsqlite3 $(XLIB)
+ -lsqlite3 \
+ $(XLIB)
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 09f56393..fc2f7f87 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -150,7 +150,8 @@ test_auditor_api_LDADD = \
$(top_builddir)/src/util/libtalerutil.la \
-lgnunetcurl \
-lgnunetutil \
- -ljansson
+ -ljansson \
+ $(XLIB)
test_auditor_api_version_SOURCES = \
test_auditor_api_version.c
@@ -161,7 +162,8 @@ test_auditor_api_version_LDADD = \
$(top_builddir)/src/util/libtalerutil.la \
-lgnunetcurl \
-lgnunetutil \
- -ljansson
+ -ljansson \
+ $(XLIB)
test_bank_api_with_nexus_SOURCES = \
test_bank_api.c
@@ -169,7 +171,8 @@ test_bank_api_with_nexus_LDADD = \
libtalertesting.la \
-ltalerexchange \
-lgnunetutil \
- $(top_builddir)/src/bank-lib/libtalerbank.la
+ $(top_builddir)/src/bank-lib/libtalerbank.la \
+ $(XLIB)
test_bank_api_with_fakebank_SOURCES = \
test_bank_api.c
@@ -177,7 +180,8 @@ test_bank_api_with_fakebank_LDADD = \
libtalertesting.la \
-ltalerexchange \
-lgnunetutil \
- $(top_builddir)/src/bank-lib/libtalerbank.la
+ $(top_builddir)/src/bank-lib/libtalerbank.la \
+ $(XLIB)
test_bank_api_with_pybank_SOURCES = \
test_bank_api.c
@@ -185,7 +189,8 @@ test_bank_api_with_pybank_LDADD = \
libtalertesting.la \
$(top_builddir)/src/lib/libtalerexchange.la \
-lgnunetutil \
- $(top_builddir)/src/bank-lib/libtalerbank.la
+ $(top_builddir)/src/bank-lib/libtalerbank.la \
+ $(XLIB)
test_exchange_api_SOURCES = \
test_exchange_api.c
@@ -199,7 +204,8 @@ test_exchange_api_LDADD = \
$(top_builddir)/src/util/libtalerutil.la \
-lgnunetcurl \
-lgnunetutil \
- -ljansson
+ -ljansson \
+ $(XLIB)
test_exchange_api_revocation_SOURCES = \
test_exchange_api_revocation.c
@@ -213,7 +219,8 @@ test_exchange_api_revocation_LDADD = \
$(top_builddir)/src/util/libtalerutil.la \
-lgnunetcurl \
-lgnunetutil \
- -ljansson
+ -ljansson \
+ $(XLIB)
test_exchange_api_keys_cherry_picking_SOURCES = \
test_exchange_api_keys_cherry_picking.c
@@ -226,7 +233,8 @@ test_exchange_api_keys_cherry_picking_LDADD = \
$(top_builddir)/src/bank-lib/libtalerbank.la \
-lgnunetcurl \
-lgnunetutil \
- -ljansson
+ -ljansson \
+ $(XLIB)
test_exchange_api_overlapping_keys_bug_SOURCES = \
test_exchange_api_overlapping_keys_bug.c
@@ -239,7 +247,8 @@ test_exchange_api_overlapping_keys_bug_LDADD = \
$(top_builddir)/src/bank-lib/libtalerbank.la \
-lgnunetcurl \
-lgnunetutil \
- -ljansson
+ -ljansson \
+ $(XLIB)
test_taler_exchange_aggregator_postgres_SOURCES = \
test_taler_exchange_aggregator.c
@@ -254,7 +263,8 @@ test_taler_exchange_aggregator_postgres_LDADD = \
-lgnunetutil \
-lgnunetjson \
-ljansson \
- -lpthread
+ -lpthread \
+ $(XLIB)
test_taler_exchange_wirewatch_postgres_SOURCES = \
test_taler_exchange_wirewatch.c
@@ -270,7 +280,8 @@ test_taler_exchange_wirewatch_postgres_LDADD = \
-lgnunetjson \
-lgnunetpq \
-ljansson \
- -lpthread
+ -lpthread \
+ $(XLIB)
test_exchange_api_twisted_SOURCES = \
test_exchange_api_twisted.c
@@ -286,7 +297,8 @@ test_exchange_api_twisted_LDADD = \
-lgnunetjson \
-lgnunetcurl \
-lgnunetutil \
- -ljansson
+ -ljansson \
+ $(XLIB)
test_bank_api_with_fakebank_twisted_SOURCES = \
test_bank_api_twisted.c
@@ -300,7 +312,8 @@ test_bank_api_with_fakebank_twisted_LDADD = \
-lgnunetjson \
-lgnunetcurl \
-lgnunetutil \
- -ljansson
+ -ljansson \
+ $(XLIB)
test_bank_api_with_pybank_twisted_SOURCES = \
test_bank_api_twisted.c
@@ -314,7 +327,8 @@ test_bank_api_with_pybank_twisted_LDADD = \
-lgnunetjson \
-lgnunetcurl \
-lgnunetutil \
- -ljansson
+ -ljansson \
+ $(XLIB)
# Distribution