taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

turn teah_common.c into libtalercurl, fixes many ugly issues in build system

Browse Source
This commit is contained in:
Christian Grothoff 2019-10-26 20:05:19 +02:00
parent 8d11ac3388
commit 94f0d80cc1
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -542,6 +542,7 @@ AC_CONFIG_FILES([Makefile
src/auditor/Makefile src/auditor/Makefile
src/auditordb/Makefile src/auditordb/Makefile
src/bank-lib/Makefile src/bank-lib/Makefile
src/curl/Makefile
src/exchange/Makefile src/exchange/Makefile
src/exchangedb/Makefile src/exchangedb/Makefile
src/exchange-tools/Makefile src/exchange-tools/Makefile

2
src/Makefile.am
View File

@ -22,7 +22,7 @@ pkgcfg_DATA = \
EXTRA_DIST = \ EXTRA_DIST = \
taler.conf taler.conf
SUBDIRS = include util wire json $(PQ_DIR) $(BANK_LIB) wire-plugins exchangedb exchange exchange-tools auditordb auditor SUBDIRS = include util wire json curl $(PQ_DIR) $(BANK_LIB) wire-plugins exchangedb exchange exchange-tools auditordb auditor
if HAVE_LIBCURL if HAVE_LIBCURL
SUBDIRS += lib benchmark SUBDIRS += lib benchmark
else else

4
src/bank-lib/Makefile.am
View File

@ -41,10 +41,10 @@ libtalerbank_la_SOURCES = \
bank_api_common.c bank_api_common.h \ bank_api_common.c bank_api_common.h \
bank_api_history.c \ bank_api_history.c \
bank_api_reject.c \ bank_api_reject.c \
bank_api_parse.c \ bank_api_parse.c
../lib/teah_common.c # FIXME: ugly hack!!
libtalerbank_la_LIBADD = \ libtalerbank_la_LIBADD = \
$(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/curl/libtalercurl.la \
-lgnunetcurl \ -lgnunetcurl \
-lgnunetjson \ -lgnunetjson \
-lgnunetutil \ -lgnunetutil \

0
src/lib/teah_common.c → src/curl/curl.c
View File

8
src/lib/Makefile.am
View File

@ -27,11 +27,11 @@ libtalerexchange_la_SOURCES = \
exchange_api_reserve.c \ exchange_api_reserve.c \
exchange_api_track_transaction.c \ exchange_api_track_transaction.c \
exchange_api_track_transfer.c \ exchange_api_track_transfer.c \
exchange_api_wire.c \ exchange_api_wire.c
teah_common.c
libtalerexchange_la_LIBADD = \ libtalerexchange_la_LIBADD = \
libtalerauditor.la \ libtalerauditor.la \
$(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/curl/libtalercurl.la \
$(top_builddir)/src/util/libtalerutil.la \ $(top_builddir)/src/util/libtalerutil.la \
-lgnunetcurl \ -lgnunetcurl \
-lgnunetjson \ -lgnunetjson \
@ -47,9 +47,9 @@ libtalerauditor_la_SOURCES = \
auditor_api_curl_defaults.c auditor_api_curl_defaults.h \ auditor_api_curl_defaults.c auditor_api_curl_defaults.h \
auditor_api_handle.c auditor_api_handle.h \ auditor_api_handle.c auditor_api_handle.h \
auditor_api_deposit_confirmation.c \ auditor_api_deposit_confirmation.c \
auditor_api_exchanges.c \ auditor_api_exchanges.c
teah_common.c
libtalerauditor_la_LIBADD = \ libtalerauditor_la_LIBADD = \
$(top_builddir)/src/curl/libtalercurl.la \
$(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/json/libtalerjson.la \
$(top_builddir)/src/util/libtalerutil.la \ $(top_builddir)/src/util/libtalerutil.la \
-lgnunetcurl \ -lgnunetcurl \