database/libmarias3
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/libmarias3.git synced 2025-04-18 16:24:01 +03:00
Code

Cleanup linking

Browse Source 
Fixes mariadb-corporation/libmarias3#18
This commit is contained in:
Andrew Hutchings 2019-03-28 17:54:35 +00:00
parent ad0911eaca
commit 467d59502a
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/appendix/version_history.rst
View File

@ -13,6 +13,7 @@ Version 1.1.1
* Make :c:func:`ms3_init` and :c:func:`ms3_thread_init` treat empty string base_domain as ``NULL``
* Add :c:func:`ms3_free`
* Add :c:func:`ms3_buffer_chunk_size`
* Cleanup linking
Version 1.1.0 GA (2019-03-27)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2
libmarias3.pc.in
View File

@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
Description: a C connector for Amazon's S3.
Libs: -L${libdir} -lcurl @LIBS@
Libs: -L${libdir} @LIBS@
Cflags: -I${includedir}

4
src/marias3.c
View File

@ -105,6 +105,10 @@ ms3_st *ms3_init(const char *s3key, const char *s3secret, const char *region,
void ms3_deinit(ms3_st *ms3)
{
if (not ms3)
{
return;
}
ms3debug("deinit: 0x%" PRIXPTR, (uintptr_t)ms3);
free(ms3->region);
curl_easy_cleanup(ms3->curl);

12
tests/include.am
View File

@ -12,32 +12,32 @@ LIBTOOL_COMMAND= ${abs_top_builddir}/libtool --mode=execute
GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x support/run.gdb
t_error_SOURCES= tests/error.c
t_error_LDADD= src/libmarias3.la @LIBMHASH_LIB@
t_error_LDADD= src/libmarias3.la
check_PROGRAMS+= t/error
noinst_PROGRAMS+= t/error
t_basic_SOURCES= tests/basic.c
t_basic_LDADD= src/libmarias3.la @LIBMHASH_LIB@
t_basic_LDADD= src/libmarias3.la
check_PROGRAMS+= t/basic
noinst_PROGRAMS+= t/basic
t_basic_thread_SOURCES= tests/basic_thread.c
t_basic_thread_LDADD= src/libmarias3.la @LIBMHASH_LIB@
t_basic_thread_LDADD= src/libmarias3.la
check_PROGRAMS+= t/basic_thread
noinst_PROGRAMS+= t/basic_thread
t_large_file_SOURCES= tests/large_file.c
t_large_file_LDADD= src/libmarias3.la @LIBMHASH_LIB@
t_large_file_LDADD= src/libmarias3.la
check_PROGRAMS+= t/large_file
noinst_PROGRAMS+= t/large_file
t_prefix_SOURCES= tests/prefix.c
t_prefix_LDADD= src/libmarias3.la @LIBMHASH_LIB@
t_prefix_LDADD= src/libmarias3.la
check_PROGRAMS+= t/prefix
noinst_PROGRAMS+= t/prefix
t_longlist_SOURCES= tests/longlist.c
t_longlist_LDADD= src/libmarias3.la @LIBMHASH_LIB@
t_longlist_LDADD= src/libmarias3.la
t_longlist_LDADD+= -lpthread
check_PROGRAMS+= t/longlist
noinst_PROGRAMS+= t/longlist