Per list discussion, go back to compiling bs_aio into tgtd instead of a separate object. libaio is a small enough dependency that it does not merit a separate module just to keep the dependency off tgtd. AIO support will still only be included if libaio headers are present. Reported-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx> Signed-off-by: Andy Grover <agrover@xxxxxxxxxx> --- usr/Makefile | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/usr/Makefile b/usr/Makefile index 7e8623b..e29826c 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -19,7 +19,8 @@ endif ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) CFLAGS += -DUSE_EVENTFD -MODULES += bs_aio.so +TGTD_OBJS += bs_aio.o +LIBS += -laio endif ifneq ($(ISCSI_RDMA),) @@ -84,9 +85,6 @@ tgtimg: $(TGTIMG_OBJS) %.so: %.c $(CC) -shared $(CFLAGS) $*.c -o $*.so -bs_aio.so: bs_aio.c - $(CC) -shared $(CFLAGS) bs_aio.c -o bs_aio.so -laio - bs_rbd.so: bs_rbd.c $(CC) -shared $(CFLAGS) bs_rbd.c -o bs_rbd.so -lrados -lrbd -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe stgt" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
