rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-08 00:53:48 +02:00
Code Issues Releases Activity

OP-1790: fix up packging make dependencies

Browse Source
This commit is contained in:
James Duley 2015-03-18 10:18:04 +13:00
parent feef238337
commit 26266f1dee
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -792,14 +792,10 @@ PACKAGE_NAME := OpenPilot
PACKAGE_SEP := - PACKAGE_SEP := -
PACKAGE_FULL_NAME := $(PACKAGE_NAME)$(PACKAGE_SEP)$(PACKAGE_LBL) PACKAGE_FULL_NAME := $(PACKAGE_NAME)$(PACKAGE_SEP)$(PACKAGE_LBL)
# Source distribution is never dirty because it uses git archive
DIST_NAME := $(DIST_DIR)/$(subst dirty-,,$(PACKAGE_FULL_NAME)).tar
.PHONY: package
include $(ROOT_DIR)/package/$(UNAME).mk include $(ROOT_DIR)/package/$(UNAME).mk
package: all_fw all_ground uavobjects_matlab # Source distribution is never dirty because it uses git archive
DIST_NAME := $(DIST_DIR)/$(subst dirty-,,$(PACKAGE_FULL_NAME)).tar
############################## ##############################
# #

2
package/Darwin.mk
View File

@ -7,7 +7,7 @@ ifndef OPENPILOT_IS_COOL
endif endif
.PHONY: package .PHONY: package
package: | $(PACKAGE_DIR) package: openpilotgcs uavobjects_matlab | $(PACKAGE_DIR)
ifneq ($(GCS_BUILD_CONF),release) ifneq ($(GCS_BUILD_CONF),release)
# We can only package release builds # We can only package release builds
$(error Packaging is currently supported for release builds only) $(error Packaging is currently supported for release builds only)

2
package/Windows.mk
View File

@ -15,7 +15,7 @@ NSIS_TEMPLATE := $(NSIS_WINX86)/openpilotgcs.tpl
NSIS_HEADER := $(OPGCSSYNTHDIR)/openpilotgcs.nsh NSIS_HEADER := $(OPGCSSYNTHDIR)/openpilotgcs.nsh
.PHONY: package .PHONY: package
package: | $(PACKAGE_DIR) package: openpilotgcs uavobjects_matlab | $(PACKAGE_DIR)
ifneq ($(GCS_BUILD_CONF),release) ifneq ($(GCS_BUILD_CONF),release)
# We can only package release builds # We can only package release builds
$(error Packaging is currently supported for release builds only) $(error Packaging is currently supported for release builds only)

2
package/linux/debian/rules
View File

@ -12,7 +12,7 @@ export DH_OPTIONS
dh $@ dh $@
override_dh_auto_build: override_dh_auto_build:
dh_auto_build -- all dh_auto_build -- opfw_resource openpilotgcs
override_dh_auto_install: override_dh_auto_install:
dh_auto_install -- prefix=/usr dh_auto_install -- prefix=/usr