From bf319c49b7f7ff17e073422a3ba06a701e12f590 Mon Sep 17 00:00:00 2001 From: John Whittington Date: Thu, 6 Aug 2020 19:21:23 +0200 Subject: platform neutral examples and manual cherry-pick merge of https://github.com/alissa-huskey/Arduino-Makefile/tree/test_fixes --- examples/ATtinyBlink/Makefile | 2 +- examples/AnalogInOutSerial/Makefile | 2 +- examples/Blink/Makefile | 2 +- examples/Blink3rdPartyLib/Makefile | 2 +- examples/Blink3rdPartyLib/Toggle/Makefile | 2 +- examples/BlinkChipKIT/Makefile | 2 +- examples/BlinkInAVRC/Makefile | 2 +- examples/BlinkNetworkRPi/Makefile | 2 +- examples/BlinkOpenCM/Makefile | 2 +- examples/BlinkOpenCR/Makefile | 2 +- examples/BlinkTeensy/Makefile | 2 +- examples/BlinkWithoutDelay/Makefile | 2 +- examples/DueBlink/Makefile | 2 +- examples/Fade/Makefile | 2 +- examples/HelloWorld/Makefile | 2 +- examples/MZeroBlink/Makefile | 2 +- examples/SerialPrint/Makefile | 2 +- examples/TinySoftWareSerial/Makefile | 2 +- examples/WebServer/Makefile | 2 +- examples/ZeroBlink/Makefile | 2 +- examples/master_reader/Makefile | 2 +- examples/toneMelody/Makefile | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) (limited to 'examples') 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/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/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/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/BlinkOpenCM/Makefile b/examples/BlinkOpenCM/Makefile index 0f7b285..75f52fb 100644 --- a/examples/BlinkOpenCM/Makefile +++ b/examples/BlinkOpenCM/Makefile @@ -4,4 +4,4 @@ ARDUINO_LIBS = #MONITOR_PORT = /dev/ttyACM0 #OPENCMIDE_DIR = /where/you/installed/robotis_opencm -include ../../OpenCM.mk +include $(ARDMK_DIR)/OpenCM.mk diff --git a/examples/BlinkOpenCR/Makefile b/examples/BlinkOpenCR/Makefile index d4422f4..18bfa8d 100644 --- a/examples/BlinkOpenCR/Makefile +++ b/examples/BlinkOpenCR/Makefile @@ -5,4 +5,4 @@ ARDUINO_LIBS = #MONITOR_PORT = /dev/ttyACM0 -include ../../OpenCR.mk +include $(ARDMK_DIR)/OpenCR.mk 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/DueBlink/Makefile b/examples/DueBlink/Makefile index 8a7ad6e..a11248c 100644 --- a/examples/DueBlink/Makefile +++ b/examples/DueBlink/Makefile @@ -16,4 +16,4 @@ ARCHITECTURE = sam # Windows #ARDUINO_PACKAGE_DIR := "C:/Users/$(USER)/AppData/Local/Arduino15/packages" -include ../../Sam.mk +include $(ARDMK_DIR)/Sam.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/MZeroBlink/Makefile b/examples/MZeroBlink/Makefile index 29cb90b..4771b9c 100644 --- a/examples/MZeroBlink/Makefile +++ b/examples/MZeroBlink/Makefile @@ -21,4 +21,4 @@ BOARD_TAG = mzero_pro_bl_dbg # Windows # ARDUINO_PACKAGE_DIR := "C:/Users/$(USER)/AppData/Local/Arduino15/packages" -include ../../Sam.mk +include $(ARDMK_DIR)/Sam.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/ZeroBlink/Makefile b/examples/ZeroBlink/Makefile index 60c8435..d0c30fb 100644 --- a/examples/ZeroBlink/Makefile +++ b/examples/ZeroBlink/Makefile @@ -27,4 +27,4 @@ BOARD_TAG = arduino_zero_native # Windows #ARDUINO_PACKAGE_DIR := "C:/Users/$(USER)/AppData/Local/Arduino15/packages" -include ../../Sam.mk +include $(ARDMK_DIR)/Sam.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 -- cgit v1.2.3