Commit 5b16c18d authored by Jim Harris's avatar Jim Harris
Browse files

build: move app rules to spdk.app.mk 



This removes a ton of duplicate from a lot of
Makefiles.  Note that spdk.unittest.mk still keeps
its own app rules, and now just includes
spdk.app_vars.mk instead.  Fixing Makefiles that
include this .mk file requires more work that is
deferred for now.  We do need to add the
"install: all" rule explicitly to this .mk files.

Note that Makefiles need to include spdk.app.mk
now at the end of the file, so that things like
APP and SPDK_LIB_LIST are defined before including
it.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: If6823cda135180c37690ffc96c91660b7f0718e3

Reviewed-on: https://review.gerrithub.io/434283


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 092eb221

app/iscsi_tgt/Makefile

+1 −13
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk



APP = iscsi_tgt
@@ -53,15 +52,4 @@ ifeq ($(OS),Linux) 
SPDK_LIB_LIST += event_nbd nbd

endif



LIBS += $(SPDK_LIB_LINKER_ARGS)



all : $(APP)

	@:



$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean :

	$(CLEAN_C) $(APP)



include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

app/nvmf_tgt/Makefile

+1 −13
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk



APP = nvmf_tgt
@@ -49,15 +48,4 @@ ifeq ($(OS),Linux) 
SPDK_LIB_LIST += event_nbd nbd

endif



LIBS += $(SPDK_LIB_LINKER_ARGS)



all : $(APP)

	@:



$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean :

	$(CLEAN_C) $(APP)



include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

app/spdk_tgt/Makefile

+1 −13
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk



APP = spdk_tgt
@@ -56,18 +55,7 @@ ifeq ($(OS),Linux) 
SPDK_LIB_LIST += event_nbd nbd

endif



LIBS += $(SPDK_LIB_LINKER_ARGS)



all: $(APP)

	@:



$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean:

	$(CLEAN_C) $(APP)

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk



install: $(APP)

	$(INSTALL_APP)
 


include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

app/vhost/Makefile

+1 −13
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk



APP = vhost
@@ -47,15 +46,4 @@ SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf 
SPDK_LIB_LIST += thread util log log_rpc app_rpc

SPDK_LIB_LIST += event_nbd nbd net sock



LIBS += $(SPDK_LIB_LINKER_ARGS)



all : $(APP)

	@:



$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean :

	$(CLEAN_C) $(APP)



include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

examples/bdev/fio_plugin/Makefile

+1 −13
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

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk

include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk



APP := fio_plugin
@@ -46,15 +45,4 @@ LDFLAGS += -shared -rdynamic 
SPDK_LIB_LIST = $(ALL_MODULES_LIST)

SPDK_LIB_LIST += thread util bdev conf copy rpc jsonrpc json log sock trace



LIBS += $(SPDK_LIB_LINKER_ARGS)



all: $(APP)

	@:



$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean:

	$(CLEAN_C) $(APP)



include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk