diff options
| author | Christian Grothoff <christian@grothoff.org> | 2019-10-26 20:05:19 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2019-10-26 20:05:19 +0200 |
| commit | 94f0d80cc115ce93e88b64f8e3d0fa81e853f6d3 (patch) | |
| tree | df89518b7ef3e8d694507870235ef4271a81ead5 | |
| parent | 8d11ac3388b52c56a651005da4954189b1963d83 (diff) | |
| download | exchange-94f0d80cc115ce93e88b64f8e3d0fa81e853f6d3.tar.gz exchange-94f0d80cc115ce93e88b64f8e3d0fa81e853f6d3.tar.bz2 exchange-94f0d80cc115ce93e88b64f8e3d0fa81e853f6d3.zip | |
turn teah_common.c into libtalercurl, fixes many ugly issues in build system
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/bank-lib/Makefile.am | 4 | ||||
| -rw-r--r-- | src/curl/curl.c (renamed from src/lib/teah_common.c) | 0 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 8 |
5 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index a40dfb6a..44703bf1 100644 --- a/configure.ac +++ b/configure.ac @@ -542,6 +542,7 @@ AC_CONFIG_FILES([Makefile src/auditor/Makefile src/auditordb/Makefile src/bank-lib/Makefile + src/curl/Makefile src/exchange/Makefile src/exchangedb/Makefile src/exchange-tools/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 80fa40db..38bf715f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,7 @@ pkgcfg_DATA = \ EXTRA_DIST = \ 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 SUBDIRS += lib benchmark else diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am index 9ae27a44..1166964a 100644 --- a/src/bank-lib/Makefile.am +++ b/src/bank-lib/Makefile.am @@ -41,10 +41,10 @@ libtalerbank_la_SOURCES = \ bank_api_common.c bank_api_common.h \ bank_api_history.c \ bank_api_reject.c \ - bank_api_parse.c \ - ../lib/teah_common.c # FIXME: ugly hack!! + bank_api_parse.c libtalerbank_la_LIBADD = \ $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/curl/libtalercurl.la \ -lgnunetcurl \ -lgnunetjson \ -lgnunetutil \ diff --git a/src/lib/teah_common.c b/src/curl/curl.c index 3e56c753..3e56c753 100644 --- a/src/lib/teah_common.c +++ b/src/curl/curl.c diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index fddc961f..f5251524 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -27,11 +27,11 @@ libtalerexchange_la_SOURCES = \ exchange_api_reserve.c \ exchange_api_track_transaction.c \ exchange_api_track_transfer.c \ - exchange_api_wire.c \ - teah_common.c + exchange_api_wire.c libtalerexchange_la_LIBADD = \ libtalerauditor.la \ $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/curl/libtalercurl.la \ $(top_builddir)/src/util/libtalerutil.la \ -lgnunetcurl \ -lgnunetjson \ @@ -47,9 +47,9 @@ libtalerauditor_la_SOURCES = \ auditor_api_curl_defaults.c auditor_api_curl_defaults.h \ auditor_api_handle.c auditor_api_handle.h \ auditor_api_deposit_confirmation.c \ - auditor_api_exchanges.c \ - teah_common.c + auditor_api_exchanges.c libtalerauditor_la_LIBADD = \ + $(top_builddir)/src/curl/libtalercurl.la \ $(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/util/libtalerutil.la \ -lgnunetcurl \ |