rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

gtest: stop compiling gtest libraries on installation

Browse Source
This commit is contained in:
Stacey Sheldon 2013-01-09 01:01:32 -05:00 committed by Alessio Morale
parent 14c5af6148
commit fb4a1d7b1b
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
make/tools.mk
View File

@ -319,14 +319,7 @@ android_sdk_update:
$(ANDROID_SDK_DIR)/tools/android update sdk --no-ui -t platform-tools,android-16,addon-google_apis-google-16 $(ANDROID_SDK_DIR)/tools/android update sdk --no-ui -t platform-tools,android-16,addon-google_apis-google-16
# Set up Google Test (gtest) tools # Set up Google Test (gtest) tools
ifeq ($(V), 1)
GTEST_SILENT :=
else
GTEST_SILENT := --silent
endif
GTEST_DIR := $(TOOLS_DIR)/gtest-1.6.0 GTEST_DIR := $(TOOLS_DIR)/gtest-1.6.0
GTEST_BUILD_DIR := $(DL_DIR)/gtest-build
.PHONY: gtest_install .PHONY: gtest_install
gtest_install: | $(DL_DIR) $(TOOLS_DIR) gtest_install: | $(DL_DIR) $(TOOLS_DIR)
@ -343,14 +336,8 @@ gtest_install: gtest_clean
$(V1) mkdir -p "$(GTEST_DIR)" $(V1) mkdir -p "$(GTEST_DIR)"
$(V1) unzip -q -d "$(TOOLS_DIR)" "$(DL_DIR)/$(GTEST_FILE)" $(V1) unzip -q -d "$(TOOLS_DIR)" "$(DL_DIR)/$(GTEST_FILE)"
# build
$(V1) ( \
cd $(GTEST_DIR) ; \
./configure $(GTEST_SILENT) ; \
$(MAKE) $(GTEST_SILENT) ; \
)
.PHONY: gtest_clean .PHONY: 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)"