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 ED76BA04BF; Thu, 3 Sep 2020 17:28:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 39C3F1C0D1; Thu, 3 Sep 2020 17:28:00 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id B42821C0BD for ; Thu, 3 Sep 2020 17:27:57 +0200 (CEST) IronPort-SDR: FQOxqehtxRAdcacCOeq9kr4R5R7ljJ4w+e7Wi1ZiWipIlyLISUW4AeB7kv/9rcH8v5wQQHEQP1 yza+41XpOIJA== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="145332117" X-IronPort-AV: E=Sophos;i="5.76,387,1592895600"; d="scan'208";a="145332117" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2020 08:27:56 -0700 IronPort-SDR: JNdw7ksCoyxL75DchkS8rOAjcZ7O5vUMKgJorTLmp+lMYw/Ms3pZ20YpveD1pc9h8GpRXLZxVb jcRXh+7jL3iA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,387,1592895600"; d="scan'208";a="302243710" Received: from silpixa00399953.ir.intel.com (HELO silpixa00399953.ger.corp.intel.com) ([10.237.222.53]) by orsmga006.jf.intel.com with ESMTP; 03 Sep 2020 08:27:54 -0700 From: Ciara Power To: dev@dpdk.org Cc: Kevin Laatz , Byron Marohn , Yipeng Wang Date: Thu, 3 Sep 2020 16:26:43 +0100 Message-Id: <20200903152717.42095-4-ciara.power@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200903152717.42095-1-ciara.power@intel.com> References: <20200807123009.21266-1-ciara.power@intel.com> <20200903152717.42095-1-ciara.power@intel.com> Subject: [dpdk-dev] [PATCH v3 03/37] examples/server_node_efd: 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/server_node_efd/Makefile | 18 +++------ examples/server_node_efd/node/Makefile | 46 +++++++++++++++------ examples/server_node_efd/server/Makefile | 51 +++++++++++++++--------- 3 files changed, 72 insertions(+), 43 deletions(-) diff --git a/examples/server_node_efd/Makefile b/examples/server_node_efd/Makefile index cc2ea8b566..e4a4a94a79 100644 --- a/examples/server_node_efd/Makefile +++ b/examples/server_node_efd/Makefile @@ -1,16 +1,10 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation +# Copyright(c) 2016-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +subdirs := node server -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +.PHONY: all static shared clean $(subdirs) +all static shared clean: $(subdirs) -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += server -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += node - -include $(RTE_SDK)/mk/rte.extsubdir.mk +$(subdirs): + $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/examples/server_node_efd/node/Makefile b/examples/server_node_efd/node/Makefile index ecc551e1d6..a4efef42dc 100644 --- a/examples/server_node_efd/node/Makefile +++ b/examples/server_node_efd/node/Makefile @@ -1,12 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation - -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif - -# Default target, can be overridden by command line or environment -include $(RTE_SDK)/mk/rte.vars.mk +# Copyright(c) 2016-2020 Intel Corporation # binary name APP = node @@ -14,8 +7,37 @@ APP = node # all source are stored in SRCS-y SRCS-y := node.c -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +CFLAGS += -I../shared + +# 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) + +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 $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile index acbd12ae23..106e1abd74 100644 --- a/examples/server_node_efd/server/Makefile +++ b/examples/server_node_efd/server/Makefile @@ -1,30 +1,43 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2016-2017 Intel Corporation +# Copyright(c) 2016-2020 Intel Corporation -ifeq ($(RTE_SDK),) -$(error "Please define RTE_SDK environment variable") -endif +# binary name +APP = server -# Default target, detect a build directory, by looking for a path with a .config -RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config))))) +# all source are stored in SRCS-y +SRCS-y := main.c init.c args.c -include $(RTE_SDK)/mk/rte.vars.mk +CFLAGS += -I../shared -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linux environment, \ -please change the definition of the RTE_TARGET environment variable) +# Build using pkg-config variables if possible +ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +$(error "no installation of DPDK found") endif -# binary name -APP = server +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) -# all source are stored in SRCS-y -SRCS-y := main.c init.c args.c +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) -INC := $(sort $(wildcard *.h)) +build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build + $(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC) -CFLAGS += $(WERROR_FLAGS) -O3 -CFLAGS += -I$(SRCDIR)/../shared -CFLAGS += -DALLOW_EXPERIMENTAL_API +build: + @mkdir -p $@ -include $(RTE_SDK)/mk/rte.extapp.mk +.PHONY: clean +clean: + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + test -d build && rmdir -p build || true -- 2.17.1