From patchwork Thu Aug 20 12:41:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Power, Ciara" X-Patchwork-Id: 75743 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A9809A04AF; Thu, 20 Aug 2020 14:52:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 381B11C0DB; Thu, 20 Aug 2020 14:51:36 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id D5D071C0C2 for ; Thu, 20 Aug 2020 14:51:31 +0200 (CEST) IronPort-SDR: K6dRMKvRzFS456/c9rzQeidtFnmDZP+b3o1NV2yJW8n2f1c33WbSKEczdMEByyAJ5TrvND4Cc0 EtF7oes9pYfQ== X-IronPort-AV: E=McAfee;i="6000,8403,9718"; a="219594205" X-IronPort-AV: E=Sophos;i="5.76,332,1592895600"; d="scan'208";a="219594205" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Aug 2020 05:51:31 -0700 IronPort-SDR: r+pMg569HxLY7c6mq2wzQQ+caOGpt5vyL9tr/k54ZHcC6U6S4/BgLa6tv/HD9ptSW6yzdgGV0m sJvfL6je3rog== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,332,1592895600"; d="scan'208";a="498130566" Received: from silpixa00399953.ir.intel.com (HELO silpixa00399953.ger.corp.intel.com) ([10.237.222.53]) by fmsmga005.fm.intel.com with ESMTP; 20 Aug 2020 05:51:30 -0700 From: Ciara Power To: dev@dpdk.org Cc: Kevin Laatz Date: Thu, 20 Aug 2020 13:41:07 +0100 Message-Id: <20200820124140.13451-5-ciara.power@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200820124140.13451-1-ciara.power@intel.com> References: <20200807123009.21266-1-ciara.power@intel.com> <20200820124140.13451-1-ciara.power@intel.com> Subject: [dpdk-dev] [PATCH v2 04/37] examples/ka-agent: convert to pkg-config-based build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Kevin Laatz Remove references to the old make build system and use pkg-config for building these examples. Signed-off-by: Kevin Laatz --- examples/l2fwd-keepalive/ka-agent/Makefile | 51 ++++++++++++++++------ 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/examples/l2fwd-keepalive/ka-agent/Makefile b/examples/l2fwd-keepalive/ka-agent/Makefile index 8d5061b178..700137c2e2 100644 --- a/examples/l2fwd-keepalive/ka-agent/Makefile +++ b/examples/l2fwd-keepalive/ka-agent/Makefile @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016 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 +# Copyright(c) 2016-2020 Intel Corporation # binary name APP = ka-agent @@ -16,7 +7,39 @@ APP = ka-agent # all source are stored in SRCS-y SRCS-y := main.c -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/../ -CFLAGS += -DALLOW_EXPERIMENTAL_API -LDFLAGS += -lrt -include $(RTE_SDK)/mk/rte.extapp.mk +CFLAGS += -I.. + +# 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) + +LDFLAGS += -lpthread -lrt + +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