From ac8f936fdc86731db6d7dc67b4f4e4903271001d Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 28 Apr 2021 00:11:33 +0200 Subject: [PATCH] build: Makefile cleanup Type: make Change-Id: I751b0a25161c6eb8614ca19f7c77a4de82401f3d Signed-off-by: Damjan Marion --- Makefile | 13 +++---------- {build-root => extras}/scripts/fts.py | 0 2 files changed, 3 insertions(+), 10 deletions(-) rename {build-root => extras}/scripts/fts.py (100%) diff --git a/Makefile b/Makefile index 9573d8222a7..e22813135c4 100644 --- a/Makefile +++ b/Makefile @@ -529,9 +529,7 @@ endef endif %.files: .FORCE - @find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex' -o -name '*\.py' \) -and \ - \( -not -path './build-root*' -o -path \ - './build-root/build-vpp_debug-native/dpdk*' \) > $@ + @find src -name '*.[chS]' > $@ .FORCE: @@ -594,11 +592,6 @@ pkg-rpm: dist pkg-srpm: dist make -C extras/rpm srpm -.PHONY: dpdk-install-dev -dpdk-install-dev: - $(call banner,"This command is deprecated. Please use 'make install-ext-deps'") - make -C build/external install-$(PKG) - .PHONY: install-ext-deps install-ext-deps: make -C build/external install-$(PKG) @@ -670,11 +663,11 @@ endif .PHONY: featurelist featurelist: centos-pyyaml - @build-root/scripts/fts.py --all --markdown + @extras/scripts/fts.py --all --markdown .PHONY: checkfeaturelist checkfeaturelist: centos-pyyaml - @build-root/scripts/fts.py --validate --all + @extras/scripts/fts.py --validate --all # Build vpp_stats_fs diff --git a/build-root/scripts/fts.py b/extras/scripts/fts.py similarity index 100% rename from build-root/scripts/fts.py rename to extras/scripts/fts.py -- 2.16.6