d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/server_node_efd: convert to pkg-config-based build

Browse Source 
Remove references to the old make build system and use pkg-config for
building these examples.

Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
This commit is contained in:
Kevin Laatz 2020-09-03 16:26:43 +01:00 committed by Thomas Monjalon
parent e93887d3f4
commit 25d3438c8f
3 changed files with 73 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/server_node_efd/Makefile
View File

@ -1,16 +1,10 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2016-2017 Intel Corporation # Copyright(c) 2016-2020 Intel Corporation
ifeq ($(RTE_SDK),) subdirs := node server
$(error "Please define RTE_SDK environment variable")
endif
# Default target, detect a build directory, by looking for a path with a .config .PHONY: all static shared clean $(subdirs)
RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) all static shared clean: $(subdirs)
include $(RTE_SDK)/mk/rte.vars.mk $(subdirs):
$(MAKE) -C $@ $(MAKECMDGOALS)
DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += server
DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += node
include $(RTE_SDK)/mk/rte.extsubdir.mk

46
examples/server_node_efd/node/Makefile
View File

@ -1,12 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2016-2017 Intel Corporation # Copyright(c) 2016-2020 Intel Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
endif
# Default target, can be overridden by command line or environment
include $(RTE_SDK)/mk/rte.vars.mk
# binary name # binary name
APP = node APP = node
@ -14,8 +7,37 @@ APP = node
# all source are stored in SRCS-y # all source are stored in SRCS-y
SRCS-y := node.c SRCS-y := node.c
CFLAGS += $(WERROR_FLAGS) -O3 CFLAGS += -I../shared
CFLAGS += -I$(SRCDIR)/../shared
CFLAGS += -DALLOW_EXPERIMENTAL_API
include $(RTE_SDK)/mk/rte.extapp.mk # Build using pkg-config variables if possible
ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
$(error "no installation of DPDK found")
endif
all: shared
.PHONY: shared static
shared: build/$(APP)-shared
ln -sf $(APP)-shared build/$(APP)
static: build/$(APP)-static
ln -sf $(APP)-static build/$(APP)
PKGCONF ?= pkg-config
PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
build:
@mkdir -p $@
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
test -d build && rmdir -p build || true

53
examples/server_node_efd/server/Makefile
View File

@ -1,19 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2016-2017 Intel Corporation # Copyright(c) 2016-2020 Intel Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
endif
# Default target, detect a build directory, by looking for a path with a .config
RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
include $(RTE_SDK)/mk/rte.vars.mk
ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
$(error This application can only operate in a linux environment, \
please change the definition of the RTE_TARGET environment variable)
endif
# binary name # binary name
APP = server APP = server
@ -21,10 +7,37 @@ APP = server
# all source are stored in SRCS-y # all source are stored in SRCS-y
SRCS-y := main.c init.c args.c SRCS-y := main.c init.c args.c
INC := $(sort $(wildcard *.h)) CFLAGS += -I../shared
CFLAGS += $(WERROR_FLAGS) -O3 # Build using pkg-config variables if possible
CFLAGS += -I$(SRCDIR)/../shared ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
CFLAGS += -DALLOW_EXPERIMENTAL_API $(error "no installation of DPDK found")
endif
include $(RTE_SDK)/mk/rte.extapp.mk all: shared
.PHONY: shared static
shared: build/$(APP)-shared
ln -sf $(APP)-shared build/$(APP)
static: build/$(APP)-static
ln -sf $(APP)-static build/$(APP)
PKGCONF ?= pkg-config
PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
build:
@mkdir -p $@
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
test -d build && rmdir -p build || true