aboutsummaryrefslogtreecommitdiff
path: root/Common.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Common.mk')
-rw-r--r--Common.mk34
1 files changed, 17 insertions, 17 deletions
diff --git a/Common.mk b/Common.mk
index b77c644..65a487a 100644
--- a/Common.mk
+++ b/Common.mk
@@ -46,6 +46,23 @@ endif
$(call show_config_variable,CURRENT_OS,[AUTODETECTED])
########################################################################
+#
+# Travis-CI
+ifneq ($(TEST),)
+ DEPENDENCIES_DIR = /var/tmp/Arduino-Makefile-testing-dependencies
+
+ DEPENDENCIES_MPIDE_DIR = $(DEPENDENCIES_DIR)/mpide-0023-linux64-20130817-test
+ ifeq ($(MPIDE_DIR),)
+ MPIDE_DIR = $(DEPENDENCIES_MPIDE_DIR)
+ endif
+
+ DEPENDENCIES_ARDUINO_DIR = $(DEPENDENCIES_DIR)/arduino-1.0.6
+ ifeq ($(ARDUINO_DIR),)
+ ARDUINO_DIR = $(DEPENDENCIES_ARDUINO_DIR)
+ endif
+endif
+
+########################################################################
# Arduino Directory
ifndef ARDUINO_DIR
@@ -67,20 +84,3 @@ ifeq ($(CURRENT_OS),WINDOWS)
echo $(error On Windows, ARDUINO_DIR must be a relative path)
endif
endif
-
-########################################################################
-#
-# Travis-CI
-ifneq ($(TEST),)
- DEPENDENCIES_DIR = /var/tmp/Arduino-Makefile-testing-dependencies
-
- DEPENDENCIES_MPIDE_DIR = $(DEPENDENCIES_DIR)/mpide-0023-linux64-20130817-test
- ifeq ($(MPIDE_DIR),)
- MPIDE_DIR = $(DEPENDENCIES_MPIDE_DIR)
- endif
-
- DEPENDENCIES_ARDUINO_DIR = $(DEPENDENCIES_DIR)/arduino-1.0.6
- ifeq ($(ARDUINO_DIR),)
- ARDUINO_DIR = $(DEPENDENCIES_ARDUINO_DIR)
- endif
-endif