From 9357f7d3ab8d62d05dc35cd9d82941cdc460e28c Mon Sep 17 00:00:00 2001 From: Osamu Aoki Date: Sun, 12 Apr 2020 21:19:41 +0900 Subject: [PATCH 1/2] Use $(ARDMK_DIR) Signed-off-by: Osamu Aoki --- examples/AnalogInOutSerial/Makefile | 2 +- examples/Blink/Makefile | 2 +- examples/BlinkChipKIT/Makefile | 2 +- examples/BlinkInAVRC/Makefile | 2 +- examples/BlinkNetworkRPi/Makefile | 2 +- examples/BlinkTeensy/Makefile | 2 +- examples/BlinkWithoutDelay/Makefile | 2 +- examples/Fade/Makefile | 2 +- examples/HelloWorld/Makefile | 2 +- examples/SerialPrint/Makefile | 2 +- examples/TinySoftWareSerial/Makefile | 2 +- examples/WebServer/Makefile | 2 +- examples/master_reader/Makefile | 2 +- examples/toneMelody/Makefile | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/AnalogInOutSerial/Makefile b/examples/AnalogInOutSerial/Makefile index 3dea6c0..5db75de 100644 --- a/examples/AnalogInOutSerial/Makefile +++ b/examples/AnalogInOutSerial/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk diff --git a/examples/Blink/Makefile b/examples/Blink/Makefile index 7cb3881..51a66bc 100644 --- a/examples/Blink/Makefile +++ b/examples/Blink/Makefile @@ -1,7 +1,7 @@ # Arduino Make file. Refer to https://github.com/sudar/Arduino-Makefile BOARD_TAG = uno -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk diff --git a/examples/BlinkChipKIT/Makefile b/examples/BlinkChipKIT/Makefile index 87a9f7d..440db29 100644 --- a/examples/BlinkChipKIT/Makefile +++ b/examples/BlinkChipKIT/Makefile @@ -1,5 +1,5 @@ BOARD_TAG = mega_pic32 ARDUINO_LIBS = -include ../../chipKIT.mk +include $(ARDMK_DIR)/chipKIT.mk diff --git a/examples/BlinkInAVRC/Makefile b/examples/BlinkInAVRC/Makefile index a4cd2e4..04049bb 100644 --- a/examples/BlinkInAVRC/Makefile +++ b/examples/BlinkInAVRC/Makefile @@ -11,6 +11,6 @@ F_CPU = 8000000L ISP_PROG = stk500v1 AVRDUDE_ISP_BAUDRATE = 19200 -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk # !!! Important. You have to use make ispload to upload when using ISP programmer diff --git a/examples/BlinkNetworkRPi/Makefile b/examples/BlinkNetworkRPi/Makefile index 15e565e..c119b53 100644 --- a/examples/BlinkNetworkRPi/Makefile +++ b/examples/BlinkNetworkRPi/Makefile @@ -16,7 +16,7 @@ AVRDUDE_CONF=/usr/local/etc/avrdude.conf FORCE_MONITOR_PORT=true MONITOR_PORT=/dev/spidev0.0 -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk # Additional rules to use a remote Raspberry Pi programmer diff --git a/examples/BlinkTeensy/Makefile b/examples/BlinkTeensy/Makefile index 1d59ef2..be58660 100644 --- a/examples/BlinkTeensy/Makefile +++ b/examples/BlinkTeensy/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = teensy31 ARDUINO_LIBS = -include ../../Teensy.mk +include $(ARDMK_DIR)/Teensy.mk diff --git a/examples/BlinkWithoutDelay/Makefile b/examples/BlinkWithoutDelay/Makefile index 3dea6c0..5db75de 100644 --- a/examples/BlinkWithoutDelay/Makefile +++ b/examples/BlinkWithoutDelay/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk diff --git a/examples/Fade/Makefile b/examples/Fade/Makefile index 3dea6c0..5db75de 100644 --- a/examples/Fade/Makefile +++ b/examples/Fade/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk diff --git a/examples/HelloWorld/Makefile b/examples/HelloWorld/Makefile index fb94fdd..2730c53 100644 --- a/examples/HelloWorld/Makefile +++ b/examples/HelloWorld/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = LiquidCrystal -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk diff --git a/examples/SerialPrint/Makefile b/examples/SerialPrint/Makefile index f9d5cf4..5050232 100644 --- a/examples/SerialPrint/Makefile +++ b/examples/SerialPrint/Makefile @@ -2,4 +2,4 @@ BOARD_TAG = uno -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk diff --git a/examples/TinySoftWareSerial/Makefile b/examples/TinySoftWareSerial/Makefile index ffe3afc..7c60f3a 100644 --- a/examples/TinySoftWareSerial/Makefile +++ b/examples/TinySoftWareSerial/Makefile @@ -17,4 +17,4 @@ F_CPU = 16000000L ARDUINO_LIBS = SoftwareSerial -include /usr/share/arduino/Arduino.mk +include $(ARDMK_DIR)/Arduino.mk diff --git a/examples/WebServer/Makefile b/examples/WebServer/Makefile index 51b9ac2..83fbd4e 100644 --- a/examples/WebServer/Makefile +++ b/examples/WebServer/Makefile @@ -3,4 +3,4 @@ BOARD_TAG = uno ARDUINO_LIBS = Ethernet SPI -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk diff --git a/examples/master_reader/Makefile b/examples/master_reader/Makefile index 3030deb..c650a04 100644 --- a/examples/master_reader/Makefile +++ b/examples/master_reader/Makefile @@ -3,4 +3,4 @@ BOARD_TAG = uno ARDUINO_LIBS = Wire -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk diff --git a/examples/toneMelody/Makefile b/examples/toneMelody/Makefile index 3dea6c0..5db75de 100644 --- a/examples/toneMelody/Makefile +++ b/examples/toneMelody/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk From ce088e097de11e48e4ad43e0d7f436ae6717dbbf Mon Sep 17 00:00:00 2001 From: Osamu Aoki Date: Mon, 13 Apr 2020 00:47:06 +0900 Subject: [PATCH 2/2] Use $(ARDMK_DIR) for 1.6 files Signed-off-by: Osamu Aoki --- examples/ATtinyBlink/Makefile | 2 +- examples/Blink3rdPartyLib/Makefile | 2 +- examples/Blink3rdPartyLib/Toggle/Makefile | 2 +- examples/MakefileExample/Makefile-3rd_party-board.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/ATtinyBlink/Makefile b/examples/ATtinyBlink/Makefile index f73d7a0..76327a8 100644 --- a/examples/ATtinyBlink/Makefile +++ b/examples/ATtinyBlink/Makefile @@ -54,6 +54,6 @@ BOARD_TAG = attiny85 # ------------------------------------------------------------------ # # Path to the Arduino Makefile -include /usr/share/arduino/Arduino.mk +include $(ARDMK_DIR)/Arduino.mk # !!! Important. You have to use 'make ispload' when using an ISP. diff --git a/examples/Blink3rdPartyLib/Makefile b/examples/Blink3rdPartyLib/Makefile index f473dbd..4658f50 100644 --- a/examples/Blink3rdPartyLib/Makefile +++ b/examples/Blink3rdPartyLib/Makefile @@ -15,7 +15,7 @@ TOGGLE_ARCHIVE = build-$(BOARD_TAG)/libtoggle.a CXXFLAGS += -IToggle OTHER_OBJS = Toggle/$(TOGGLE_ARCHIVE) -include ../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk Toggle/$(TOGGLE_ARCHIVE): $(MAKE) -C Toggle $(TOGGLE_ARCHIVE) diff --git a/examples/Blink3rdPartyLib/Toggle/Makefile b/examples/Blink3rdPartyLib/Toggle/Makefile index a6234f6..d733171 100644 --- a/examples/Blink3rdPartyLib/Toggle/Makefile +++ b/examples/Blink3rdPartyLib/Toggle/Makefile @@ -8,7 +8,7 @@ # and archived into the build-$(BOARD_TAG)/libtoggle.a target. include ../board.mk -include ../../../Arduino.mk +include $(ARDMK_DIR)/Arduino.mk build-$(BOARD_TAG)/libtoggle.a: $(LOCAL_OBJS) $(AR) rcs $@ $(LOCAL_OBJS) diff --git a/examples/MakefileExample/Makefile-3rd_party-board.mk b/examples/MakefileExample/Makefile-3rd_party-board.mk index 96e972c..35c0ca6 100644 --- a/examples/MakefileExample/Makefile-3rd_party-board.mk +++ b/examples/MakefileExample/Makefile-3rd_party-board.mk @@ -52,5 +52,5 @@ ARDUINO_SKETCHBOOK = $(HOME)/sketchbook ALTERNATE_CORE = sparkfun BOARD_TAG = promicro BOARD_SUB = 8MHzatmega32U4 -include /usr/share/arduino/Arduino.mk +include $(ARDMK_DIR)/Arduino.mk