Commit dd6be4fb authored by Rob Latham's avatar Rob Latham

a start at separating client and server libs

parent 7d831402
......@@ -14,6 +14,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS =
AM_CXXFLAGS = $(AM_CFLAGS)
SERVER_LIBS = @SERVER_LIBS@
CLIENT_LIBS = @CLIENT_LIBS@
lib_LTLIBRARIES = \
src/client/libmobject-store.la \
src/server/libmobject-server.la
......
......@@ -54,27 +54,27 @@ CFLAGS="$ARGOBOTS_CFLAGS $CFLAGS"
PKG_CHECK_MODULES([SDSKEYVALSERVER],[kv-server],[],
AC_MSG_ERROR([Could not find working sds-keyval server installation!]) )
LIBS="$SDSKEYVALSERVER_LIBS $LIBS"
CPPFLAGS="$SDSKEYVALSERVER_CFLAGS $CPPFLAGS"
CFLAGS="$SDSKEYVALSERVER_CFLAGS $CFLAGS"
SERVER_LIBS="$SDSKEYVALSERVER_LIBS $SERVER_LIBS"
SERVER_CPPFLAGS="$SDSKEYVALSERVER_CFLAGS $SERVER_CPPFLAGS"
SERVER_CFLAGS="$SDSKEYVALSERVER_CFLAGS $SERVER_CFLAGS"
PKG_CHECK_MODULES([SDSKEYVALCLIENT],[kv-client],[],
AC_MSG_ERROR([Could not find working sds-keyval client installation!]) )
LIBS="$SDSKEYVALCLIENT_LIBS $LIBS"
CPPFLAGS="$SDSKEYVALCLIENT_CFLAGS $CPPFLAGS"
CFLAGS="$SDSKEYVALCLIENT_CFLAGS $CFLAGS"
CLIENT_LIBS="$SDSKEYVALCLIENT_LIBS $CLIENT_LIBS"
CLIENT_CPPFLAGS="$SDSKEYVALCLIENT_CFLAGS $CLIENT_CPPFLAGS"
CLIENT_CFLAGS="$SDSKEYVALCLIENT_CFLAGS $CLIENT_CFLAGS"
PKG_CHECK_MODULES([PMEM],[libpmemobj],[],
AC_MSG_ERROR([Could not find working libpmemobj installation!]) )
LIBS="$PMEM_LIBS $LIBS"
CPPFLAGS="$PMEM_CFLAGS $CPPFLAGS"
CFLAGS="$PMEM_CFLAGS $CFLAGS"
SERVER_LIBS="$PMEM_LIBS $SERVER_LIBS"
SERVER_CPPFLAGS="$PMEM_CFLAGS $SERVER_CPPFLAGS"
SERVER_CFLAGS="$PMEM_CFLAGS $SERVER_CFLAGS"
PKG_CHECK_MODULES([BAKE],[bake-bulk-server],[],
AC_MSG_ERROR([Could not find working BAKE installation!]) )
LIBS="$BAKE_LIBS $LIBS"
CPPFLAGS="$BAKE_CFLAGS $CPPFLAGS"
CFLAGS="$BAKE_CFLAGS $CFLAGS"
SERVER_LIBS="$BAKE_LIBS $LIBS"
SERVER_CPPFLAGS="$BAKE_CFLAGS $SERVER_CPPFLAGS"
SERVER_CFLAGS="$BAKE_CFLAGS $SERVER_CFLAGS"
# check that SSG was compiled with MPI support
AC_CHECK_LIB([ssg], [ssg_group_create_mpi],
......@@ -100,5 +100,7 @@ fi
# both found, set output to additionally build tests against RADOS
AM_CONDITIONAL(HAVE_RADOS, test x"$with_rados" == "xyes")
AC_SUBST(SERVER_LIBS)
AC_SUBST(CLIENT_LIBS)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
......@@ -66,7 +66,7 @@ src_server_libmobject_server_la_LIBADD = src/omap-iter/libomap-iter.la \
src_server_mobject_server_daemon_SOURCES = \
src/server/mobject-server-daemon.c
src_server_mobject_server_daemon_LDADD = \
src/server/libmobject-server.la
src/server/libmobject-server.la ${SERVER_LIBS}
bin_PROGRAMS += \
src/server/mobject-server-daemon
......
......@@ -15,7 +15,7 @@ TESTS += \
tests_mobject_connect_test_SOURCES = tests/mobject-connect-test.c
tests_mobject_connect_test_CPPFLAGS = -I${srcdir}/include
tests_mobject_connect_test_LDADD = src/client/libmobject-store.la ${LIBS}
tests_mobject_connect_test_LDADD = src/client/libmobject-store.la ${LIBS} ${SERVER_LIBS}
if HAVE_RADOS
tests_rados_mobject_connect_test_SOURCES = tests/mobject-connect-test.c
tests_rados_mobject_connect_test_CFLAGS = -DUSE_RADOS
......@@ -24,8 +24,10 @@ endif
tests_mobject_client_test_SOURCES = tests/mobject-client-test.c
tests_mobject_client_test_CPPFLAGS = -I${srcdir}/include
tests_mobject_client_test_LDADD = src/client/libmobject-store.la ${LIBS}
tests_mobject_client_test_LDADD = src/client/libmobject-store.la ${LIBS} ${CLIENT_LIBS}
tests_mobject_server_CPPFLAGS = -I${srcdir}/include
tests_mobject_server_LDADD = src/server/libmobject-server.la ${LIBS}
tests_mobject_server_LDADD = src/server/libmobject-server.la ${LIBS} ${SERVER_LIBS}
tests_test_sds_keyval_client_LDADD = ${CLIENT_LIBS}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment