Commit f20e375b authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

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



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

Change-Id: Ib6d93a7042584493315fe1e348dc8ede9ab320f0
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2378


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 290d058a

app/iscsi_top/Makefile

+5 −13
Original line number Diff line number Diff line
@@ -33,21 +33,13 @@ 


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

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

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



CXXFLAGS += $(ENV_CXXFLAGS)

CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib

CXX_SRCS = iscsi_top.cpp

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



APP = iscsi_top



all: $(APP)

	@:



$(APP) : $(OBJS)

	$(LINK_CXX)

CXXFLAGS += $(ENV_CXXFLAGS)

CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib



clean:

	$(CLEAN_C) $(APP)

CXX_SRCS := iscsi_top.cpp



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

app/trace/Makefile

+3 −12
Original line number Diff line number Diff line
@@ -33,19 +33,10 @@ 


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

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

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



CXX_SRCS := trace.cpp

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



APP = spdk_trace



all: $(APP)

	@:



$(APP): $(OBJS) $(SPDK_LIBS)

	$(LINK_CXX)



clean:

	$(CLEAN_C) $(APP)

CXX_SRCS := trace.cpp



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

mk/spdk.app_cxx.mk

+19 −2
Original line number Diff line number Diff line
@@ -30,10 +30,27 @@ 
#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#



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



LIBS += $(SPDK_LIB_LINKER_ARGS)



CLEAN_FILES = $(APP)



all : $(APP)

	@:



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