mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-29 14:52:12 +01:00
makefile: use correct opfw_resource file name as dependancy
When 'opfw_resource' target is used as a dependency, it seems that make can't determine when the resource file is remade, and sometimes may start building GCS before the resource really exists. This is an attempt to fix that issue by referencing the real file instead of phony target.
This commit is contained in:
parent
e15c40b35d
commit
9cc0abe262
4
Makefile
4
Makefile
@ -757,7 +757,7 @@ $(OPFW_RESOURCE): $(FW_TARGETS)
|
||||
|
||||
# If opfw_resource or all firmware are requested, GCS should depend on the resource
|
||||
ifneq ($(strip $(filter opfw_resource all all_fw all_flight,$(MAKECMDGOALS))),)
|
||||
$(eval openpilotgcs: | opfw_resource)
|
||||
$(eval openpilotgcs: $(OPFW_RESOURCE))
|
||||
endif
|
||||
|
||||
# Packaging targets: package, clean_package
|
||||
@ -780,7 +780,7 @@ ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),)
|
||||
|
||||
# Packaged GCS should depend on opfw_resource
|
||||
ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),)
|
||||
$(eval openpilotgcs: | opfw_resource)
|
||||
$(eval openpilotgcs: $(OPFW_RESOURCE))
|
||||
endif
|
||||
|
||||
# Clean the build directory if clean_package is requested
|
||||
|
Loading…
x
Reference in New Issue
Block a user