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-719: fix broken paths to other tools (still to be revised) +review OPReview-431

Browse Source
This commit is contained in:
Oleg Semyonov 2013-03-31 21:52:58 +03:00
parent b67ce783f5
commit 03f7596689
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
make/tools.mk
View File

@ -120,7 +120,7 @@ arm_sdk_install: arm_sdk_clean | $(DL_DIR) $(TOOLS_DIR)
# binary only release so just extract it # binary only release so just extract it
@$(ECHO) $(MSG_EXTRACTING) $(call toprel, $(ARM_SDK_DIR)) @$(ECHO) $(MSG_EXTRACTING) $(call toprel, $(ARM_SDK_DIR))
$(V1) tar -C $(call toprel, $(TOOLS_DIR)) -xjf $(call toprel, $(DL_DIR)/$(ARM_SDK_FILE)) $(V1) $(TAR) -C $(call toprel, $(TOOLS_DIR)) -xjf $(call toprel, $(DL_DIR)/$(ARM_SDK_FILE))
.PHONY: arm_sdk_clean .PHONY: arm_sdk_clean
arm_sdk_clean: arm_sdk_clean:
@ -143,36 +143,6 @@ else
export ARM_SDK_PREFIX ?= arm-none-eabi- export ARM_SDK_PREFIX ?= arm-none-eabi-
endif endif
##############################
#
# TODO: these defines will go to tool install sections
#
##############################
# Set up paths to tools
ifeq ($(shell [ -d "$(QT_SDK_DIR)" ] && $(ECHO) "exists"), exists)
QMAKE := $(QT_SDK_QMAKE_PATH)
else
# not installed, hope it's in the path...
QMAKE ?= qmake
endif
ifeq ($(shell [ -d "$(OPENOCD_DIR)" ] && $(ECHO) "exists"), exists)
export OPENOCD := $(OPENOCD_DIR)/bin/openocd
else
# not installed, hope it's in the path...
export OPENOCD ?= openocd
endif
ifeq ($(shell [ -d "$(ANDROID_SDK_DIR)" ] && $(ECHO) "exists"), exists)
ANDROID := $(ANDROID_SDK_DIR)/tools/android
ANDROID_DX := $(ANDROID_SDK_DIR)/platform-tools/dx
else
# not installed, hope it's in the path...
ANDROID ?= android
ANDROID_DX ?= dx
endif
############################## ##############################
# #
# TODO: code below is not revised yet # TODO: code below is not revised yet
@ -494,3 +464,33 @@ gtest_install: gtest_clean
gtest_clean: gtest_clean:
$(V0) @echo " CLEAN $(GTEST_DIR)" $(V0) @echo " CLEAN $(GTEST_DIR)"
$(V1) [ ! -d "$(GTEST_DIR)" ] || $(RM) -rf "$(GTEST_DIR)" $(V1) [ ! -d "$(GTEST_DIR)" ] || $(RM) -rf "$(GTEST_DIR)"
##############################
#
# TODO: these defines will go to tool install sections
#
##############################
# Set up paths to tools
ifeq ($(shell [ -d "$(QT_SDK_DIR)" ] && $(ECHO) "exists"), exists)
QMAKE := $(QT_SDK_QMAKE_PATH)
else
# not installed, hope it's in the path...
QMAKE ?= qmake
endif
ifeq ($(shell [ -d "$(OPENOCD_DIR)" ] && $(ECHO) "exists"), exists)
export OPENOCD := $(OPENOCD_DIR)/bin/openocd
else
# not installed, hope it's in the path...
export OPENOCD ?= openocd
endif
ifeq ($(shell [ -d "$(ANDROID_SDK_DIR)" ] && $(ECHO) "exists"), exists)
ANDROID := $(ANDROID_SDK_DIR)/tools/android
ANDROID_DX := $(ANDROID_SDK_DIR)/platform-tools/dx
else
# not installed, hope it's in the path...
ANDROID ?= android
ANDROID_DX ?= dx
endif