rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

OP-1694 make package rule non-nested: tidy

Browse Source
This commit is contained in:
James Duley 2015-01-31 10:14:46 +13:00
parent 225d0fa249
commit 07cad1db27
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -772,7 +772,7 @@ $(OPFW_RESOURCE): $(FW_TARGETS)
$(V1) $(ECHO) $(QUOTE)$(OPFW_CONTENTS)$(QUOTE) > $@ $(V1) $(ECHO) $(QUOTE)$(OPFW_CONTENTS)$(QUOTE) > $@
# If opfw_resource or all firmware are requested, GCS should depend on the resource # 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))),) ifneq ($(strip $(filter opfw_resource all all_fw all_flight package,$(MAKECMDGOALS))),)
$(eval openpilotgcs_qmake: $(OPFW_RESOURCE)) $(eval openpilotgcs_qmake: $(OPFW_RESOURCE))
endif endif
@ -781,25 +781,18 @@ endif
# - copies firmware into a package directory # - copies firmware into a package directory
# - calls paltform-specific packaging script # - calls paltform-specific packaging script
# Do some checks and define some values if package is requested # Define some variables
ifneq ($(strip $(filter package,$(MAKECMDGOALS))),) export PACKAGE_LBL := $(shell $(VERSION_INFO) --format=\$${LABEL})
# Define some variables export PACKAGE_NAME := OpenPilot
export PACKAGE_LBL := $(shell $(VERSION_INFO) --format=\$${LABEL}) export PACKAGE_SEP := -
export PACKAGE_NAME := OpenPilot
export PACKAGE_SEP := -
# We can only package release builds
ifneq ($(GCS_BUILD_CONF),release)
$(error Packaging is currently supported for release builds only)
endif
# Packaged GCS should depend on opfw_resource
$(eval openpilotgcs_qmake: $(OPFW_RESOURCE))
endif
.PHONY: package .PHONY: package
package: all_fw all_ground uavobjects_matlab $(PACKAGE_DIR) package: all_fw all_ground uavobjects_matlab $(PACKAGE_DIR)
@$(ECHO) "Packaging for $(UNAME) $(ARCH) into $(call toprel, $(PACKAGE_DIR)) directory" @$(ECHO) "Packaging for $(UNAME) $(ARCH) into $(call toprel, $(PACKAGE_DIR)) directory"
# We can only package release builds
ifneq ($(GCS_BUILD_CONF),release)
$(error Packaging is currently supported for release builds only)
endif
$(MAKE) --no-print-directory -C $(ROOT_DIR)/package --file=$(UNAME).mk $@ $(MAKE) --no-print-directory -C $(ROOT_DIR)/package --file=$(UNAME).mk $@
############################## ##############################