Commit 455210c5 authored by Shane Snyder's avatar Shane Snyder

various automake cleanups

parent 9ee4cc48
...@@ -45,23 +45,22 @@ src_io_chain_libio_chain_la_SOURCES = src/io-chain/prepare-read-op.c \ ...@@ -45,23 +45,22 @@ src_io_chain_libio_chain_la_SOURCES = src/io-chain/prepare-read-op.c \
src_client_libmobject_store_la_SOURCES = \ src_client_libmobject_store_la_SOURCES = \
src/client/io-context.c \
src/aio/completion.c \ src/aio/completion.c \
src/client/io-context.c \
src/client/read-op.c \ src/client/read-op.c \
src/client/write-op.c \ src/client/write-op.c \
src/client/libmobject-store.c src/client/libmobject-store.c
src_client_libmobject_store_la_LIBADD = src/omap-iter/libomap-iter.la\ src_client_libmobject_store_la_LIBADD = src/omap-iter/libomap-iter.la \
src/io-chain/libio-chain.la src/io-chain/libio-chain.la ${CLIENT_LIBS}
src_server_libmobject_server_la_SOURCES = \ src_server_libmobject_server_la_SOURCES = \
src/aio/completion.c \
src/server/mobject-server.c \ src/server/mobject-server.c \
src/server/exec-write-op.c \ src/server/exec-write-op.c \
src/server/exec-read-op.c src/server/exec-read-op.c
src_server_libmobject_server_la_LIBADD = src/omap-iter/libomap-iter.la \ src_server_libmobject_server_la_LIBADD = src/omap-iter/libomap-iter.la \
src/io-chain/libio-chain.la src/io-chain/libio-chain.la ${SERVER_LIBS}
src_server_mobject_server_daemon_SOURCES = \ src_server_mobject_server_daemon_SOURCES = \
src/server/mobject-server-daemon.c src/server/mobject-server-daemon.c
......
...@@ -17,21 +17,16 @@ endif ...@@ -17,21 +17,16 @@ endif
TESTS += \ TESTS += \
tests/mobject-connect-test.sh tests/mobject-connect-test.sh
tests_mobject_connect_test_SOURCES = tests/mobject-connect-test.c tests_mobject_connect_test_LDADD = src/client/libmobject-store.la ${CLIENT_LIBS}
tests_mobject_connect_test_CPPFLAGS = -I${srcdir}/include
tests_mobject_connect_test_LDADD = src/client/libmobject-store.la ${LIBS} ${SERVER_LIBS}
if HAVE_RADOS if HAVE_RADOS
tests_rados_mobject_connect_test_SOURCES = tests/mobject-connect-test.c tests_rados_mobject_connect_test_SOURCES = tests/mobject-connect-test.c
tests_rados_mobject_connect_test_CFLAGS = -DUSE_RADOS tests_rados_mobject_connect_test_CFLAGS = -DUSE_RADOS
tests_rados_mobject_connect_test_LDADD = -lrados ${LIBS} tests_rados_mobject_connect_test_LDADD = -lrados
endif endif
tests_mobject_client_test_SOURCES = tests/mobject-client-test.c tests_mobject_client_test_LDADD = src/client/libmobject-store.la ${CLIENT_LIBS}
tests_mobject_client_test_CPPFLAGS = -I${srcdir}/include
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 ${SERVER_LIBS}
tests_mobject_server_LDADD = src/server/libmobject-server.la ${LIBS} ${SERVER_LIBS}
tests_test_sds_keyval_client_LDADD = ${CLIENT_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