Signed-off-by: Olivier Matz <olivier.matz at 6wind.com> --- 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(-)
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
