[RFC,4/4] examples/vm_power_manager: support build using pkg-config

Message ID 20190503140901.59064-5-bruce.richardson@intel.com
State RFC
Delegated to: Thomas Monjalon
Headers show
Series
  • allow vm_power_manager to build using pkg-config
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Bruce Richardson May 3, 2019, 2:09 p.m.
The vm_power_manager example app did not check for a libdpdk pkg-config
file and attempt to build using that. Add support for that method of
compile to align the app with the other examples.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/vm_power_manager/Makefile | 80 +++++++++++++++++++++++-------
 1 file changed, 62 insertions(+), 18 deletions(-)

Patch

diff --git a/examples/vm_power_manager/Makefile b/examples/vm_power_manager/Makefile
index 6e573916a..d58669b0e 100644
--- a/examples/vm_power_manager/Makefile
+++ b/examples/vm_power_manager/Makefile
@@ -1,8 +1,69 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2010-2014 Intel Corporation
 
+# binary name
+APP = vm_power_mgr
+
+# all source are stored in SRCS-y
+SRCS-y := \
+	channel_manager.c \
+	channel_monitor.c \
+	main.c \
+	oob_monitor_nop.c \
+	oob_monitor_x86.c \
+	parse.c \
+	power_manager.c \
+	vm_power_cli.c \
+
 ifneq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0)
 $(error vm_power_manager requires libvirt >= 0.9.3)
+endif
+LDLIBS += -lvirt
+
+ifeq ($(shell pkg-config --exists jansson; echo $$?), 0)
+LDLIBS += $(shell pkg-config --libs jansson)
+CFLAGS += -DUSE_JANSSON
+endif
+
+
+# Build using pkg-config variables if possible
+$(shell pkg-config --exists libdpdk)
+ifeq ($(.SHELLSTATUS),0)
+
+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
+ifneq ($(DPDK_PC_PREFIX),)
+	PKGCONF += --define-variable=prefix=$(DPDK_PC_PREFIX)
+endif
+
+LDFLAGS += $(LDLIBS) -lrte_pmd_i40e -lrte_pmd_bnxt -lrte_pmd_ixgbe \
+		-lrte_bus_pci -lrte_bus_vdev
+
+PC_FILE := $(shell $(PKGCONF) --path libdpdk)
+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)-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
+	rmdir --ignore-fail-on-non-empty build
+
 else
 
 ifeq ($(RTE_SDK),)
@@ -14,26 +75,9 @@  RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.conf
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
-# binary name
-APP = vm_power_mgr
-
-# all source are stored in SRCS-y
-SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c
-SRCS-y += channel_monitor.c parse.c
-SRCS-y += oob_monitor_x86.c
-SRCS-y += oob_monitor_nop.c
-
 CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
 
-LDLIBS += -lvirt
-
-JANSSON := $(shell pkg-config --exists jansson; echo $$?)
-ifeq ($(JANSSON), 0)
-LDLIBS += $(shell pkg-config --libs jansson)
-CFLAGS += -DUSE_JANSSON
-endif
-
 ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
 
 ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
@@ -58,4 +102,4 @@  endif
 
 include $(RTE_SDK)/mk/rte.extapp.mk
 
-endif # libvirt check
+endif # pkg-config check