merge

src/bank-lib/Makefile.am

@@ -98,14 +98,14 @@ test_bank_api_with_fakebank_twisted_SOURCES = \
   test_bank_api_with_fakebank_twisted.c
 test_bank_api_with_fakebank_twisted_LDADD = \
   $(LIBGCRYPT_LIBS) \
-  -ltalertesting \
+  $(top_builddir)/src/exchange-lib/libtalertesting.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/bank-lib/libtalertesting.la \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/exchange-lib/libtalerexchange.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
   -ltalertwistertesting \
-  -ltalerbanktesting \
-  -ltalerfakebank \
-  -ltalerbank \
-  -ltalerexchange \
-  -ltalerjson \
-  -ltalerutil \
   -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
@@ -116,14 +116,14 @@ test_bank_api_twisted_SOURCES = \
   test_bank_api_twisted.c
 test_bank_api_twisted_LDADD = \
   $(LIBGCRYPT_LIBS) \
-  -ltalertesting \
+  $(top_builddir)/src/exchange-lib/libtalertesting.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/bank-lib/libtalertesting.la \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/exchange-lib/libtalerexchange.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
   -ltalertwistertesting \
-  -ltalerbanktesting \
-  -ltalerfakebank \
-  -ltalerbank \
-  -ltalerexchange \
-  -ltalerjson \
-  -ltalerutil \
   -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \

src/exchange-lib/Makefile.am

@@ -107,13 +107,13 @@ test_exchange_api_twisted_SOURCES = \
   test_exchange_api_twisted.c
 test_exchange_api_twisted_LDADD = \
   $(LIBGCRYPT_LIBS) \
-  -ltalertesting \
+  $(top_builddir)/src/exchange-lib/libtalertesting.la \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/exchange-lib/libtalerexchange.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
   -ltalertwistertesting \
-  -ltalerfakebank \
-  -ltalerbank \
-  -ltalerexchange \
-  -ltalerjson \
-  -ltalerutil \
   -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \

src/json/Makefile.am

@@ -33,7 +33,7 @@ check_PROGRAMS= \
 test_json_SOURCES = \
   test_json.c
 test_json_LDADD = \
-  -ltalerjson \
+  $(top_builddir)/src/json/libtalerjson.la \
   -lgnunetjson \
   $(top_builddir)/src/util/libtalerutil.la \
   -lgnunetutil \