From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id 150C8592E for ; Tue, 13 May 2014 15:51:08 +0200 (CEST) Received: by mail-wg0-f43.google.com with SMTP id l18so414905wgh.14 for ; Tue, 13 May 2014 06:51:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OmtLDob+mtZaEoDJ+WO9wUMahITNzq6nWvPwKQbExh4=; b=cddYWFHtOWJcmNAvJS3hjsgsqdE2leKUU4HSuFQ19ZxunGezZN1rV4HRW8XtGg4hh6 +CKsLTGLInZZcQDnA23eMC4IpBcRoeBF23ZagpRwUcEYL8lbY2CmKZ/OAFCcxBuiLbUW UsHx0hF4gOfTe1pOn+1P1qBVExLkzvODHvQcvxxeneOw23I2BeULY+Y4T2ceskixNNLN cxYsNCMV+1Z1aPpUBcEMoIeJW+QC954oblu5i8LIdhWrpNQS76WRBL4VGzqMnRnfwHXM GUUZsJ5ikb7dusvmNuMLezVALMaIOxYuDmJoxEabqEzUR0TtZy4EY3Sgw6nr4qONYYS4 v/Jg== X-Gm-Message-State: ALoCoQmmhdZpj7I7j0LnpbOds16JjDpPzGMgNAHDIHAJsSAJuErS/c2g0pKPSGeLKT+WLYN3FlGK X-Received: by 10.194.81.98 with SMTP id z2mr27418893wjx.12.1399989076261; Tue, 13 May 2014 06:51:16 -0700 (PDT) Received: from glumotte.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id rw4sm22306282wjb.44.2014.05.13.06.51.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 May 2014 06:51:10 -0700 (PDT) From: Olivier Matz To: dev@dpdk.org Date: Tue, 13 May 2014 15:51:04 +0200 Message-Id: <1399989064-16492-1-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1399631530-24956-3-git-send-email-olivier.matz@6wind.com> References: <1399631530-24956-3-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH v3 2/6] examples: use rte.extsubdir.mk to process subdirectories X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 13:51:09 -0000 Signed-off-by: Olivier Matz --- examples/l2fwd-ivshmem/Makefile | 9 +-------- examples/multi_process/Makefile | 16 +++++++--------- examples/multi_process/client_server_mp/Makefile | 15 ++++++--------- examples/quota_watermark/Makefile | 12 +++--------- 4 files changed, 17 insertions(+), 35 deletions(-) change included in v3: use x86_64-default-linuxapp-gcc instead of x86_64-ivshmem-linuxapp-gcc for default RTE_TARGET of multi_process example (was a bad copy/paste). diff --git a/examples/l2fwd-ivshmem/Makefile b/examples/l2fwd-ivshmem/Makefile index 7286b37..df59ed8 100644 --- a/examples/l2fwd-ivshmem/Makefile +++ b/examples/l2fwd-ivshmem/Makefile @@ -37,14 +37,7 @@ endif RTE_TARGET ?= x86_64-ivshmem-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += host guest -.PHONY: all clean $(DIRS-y) - -all: $(DIRS-y) -clean: $(DIRS-y) - -$(DIRS-y): - $(MAKE) -C $@ $(MAKECMDGOALS) +include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile index ba96a7e..5e01f9a 100644 --- a/examples/multi_process/Makefile +++ b/examples/multi_process/Makefile @@ -33,15 +33,13 @@ ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif -include $(RTE_SDK)/mk/rte.vars.mk -unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += $(wildcard *_mp) +# Default target, can be overriden by command line or environment +RTE_TARGET ?= x86_64-default-linuxapp-gcc -.PHONY: all clean $(DIRS-y) +include $(RTE_SDK)/mk/rte.vars.mk -all: $(DIRS-y) -clean: $(DIRS-y) +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += client_server_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += simple_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += symmetric_mp -$(DIRS-y): - $(MAKE) -C $@ $(MAKECMDGOALS) +include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile index 24d31b0..d2046ba 100644 --- a/examples/multi_process/client_server_mp/Makefile +++ b/examples/multi_process/client_server_mp/Makefile @@ -33,15 +33,12 @@ ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif -include $(RTE_SDK)/mk/rte.vars.mk -unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += $(wildcard mp_*) +# Default target, can be overriden by command line or environment +RTE_TARGET ?= x86_64-default-linuxapp-gcc -.PHONY: all clean $(DIRS-y) +include $(RTE_SDK)/mk/rte.vars.mk -all: $(DIRS-y) -clean: $(DIRS-y) +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += mp_client +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += mp_server -$(DIRS-y): - $(MAKE) -C $@ $(MAKECMDGOALS) +include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/quota_watermark/Makefile b/examples/quota_watermark/Makefile index 5596dcc..e4d54c2 100644 --- a/examples/quota_watermark/Makefile +++ b/examples/quota_watermark/Makefile @@ -37,14 +37,8 @@ endif RTE_TARGET ?= x86_64-default-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += $(wildcard qw*) +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += qw +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += qwctl -.PHONY: all clean $(DIRS-y) - -all: $(DIRS-y) -clean: $(DIRS-y) - -$(DIRS-y): - $(MAKE) -C $@ $(MAKECMDGOALS) +include $(RTE_SDK)/mk/rte.extsubdir.mk -- 1.9.2