From 1b58a65f0c449fcabc33297536d45b29106086c7 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 9 May 2014 19:44:37 +0200 Subject: [PATCH] Make libsysdb and libsysdbclient private libraries for now. The API is not yet stable enough for that purpose. --- src/Makefile.am | 4 ++-- t/integration/test_lib.sh | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index cf3236d..ed3ebda 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,8 +43,7 @@ pkgclientinclude_HEADERS = \ include/client/sock.h \ include/client/sysdb.h -lib_LTLIBRARIES = libsysdbclient.la libsysdb.la -noinst_LTLIBRARIES = +noinst_LTLIBRARIES = libsysdbclient.la libsysdb.la libsysdbclient_la_SOURCES = \ client/client.c include/client/sysdb.h \ @@ -117,6 +116,7 @@ endif sysdbd_SOURCES = tools/sysdbd/main.c include/sysdb.h \ tools/sysdbd/configfile.c tools/sysdbd/configfile.h sysdbd_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" +sysdbd_LDFLAGS = -export-dynamic sysdbd_LDADD = libsysdb.la liboconfig/liboconfig.la sysdbd_DEPENDENCIES = liboconfig/liboconfig.la diff --git a/t/integration/test_lib.sh b/t/integration/test_lib.sh index 604d2df..63be63b 100644 --- a/t/integration/test_lib.sh +++ b/t/integration/test_lib.sh @@ -35,9 +35,8 @@ trap "rm -rf '$TESTDIR'; test -z \$SYSDBD_PID || kill \$SYSDBD_PID" EXIT mkdir "$TESTDIR/backend" cp "$TOP_SRCDIR/t/integration/.libs/mock_plugin.so" "$TESTDIR/backend" -cp "$TOP_SRCDIR"/src/.libs/sysdb "$TESTDIR" -cp "$TOP_SRCDIR"/src/.libs/sysdbd "$TESTDIR" -cp "$TOP_SRCDIR"/src/.libs/libsysdb*.so* "$TESTDIR" +cp "$TOP_SRCDIR"/src/sysdb "$TESTDIR" +cp "$TOP_SRCDIR"/src/sysdbd "$TESTDIR" MEMCHECK="valgrind --quiet --tool=memcheck --error-exitcode=1" MEMCHECK="$MEMCHECK --trace-children=yes" @@ -50,17 +49,16 @@ SOCKET_FILE="$TESTDIR/sock" PLUGIN_DIR="$TESTDIR" function run_sysdb() { - LD_PRELOAD=$TESTDIR/libsysdbclient.so $MEMCHECK \ - "$TESTDIR/sysdb" -U mockuser "$@" + $MEMCHECK "$TESTDIR/sysdb" -U mockuser "$@" } function run_sysdbd() { - LD_PRELOAD=$TESTDIR/libsysdb.so $MEMCHECK "$TESTDIR/sysdbd" "$@" & + $MEMCHECK "$TESTDIR/sysdbd" "$@" & SYSDBD_PID=$! } function run_sysdbd_foreground() { - LD_PRELOAD=$TESTDIR/libsysdb.so $MEMCHECK "$TESTDIR/sysdbd" "$@" + $MEMCHECK "$TESTDIR/sysdbd" "$@" } function stop_sysdbd() { -- 2.30.2