Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mobject-store
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sds
mobject-store
Commits
dd6be4fb
Commit
dd6be4fb
authored
Oct 31, 2017
by
Rob Latham
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
a start at separating client and server libs
parent
7d831402
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
16 deletions
+23
-16
Makefile.am
Makefile.am
+3
-0
configure.ac
configure.ac
+14
-12
src/Makefile.subdir
src/Makefile.subdir
+1
-1
tests/Makefile.subdir
tests/Makefile.subdir
+5
-3
No files found.
Makefile.am
View file @
dd6be4fb
...
...
@@ -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
...
...
configure.ac
View file @
dd6be4fb
...
...
@@ -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"
C
PPFLAGS="$SDSKEYVALCLIENT_CFLAGS $
CPPFLAGS"
C
FLAGS="$SDSKEYVALCLIENT_CFLAGS $
CFLAGS"
CLIENT_LIBS="$SDSKEYVALCLIENT_LIBS $CLIENT_
LIBS"
C
LIENT_CPPFLAGS="$SDSKEYVALCLIENT_CFLAGS $CLIENT_
CPPFLAGS"
C
LIENT_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
src/Makefile.subdir
View file @
dd6be4fb
...
...
@@ -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
...
...
tests/Makefile.subdir
View file @
dd6be4fb
...
...
@@ -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}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment