diff options
| author | Simon John <git@the-jedi.co.uk> | 2014-01-13 12:14:31 +0000 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2014-01-14 14:23:25 +0530 |
| commit | d4e0a383ae6ad13615e1c82a48646886cf175d2f (patch) | |
| tree | d72633a2227d923bdfc55b50a7a17d413dd35e52 /chipKIT.mk | |
| parent | fa6b9215c83e4629b24beb0ca3704b1a3ee3eec1 (diff) | |
Simplify package vs git checkout detection
Fix #147
Fix #151
Fix #153
The following are the detailed changes
- Remove ARDMK_PATH, ARDMK_FILE and arduino-mk subdirectory
- Looks for ard-reset-arduino in $PATH or ARDMK_DIR/bin
- Fix git-archive command in RPM SPEC file
- Remove some whitespace
- Remove arduino-mk dir from debian package's arduino-mk.install
- Update docs to reflect the above changes
- Bump Up version to 1.2.0
Diffstat (limited to 'chipKIT.mk')
| -rw-r--r-- | chipKIT.mk | 20 |
1 files changed, 4 insertions, 16 deletions
@@ -27,23 +27,11 @@ # The show_config_variable is unavailable before we include the common makefile, # so we defer logging the ARDMK_DIR info until it happens in Arduino.mk ifndef ARDMK_DIR - # presume it's a level above the path to our own file - ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/..) + # presume it's the same path to our own file + ARDMK_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))) endif -ifndef ARDMK_PATH - ARDMK_PATH = $(ARDMK_DIR)/bin -endif - -ifneq ($(wildcard $(ARDMK_DIR)/arduino-mk/Common.mk),) - # git checkout - include $(ARDMK_DIR)/arduino-mk/Common.mk -else - ifneq ($(wildcard $(ARDMK_DIR)/Common.mk),) - # package install - include $(ARDMK_DIR)/Common.mk - endif -endif +include $(ARDMK_DIR)/Common.mk ifndef MPIDE_DIR AUTO_MPIDE_DIR := $(firstword \ @@ -110,4 +98,4 @@ LDFLAGS += -T$(ARDUINO_CORE_PATH)/chipKIT-application-COMMON.ld CPPFLAGS += -mno-smart-io -fno-short-double CFLAGS_STD = -include $(ARDMK_DIR)/arduino-mk/Arduino.mk +include $(ARDMK_DIR)/Arduino.mk |