Skip to content

Commit 1a3229c

Browse files
committed
scripts: xilinx: always call library.mk on deps
Library dependencies are managed in library.mk, this commit ensures that library.mk manage and skip them by setting a dummy .TOUCH target. When building a project, it is desired to rebuild all libraries that have been modified. Previously, the solution placed component.xml files as dependencies, skipping these targets if the file already exists, but ignored changes to them. Signed-off-by: Jorge Marques <[email protected]>
1 parent efc4858 commit 1a3229c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

projects/scripts/project-xilinx.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## SPDX short identifier: BSD-1-Clause
44
####################################################################################
55

6-
# Assumes this file is in prpojects/scripts/project-xilinx.mk
6+
# Assumes this file is in projects/scripts/project-xilinx.mk
77
HDL_PROJECT_PATH := $(subst scripts/project-xilinx.mk,,$(lastword $(MAKEFILE_LIST)))
88
HDL_LIBRARY_PATH := $(HDL_PROJECT_PATH)../library/
99

@@ -74,7 +74,7 @@ M_DEPS += $(HDL_PROJECT_PATH)scripts/adi_project_xilinx.tcl
7474
M_DEPS += $(HDL_PROJECT_PATH)../scripts/adi_env.tcl
7575
M_DEPS += $(HDL_PROJECT_PATH)scripts/adi_board.tcl
7676

77-
M_DEPS += $(foreach dep,$(LIB_DEPS),$(HDL_LIBRARY_PATH)$(dep)/component.xml)
77+
M_DEPS += $(foreach dep,$(LIB_DEPS),$(HDL_LIBRARY_PATH)$(dep)/)
7878

7979
.PHONY: all lib clean clean-all
8080

@@ -114,7 +114,8 @@ $(PROJECT_NAME).sdk/system_top.xsa: $(M_DEPS)
114114
$(PROJECT_NAME)_vivado.log, \
115115
$(HL)$(PROJECT_NAME)$(NC) project)
116116

117-
$(HDL_LIBRARY_PATH)%/component.xml:
117+
.TOUCH:
118+
$(HDL_LIBRARY_PATH)%/: .TOUCH
118119
if [ -n "${REQUIRED_VIVADO_VERSION}" ]; then \
119120
$(MAKE) -C $(dir $@) $(TARGET) REQUIRED_VIVADO_VERSION=${REQUIRED_VIVADO_VERSION} || exit $$?; \
120121
else \

0 commit comments

Comments
 (0)