[taler-exchange] branch master updated (8d11ac33 -> 5da22c60)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository exchange.

    from 8d11ac33 alphabetical, please
     new 94f0d80c turn teah_common.c into libtalercurl, fixes many ugly issues 
in build system
     new 5da22c60 turn teah_common.c into libtalercurl, fixes many ugly issues 
in build system

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                           |  1 +
 src/Makefile.am                        |  2 +-
 src/bank-lib/Makefile.am               |  4 ++--
 src/curl/Makefile.am                   | 20 ++++++++++++++++++++
 src/{lib/teah_common.c => curl/curl.c} |  0
 src/lib/Makefile.am                    |  8 ++++----
 6 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 src/curl/Makefile.am
 rename src/{lib/teah_common.c => curl/curl.c} (100%)

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/curl/Makefile.am b/src/curl/Makefile.am
new file mode 100644
index 00000000..7ddfe4d6
--- /dev/null
+++ b/src/curl/Makefile.am
@@ -0,0 +1,20 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+lib_LTLIBRARIES = \
+  libtalercurl.la
+
+libtalercurl_la_LDFLAGS = \
+  -version-info 0:0:0 \
+  -no-undefined
+libtalercurl_la_SOURCES = \
+  curl.c
+libtalercurl_la_LIBADD = \
+  -lgnunetcurl \
+  -lgnunetutil \
+  $(XLIB)
diff --git a/src/lib/teah_common.c b/src/curl/curl.c
similarity index 100%
rename from src/lib/teah_common.c
rename to 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 \

-- 
To stop receiving notification emails like this one, please contact
address@hidden.