From 53c5dee636dea9cf6e5976e02a957d211ee980bc Mon Sep 17 00:00:00 2001 From: AndreiGrozav Date: Thu, 18 Jan 2024 16:34:17 +0200 Subject: [PATCH 1/3] scripts:project_xilinx.mk: Fix make clean-all target Signed-off-by: AndreiGrozav --- projects/scripts/project-xilinx.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/scripts/project-xilinx.mk b/projects/scripts/project-xilinx.mk index 95e2c2340a5..45f15c373b4 100644 --- a/projects/scripts/project-xilinx.mk +++ b/projects/scripts/project-xilinx.mk @@ -89,9 +89,11 @@ clean: $(HL)$(PROJECT_NAME)$(NC) project) -rm -Rf ${DIR_NAME} -clean-all: TARGET:=clean -clean-all: clean $(M_DEPS) +clean-all: clean @rm -Rf $(CLEAN_DIRS) + @for lib in $(LIB_DEPS); do \ + $(MAKE) -C $(HDL_LIBRARY_PATH)$${lib} clean; \ + done MODE ?= "default" From 5bc355f086c49642c43e6df5ef1b1180bf7fcdc2 Mon Sep 17 00:00:00 2001 From: AndreiGrozav Date: Thu, 18 Jan 2024 16:40:50 +0200 Subject: [PATCH 2/3] Add library .lock files to git ignore Signed-off-by: AndreiGrozav --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7f6f1b56fa8..032d1b5db31 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ _build .qsys_edit .github/CODEOWNERS .github/PULL_REQUEST_TEMPLATE.md +library/**/.lock From b485b09d3c2da5c5ebde3d7fb48db50edc97420b Mon Sep 17 00:00:00 2001 From: Jorge Marques Date: Thu, 18 Jan 2024 12:15:59 -0300 Subject: [PATCH 3/3] scripts:project_intel.mk: Fix make clean-all target Signed-off-by: Jorge Marques --- projects/scripts/project-intel.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/scripts/project-intel.mk b/projects/scripts/project-intel.mk index 6e353ed0493..15027ce4a99 100644 --- a/projects/scripts/project-intel.mk +++ b/projects/scripts/project-intel.mk @@ -115,9 +115,11 @@ clean: $(HL)$(PROJECT_NAME)$(NC) project) -rm -Rf ${DIR_NAME} -clean-all: TARGET:=clean -clean-all: clean $(M_DEPS) +clean-all: clean @rm -Rf $(CLEAN_DIRS) + @for lib in $(LIB_DEPS); do \ + $(MAKE) -C $(HDL_LIBRARY_PATH)$${lib} clean; \ + done $(PROJECT_NAME).sof: $(M_DEPS) -rm -rf $(CLEAN_TARGET)