Commit 3851ddc3 authored by Shane Snyder's avatar Shane Snyder

more automake reorg

parent f3ce7187
......@@ -15,8 +15,8 @@ AM_CFLAGS =
AM_CXXFLAGS = $(AM_CFLAGS)
lib_LTLIBRARIES = \
src/libmobject-store.la \
src/libmobject-server.la
src/client/libmobject-store.la \
src/server/libmobject-server.la
include_HEADERS = \
include/libmobject-store.h \
......
......@@ -26,13 +26,13 @@ noinst_HEADERS += \
src/util/log.h \
src/util/utlist.h
noinst_LTLIBRARIES += src/libomap-iter.la \
src/libiochain.la
noinst_LTLIBRARIES += src/omap-iter/libomap-iter.la \
src/io-chain/libio-chain.la
src_libomap_iter_la_SOURCES = src/omap-iter/proc-omap-iter.c \
src_omap_iter_libomap_iter_la_SOURCES = src/omap-iter/proc-omap-iter.c \
src/omap-iter/omap-iter-impl.c
src_libiochain_la_SOURCES = src/io-chain/prepare-read-op.c \
src_io_chain_libio_chain_la_SOURCES = src/io-chain/prepare-read-op.c \
src/io-chain/prepare-write-op.c \
src/io-chain/read-op-impl.c \
src/io-chain/read-op-visitor.c \
......@@ -44,30 +44,30 @@ src_libiochain_la_SOURCES = src/io-chain/prepare-read-op.c \
src/io-chain/proc-write-actions.c
src_libmobject_store_la_SOURCES = \
src_client_libmobject_store_la_SOURCES = \
src/client/io-context.c \
src/aio/completion.c \
src/client/read-op.c \
src/client/write-op.c \
src/client/libmobject-store.c
src_libmobject_store_la_LIBADD = src/libomap-iter.la\
src/libiochain.la
src_client_libmobject_store_la_LIBADD = src/omap-iter/libomap-iter.la\
src/io-chain/libio-chain.la
src_libmobject_server_la_SOURCES = \
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_libmobject_server_la_LIBADD = src/libomap-iter.la \
src/libiochain.la
src_server_libmobject_server_la_LIBADD = src/omap-iter/libomap-iter.la \
src/io-chain/libio-chain.la
src_mobject_server_daemon_SOURCES = \
src_server_mobject_server_daemon_SOURCES = \
src/server/mobject-server-daemon.c
src_mobject_server_daemon_LDADD = \
src/libmobject-server.la
src_server_mobject_server_daemon_LDADD = \
src/server/libmobject-server.la
bin_PROGRAMS += \
src/mobject-server-daemon
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/libmobject-store.la ${LIBS}
tests_mobject_connect_test_LDADD = src/client/libmobject-store.la ${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,8 @@ 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/libmobject-store.la ${LIBS}
tests_mobject_client_test_LDADD = src/client/libmobject-store.la ${LIBS}
tests_mobject_server_CPPFLAGS = -I${srcdir}/include
tests_mobject_server_LDADD = src/libmobject-server.la ${LIBS}
tests_mobject_server_LDADD = src/server/libmobject-server.la ${LIBS}
......@@ -4,8 +4,8 @@ check_PROGRAMS += \
tests_io_chain_io_chain_client_SOURCES = tests/io-chain/io-chain-client.c
tests_io_chain_io_chain_client_CPPFLAGS = -I${srcdir}/include -I${srcdir}/test/io-chain
tests_io_chain_io_chain_client_LDADD = src/libmobject-store.la
tests_io_chain_io_chain_client_LDADD = src/client/libmobject-store.la
tests_io_chain_io_chain_server_SOURCES = tests/io-chain/io-chain-server.c
tests_io_chain_io_chain_server_CPPFLAGS = -I${srcdir}/include -I${srcdir}/test/io-chain
tests_io_chain_io_chain_server_LDADD = src/libmobject-server.la
tests_io_chain_io_chain_server_LDADD = src/server/libmobject-server.la
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