rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

OP-1255 removed mingw_install and python_install make targets (obsolete since Qt 5.1.1. upgrade)

Browse Source
This commit is contained in:
Philippe Renon 2014-03-21 18:53:16 +01:00
parent 93cb920cef
commit eed38b7f35
2 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -864,8 +864,6 @@ help:
@$(ECHO) " [Tool Installers]" @$(ECHO) " [Tool Installers]"
@$(ECHO) " arm_sdk_install - Install the GNU ARM gcc toolchain" @$(ECHO) " arm_sdk_install - Install the GNU ARM gcc toolchain"
@$(ECHO) " qt_sdk_install - Install the QT development tools" @$(ECHO) " qt_sdk_install - Install the QT development tools"
@$(ECHO) " mingw_install - Install the MinGW toolchain (Windows only)"
@$(ECHO) " python_install - Install the Python interpreter (Windows only)"
@$(ECHO) " nsis_install - Install the NSIS Unicode (Windows only)" @$(ECHO) " nsis_install - Install the NSIS Unicode (Windows only)"
@$(ECHO) " sdl_install - Install the SDL library (Windows only)" @$(ECHO) " sdl_install - Install the SDL library (Windows only)"
@$(ECHO) " openssl_install - Install the OpenSSL libraries (Windows only)" @$(ECHO) " openssl_install - Install the OpenSSL libraries (Windows only)"

37
make/tools.mk
View File

@ -265,7 +265,6 @@ define DOWNLOAD_TEMPLATE
) )
endef endef
############################## ##############################
# #
# Common tool install template # Common tool install template
@ -548,62 +547,40 @@ qt_sdk_version:
ifeq ($(UNAME), Windows) ifeq ($(UNAME), Windows)
#$(eval $(call TOOL_INSTALL_TEMPLATE,mingw,$(MINGW_DIR),$(MINGW_URL),$(notdir $(MINGW_URL))))
mingw_install:
mingw_clean:
mingw_distclean:
ifeq ($(shell [ -d "$(MINGW_DIR)" ] && $(ECHO) "exists"), exists) ifeq ($(shell [ -d "$(MINGW_DIR)" ] && $(ECHO) "exists"), exists)
# set MinGW binary and library paths (QTMINGW is used by qmake, do not rename) # set MinGW binary and library paths (QTMINGW is used by qmake, do not rename)
export QTMINGW := $(MINGW_DIR)/bin export QTMINGW := $(MINGW_DIR)/bin
export PATH := $(QTMINGW):$(PATH) export PATH := $(QTMINGW):$(PATH)
else else
# not installed, use host gcc compiler # not installed, use host gcc compiler
# $(info $(EMPTY) WARNING $(call toprel, $(MINGW_DIR)) not found (make mingw_install), using system PATH) # $(info $(EMPTY) WARNING $(call toprel, $(MINGW_DIR)) not found, using system PATH)
endif endif
.PHONY: mingw_version .PHONY: mingw_version
mingw_version: mingw_version: gcc_version
-$(V1) gcc --version | head -n1
.PHONY: gcc_version
gcc_version: mingw_version
else # Linux or Mac else # Linux or Mac
all_sdk_version: gcc_version all_sdk_version: gcc_version
endif
.PHONY: gcc_version .PHONY: gcc_version
gcc_version: gcc_version:
-$(V1) gcc --version | head -n1 -$(V1) gcc --version | head -n1
endif
############################## ##############################
# #
# Python # Python
# #
############################## ##############################
ifeq ($(UNAME), Windows)
#$(eval $(call TOOL_INSTALL_TEMPLATE,python,$(PYTHON_DIR),$(PYTHON_URL),$(notdir $(PYTHON_URL))))
python_install:
python_clean:
python_distclean:
else # Linux or Mac
all_sdk_version: python_version
endif
ifeq ($(shell [ -d "$(PYTHON_DIR)" ] && $(ECHO) "exists"), exists) ifeq ($(shell [ -d "$(PYTHON_DIR)" ] && $(ECHO) "exists"), exists)
export PYTHON := $(PYTHON_DIR)/python export PYTHON := $(PYTHON_DIR)/python
export PATH := $(PYTHON_DIR):$(PATH) export PATH := $(PYTHON_DIR):$(PATH)
else else
# not installed, hope it's in the path... # not installed, hope it's in the path...
# $(info $(EMPTY) WARNING $(call toprel, $(PYTHON_DIR)) not found (make python_install), using system PATH) # $(info $(EMPTY) WARNING $(call toprel, $(PYTHON_DIR)) not found, using system PATH)
export PYTHON := python export PYTHON := python
endif endif
@ -654,7 +631,8 @@ endif
.PHONY: sdl_version .PHONY: sdl_version
sdl_version: sdl_version:
-$(V1) $(ECHO) "SDL 1.2.15 $(SDL_DIR)" -$(V1) $(ECHO) "SDL 1.2.15"
endif endif
############################## ##############################
@ -678,6 +656,7 @@ endif
.PHONY: openssl_version .PHONY: openssl_version
openssl_version: openssl_version:
-$(V1) $(ECHO) "OpenSSL `$(OPENSSL) version`" -$(V1) $(ECHO) "OpenSSL `$(OPENSSL) version`"
endif endif
############################## ##############################