From 455210c5c9a0eaa670b0c1158f53380162601b17 Mon Sep 17 00:00:00 2001 From: Shane Snyder Date: Wed, 1 Nov 2017 21:04:01 -0500 Subject: [PATCH] various automake cleanups --- src/Makefile.subdir | 9 ++++----- tests/Makefile.subdir | 13 ++++--------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/Makefile.subdir b/src/Makefile.subdir index 340ad06..c1864b1 100644 --- a/src/Makefile.subdir +++ b/src/Makefile.subdir @@ -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/io-context.c \ src/aio/completion.c \ + src/client/io-context.c \ src/client/read-op.c \ src/client/write-op.c \ src/client/libmobject-store.c -src_client_libmobject_store_la_LIBADD = src/omap-iter/libomap-iter.la\ - src/io-chain/libio-chain.la +src_client_libmobject_store_la_LIBADD = src/omap-iter/libomap-iter.la \ + src/io-chain/libio-chain.la ${CLIENT_LIBS} src_server_libmobject_server_la_SOURCES = \ - src/aio/completion.c \ src/server/mobject-server.c \ src/server/exec-write-op.c \ src/server/exec-read-op.c 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.c diff --git a/tests/Makefile.subdir b/tests/Makefile.subdir index ed96dca..ec03d25 100644 --- a/tests/Makefile.subdir +++ b/tests/Makefile.subdir @@ -17,21 +17,16 @@ endif TESTS += \ tests/mobject-connect-test.sh -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} ${SERVER_LIBS} +tests_mobject_connect_test_LDADD = src/client/libmobject-store.la ${CLIENT_LIBS} if HAVE_RADOS tests_rados_mobject_connect_test_SOURCES = tests/mobject-connect-test.c tests_rados_mobject_connect_test_CFLAGS = -DUSE_RADOS -tests_rados_mobject_connect_test_LDADD = -lrados ${LIBS} +tests_rados_mobject_connect_test_LDADD = -lrados 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} ${CLIENT_LIBS} +tests_mobject_client_test_LDADD = src/client/libmobject-store.la ${CLIENT_LIBS} -tests_mobject_server_CPPFLAGS = -I${srcdir}/include -tests_mobject_server_LDADD = src/server/libmobject-server.la ${LIBS} ${SERVER_LIBS} +tests_mobject_server_LDADD = src/server/libmobject-server.la ${SERVER_LIBS} tests_test_sds_keyval_client_LDADD = ${CLIENT_LIBS} -- 2.26.2