ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: move $(OBJS) definition to spdk.common.mk

Browse Source 
Change-Id: I2dd592269ef644cfe73921151b9b174dc255323d
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2015-11-10 16:19:07 -07:00
parent 3d988d287a
commit 1c3b08c63c
9 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/nvme/identify/Makefile
View File

@ -46,8 +46,6 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
LIBS += $(SPDK_LIBS) -lpciaccess -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) -lpciaccess -lpthread $(DPDK_LIB) -lrt
OBJS = $(C_SRCS:.c=.o)
all : $(APP) all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS) $(APP) : $(OBJS) $(SPDK_LIBS)

2
examples/nvme/perf/Makefile
View File

@ -51,8 +51,6 @@ LIBS += -laio
CFLAGS += -DHAVE_LIBAIO CFLAGS += -DHAVE_LIBAIO
endif endif
OBJS = $(C_SRCS:.c=.o)
all : $(APP) all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS) $(APP) : $(OBJS) $(SPDK_LIBS)

4
lib/memory/Makefile
View File

@ -38,10 +38,6 @@ CFLAGS += $(DPDK_INC)
C_SRCS = vtophys.c C_SRCS = vtophys.c
C_OBJS := $(patsubst %.c,%.o,$(C_SRCS))
OBJS = $(C_OBJS)
LIB = libspdk_memory.a LIB = libspdk_memory.a
all : $(LIB) all : $(LIB)

4
lib/nvme/Makefile
View File

@ -38,10 +38,6 @@ CFLAGS += $(DPDK_INC) -include $(CONFIG_NVME_IMPL)
C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_ns_cmd.c nvme_ns.c nvme_qpair.c nvme.c C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_ns_cmd.c nvme_ns.c nvme_qpair.c nvme.c
C_OBJS := $(patsubst %.c,%.o,$(C_SRCS))
OBJS = $(C_OBJS)
all : libspdk_nvme.a all : libspdk_nvme.a
clean : clean :

4
lib/util/Makefile
View File

@ -38,10 +38,6 @@ CFLAGS += $(DPDK_INC)
C_SRCS = file.c string.c pci.c C_SRCS = file.c string.c pci.c
C_OBJS := $(patsubst %.c,%.o,$(C_SRCS))
OBJS = $(C_OBJS)
all : libspdk_util.a all : libspdk_util.a
clean : clean :

2
mk/nvme.unittest.mk
View File

@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
C_SRCS = $(TEST_FILE) $(OTHER_FILES) C_SRCS = $(TEST_FILE) $(OTHER_FILES)
OBJS = $(C_SRCS:.c=.o)
CFLAGS += -I$(SPDK_ROOT_DIR)/lib -include $(SPDK_ROOT_DIR)/test/lib/nvme/unit/nvme_impl.h CFLAGS += -I$(SPDK_ROOT_DIR)/lib -include $(SPDK_ROOT_DIR)/test/lib/nvme/unit/nvme_impl.h
LIBS += -lcunit -lpthread LIBS += -lcunit -lpthread

2
mk/spdk.common.mk
View File

@ -88,6 +88,8 @@ CFLAGS += $(COMMON_CFLAGS) -Wno-pointer-sign -std=gnu99
MAKEFLAGS += --no-print-directory MAKEFLAGS += --no-print-directory
OBJS = $(C_SRCS:.c=.o)
DEPFLAGS = -MMD -MP -MF $*.d.tmp DEPFLAGS = -MMD -MP -MF $*.d.tmp
# Compile first input $< (.c) into $@ (.o) # Compile first input $< (.c) into $@ (.o)

2
test/lib/memory/Makefile
View File

@ -44,8 +44,6 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
LIBS += $(SPDK_LIBS) -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) -lpthread $(DPDK_LIB) -lrt
OBJS = $(C_SRCS:.c=.o)
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(SPDK_LIBS) $(APP): $(OBJS) $(SPDK_LIBS)

2
test/lib/nvme/aer/Makefile
View File

@ -46,8 +46,6 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
LIBS += $(SPDK_LIBS) -lpciaccess -lpthread $(DPDK_LIB) -lrt LIBS += $(SPDK_LIBS) -lpciaccess -lpthread $(DPDK_LIB) -lrt
OBJS = $(C_SRCS:.c=.o)
all : $(APP) all : $(APP)
$(APP) : $(OBJS) $(SPDK_LIBS) $(APP) : $(OBJS) $(SPDK_LIBS)