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

build: Make spdk.app_cxx.mk work like spdk.app.mk

Browse Source 
These had diverged. Make them work the same way again.

Change-Id: Ib6d93a7042584493315fe1e348dc8ede9ab320f0
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2378
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Ben Walker 2020-05-11 14:28:37 -07:00 committed by Tomasz Zawadzki
parent 290d058a8c
commit f20e375b91
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/iscsi_top/Makefile
View File

@ -33,21 +33,13 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
CXXFLAGS += $(ENV_CXXFLAGS)
CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib
CXX_SRCS = iscsi_top.cpp
APP = iscsi_top APP = iscsi_top
all: $(APP) CXXFLAGS += $(ENV_CXXFLAGS)
@: CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib
$(APP) : $(OBJS) CXX_SRCS := iscsi_top.cpp
$(LINK_CXX)
clean: include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

15
app/trace/Makefile
View File

@ -33,19 +33,10 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
CXX_SRCS := trace.cpp
APP = spdk_trace APP = spdk_trace
all: $(APP) CXX_SRCS := trace.cpp
@:
$(APP): $(OBJS) $(SPDK_LIBS) include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk
$(LINK_CXX)
clean:
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

21
mk/spdk.app_cxx.mk
View File

@ -30,10 +30,27 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# #
include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk
LIBS += $(SPDK_LIB_LINKER_ARGS)
CLEAN_FILES = $(APP)
all : $(APP)
@:
install: all install: all
uninstall: # To avoid overwriting warning
empty_uninstall_rule:
@: @:
uninstall: empty_uninstall_rule
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_CXX)
clean :
$(CLEAN_C) $(CLEAN_FILES)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk