X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=examples%2Ftep_termination%2FMakefile;h=645112498d330558177dd07a9801025f97b50f66;hb=02afed59258d159c3fa653f91a3faa4905c68702;hp=222679bc97762f4909b7b40aa661ae361a95fea1;hpb=b7ed955a20eee5979eaecc9fab500a176e2741c5;p=dpdk.git diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 222679bc97..645112498d 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -8,8 +8,7 @@ APP = tep_termination SRCS-y := main.c vxlan_setup.c vxlan.c # Build using pkg-config variables if possible -$(shell pkg-config --exists libdpdk) -ifeq ($(.SHELLSTATUS),0) +ifeq ($(shell pkg-config --exists libdpdk && echo 0),0) all: shared .PHONY: shared static @@ -20,12 +19,13 @@ static: build/$(APP)-static LDFLAGS += -pthread -PC_FILE := $(shell pkg-config --path libdpdk) -CFLAGS += -O3 $(shell pkg-config --cflags libdpdk) -LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk) -LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk) +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 = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk) -CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -Wno-deprecated-declarations build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build @@ -40,7 +40,7 @@ build: .PHONY: clean clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system @@ -58,7 +58,6 @@ $(error This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) endif -CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) CFLAGS += -Wno-deprecated-declarations