From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B7A97A04AA; Tue, 8 Sep 2020 00:07:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 57DA91C12B; Tue, 8 Sep 2020 00:07:29 +0200 (CEST) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 8741F1C0D8 for ; Tue, 8 Sep 2020 00:07:24 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 2B7065C00D7; Mon, 7 Sep 2020 18:07:24 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 07 Sep 2020 18:07:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=fdMxf82nDfs+b UAbqzNQbHjrVJQT5brf1hyVdLXOeYs=; b=o2Iyzb/e0PYxCsY1Dvd+31OXFHj/D zA5y8F2E9g4SlNZpc7pQ7TM71U2gPMLqNUH5ZquCjj4QVyKoSYtocNPYLqAp+pIe NwwLXBpJoAw7yg8TvkrI3BWTZhSHhi1+kOcKfehkX42T4EEu4BgJvdVg+0OKOjki RzWMiihrarlsoQtPOCV1q6QB3Z4qM6wQKU+PBEPVE2ILPLdB3ekLHwArRZX2M0aU FPvOzK0XI7kr01cJikyLLhW7ponnhvI6eodbsidEfWX9yDLfguqlxrJgC+Qoa1KP uKR5GlmbwguT8dIl8zvNRvUdsNVSWw/1DDRcLjdtRl8NZk5bYJvByw8Rg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=fdMxf82nDfs+bUAbqzNQbHjrVJQT5brf1hyVdLXOeYs=; b=Rs+BlWbG AC3KMuXl/NRUJfnPQMxy1Wgbk3sKc3NCDx10fsBuccryXvibcJ8ZjpI/3+AES7QL gS7xH1GoF1J5zTlewxPSUsU3c/KBoPAcPt84GM0QbK9DjvPYvToJ+V/FtLyZlaJ3 vtYFFBqxJ/qUgDnpwbBgNLXl0VFDZmKjq95LAySLFpKoeEEFe2pcU445Fuv+BFJr /a4SXqAK+7oTe0N5TZvjQ5Uv0nhcRKNFqzCEC4/hq6KWbXPem4VmuI6a+xDkm/2Z YsmuOh3GScpUAFXZo+NITIxIlsn8gZzxdQD08rmAtJCDrAhSIer/8OCeYgR3RsEo GQrujMxY3LJq6Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehuddgtdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepieetgfegleevudetkeefveefieeufeffvdeiudevfeeikefgueek fedvgfevgedunecuffhomhgrihhnpehvrghrshdrmhhkpdgvgihtrghpphdrmhhknecukf hppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 4B2113280059; Mon, 7 Sep 2020 18:07:23 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, ciara.power@intel.com, Kevin Laatz Date: Tue, 8 Sep 2020 00:06:43 +0200 Message-Id: <20200907220711.437405-4-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200907220711.437405-1-thomas@monjalon.net> References: <20200903152717.42095-1-ciara.power@intel.com> <20200907220711.437405-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 03/31] 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 -- 2.28.0