Commit 39cc5963 authored Jun 22, 2016 by Daniel Verkamp

build: include -lrt and -lpthread in LDFLAGS



Simplify the build rules so that common libraries are always linked.

Also fix up a couple of -lpciaccess instances that should have been
changed to $(PCIACCESS_LIB).

Change-Id: I4c50fa3aa59cae013d3385e38fbb830794299f6e
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>

parent 4db1b420

app/nvmf_tgt/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ SPDK_LIBS = \
		LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB)

		LIBS += -libverbs -lrdmacm
		LIBS += $(DPDK_LIB) -lpthread -lrt
		LIBS += $(DPDK_LIB)

		all : $(APP)

app/trace/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@
		SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		LIBS += -lrt
		CXXFLAGS += $(DPDK_INC)
		CXX_SRCS := trace.cpp

examples/ioat/kperf/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,6 @@ C_SRCS := ioat_kperf.c

		CFLAGS += -I.

		LIBS += -lrt

		all: $(APP)

		$(APP): $(OBJS)

examples/ioat/perf/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
		$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
		$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a

		LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt
		LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)

		all: $(APP)

examples/ioat/verify/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
		$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
		$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a

		LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) -lpthread $(DPDK_LIB) -lrt
		LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)

		all: $(APP)