git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vhost: replace vDPA device ID in Vhost
[dpdk.git]
/
examples
/
vmdq_dcb
/
Makefile
diff --git
a/examples/vmdq_dcb/Makefile
b/examples/vmdq_dcb/Makefile
index
3bd80a0
..
3eb7c9f
100644
(file)
--- a/
examples/vmdq_dcb/Makefile
+++ b/
examples/vmdq_dcb/Makefile
@@
-8,8
+8,7
@@
APP = vmdq_dcb_app
SRCS-y := main.c
# Build using pkg-config variables if possible
SRCS-y := main.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
all: shared
.PHONY: shared static
@@
-18,12
+17,12
@@
shared: build/$(APP)-shared
static: build/$(APP)-static
ln -sf $(APP)-static build/$(APP)
static: build/$(APP)-static
ln -sf $(APP)-static build/$(APP)
-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
-CFLAGS += -DALLOW_EXPERIMENTAL_API
+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)
build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
@@
-37,7
+36,7
@@
build:
.PHONY: clean
clean:
rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
.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
else # Build using legacy build system
@@
-45,13
+44,13
@@
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
endif
$(error "Please define RTE_SDK environment variable")
endif
-# Default target,
can be overridden by command line or environment
-RTE_TARGET ?=
x86_64-native-linuxapp-gcc
+# 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
include $(RTE_SDK)/mk/rte.vars.mk
-CFLAGS += -DALLOW_EXPERIMENTAL_API
CFLAGS += $(WERROR_FLAGS)
CFLAGS += $(WERROR_FLAGS)
+CFLAGS += -DALLOW_EXPERIMENTAL_API
# workaround for a gcc bug with noreturn attribute
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
# workaround for a gcc bug with noreturn attribute
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603