diff --git a/.gitignore b/.gitignore
index 7f6f1b56fa..032d1b5db3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,3 +107,4 @@ _build
 .qsys_edit
 .github/CODEOWNERS
 .github/PULL_REQUEST_TEMPLATE.md
+library/**/.lock
diff --git a/projects/scripts/project-intel.mk b/projects/scripts/project-intel.mk
index 6e353ed049..15027ce4a9 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)
diff --git a/projects/scripts/project-xilinx.mk b/projects/scripts/project-xilinx.mk
index 95e2c2340a..45f15c373b 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"