From 2329d19b97a3a3a115b6a414a6235f5d398bae2b Mon Sep 17 00:00:00 2001 From: John Whittington Date: Mon, 10 Aug 2020 16:37:32 +0200 Subject: [PATCH] remove #630 --- 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(-) diff --git a/examples/ATtinyBlink/Makefile b/examples/ATtinyBlink/Makefile index 76327a8..f73d7a0 100644 --- a/examples/ATtinyBlink/Makefile +++ b/examples/ATtinyBlink/Makefile @@ -54,6 +54,6 @@ BOARD_TAG = attiny85 # ------------------------------------------------------------------ # # Path to the Arduino Makefile -include $(ARDMK_DIR)/Arduino.mk +include /usr/share/arduino/Arduino.mk # !!! Important. You have to use 'make ispload' when using an ISP. diff --git a/examples/AnalogInOutSerial/Makefile b/examples/AnalogInOutSerial/Makefile index 5db75de..3dea6c0 100644 --- a/examples/AnalogInOutSerial/Makefile +++ b/examples/AnalogInOutSerial/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk diff --git a/examples/Blink/Makefile b/examples/Blink/Makefile index 51a66bc..7cb3881 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 $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk diff --git a/examples/Blink3rdPartyLib/Makefile b/examples/Blink3rdPartyLib/Makefile index 4658f50..f473dbd 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 $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk Toggle/$(TOGGLE_ARCHIVE): $(MAKE) -C Toggle $(TOGGLE_ARCHIVE) diff --git a/examples/Blink3rdPartyLib/Toggle/Makefile b/examples/Blink3rdPartyLib/Toggle/Makefile index d733171..a6234f6 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 $(ARDMK_DIR)/Arduino.mk +include ../../../Arduino.mk build-$(BOARD_TAG)/libtoggle.a: $(LOCAL_OBJS) $(AR) rcs $@ $(LOCAL_OBJS) diff --git a/examples/BlinkChipKIT/Makefile b/examples/BlinkChipKIT/Makefile index 440db29..87a9f7d 100644 --- a/examples/BlinkChipKIT/Makefile +++ b/examples/BlinkChipKIT/Makefile @@ -1,5 +1,5 @@ BOARD_TAG = mega_pic32 ARDUINO_LIBS = -include $(ARDMK_DIR)/chipKIT.mk +include ../../chipKIT.mk diff --git a/examples/BlinkInAVRC/Makefile b/examples/BlinkInAVRC/Makefile index 04049bb..a4cd2e4 100644 --- a/examples/BlinkInAVRC/Makefile +++ b/examples/BlinkInAVRC/Makefile @@ -11,6 +11,6 @@ F_CPU = 8000000L ISP_PROG = stk500v1 AVRDUDE_ISP_BAUDRATE = 19200 -include $(ARDMK_DIR)/Arduino.mk +include ../../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 c119b53..15e565e 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 $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk # Additional rules to use a remote Raspberry Pi programmer diff --git a/examples/BlinkOpenCM/Makefile b/examples/BlinkOpenCM/Makefile index 75f52fb..0f7b285 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 $(ARDMK_DIR)/OpenCM.mk +include ../../OpenCM.mk diff --git a/examples/BlinkOpenCR/Makefile b/examples/BlinkOpenCR/Makefile index 18bfa8d..d4422f4 100644 --- a/examples/BlinkOpenCR/Makefile +++ b/examples/BlinkOpenCR/Makefile @@ -5,4 +5,4 @@ ARDUINO_LIBS = #MONITOR_PORT = /dev/ttyACM0 -include $(ARDMK_DIR)/OpenCR.mk +include ../../OpenCR.mk diff --git a/examples/BlinkTeensy/Makefile b/examples/BlinkTeensy/Makefile index be58660..1d59ef2 100644 --- a/examples/BlinkTeensy/Makefile +++ b/examples/BlinkTeensy/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = teensy31 ARDUINO_LIBS = -include $(ARDMK_DIR)/Teensy.mk +include ../../Teensy.mk diff --git a/examples/BlinkWithoutDelay/Makefile b/examples/BlinkWithoutDelay/Makefile index 5db75de..3dea6c0 100644 --- a/examples/BlinkWithoutDelay/Makefile +++ b/examples/BlinkWithoutDelay/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk diff --git a/examples/DueBlink/Makefile b/examples/DueBlink/Makefile index a11248c..8a7ad6e 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 $(ARDMK_DIR)/Sam.mk +include ../../Sam.mk diff --git a/examples/Fade/Makefile b/examples/Fade/Makefile index 5db75de..3dea6c0 100644 --- a/examples/Fade/Makefile +++ b/examples/Fade/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk diff --git a/examples/HelloWorld/Makefile b/examples/HelloWorld/Makefile index 2730c53..fb94fdd 100644 --- a/examples/HelloWorld/Makefile +++ b/examples/HelloWorld/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = LiquidCrystal -include $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk diff --git a/examples/MZeroBlink/Makefile b/examples/MZeroBlink/Makefile index 4771b9c..29cb90b 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 $(ARDMK_DIR)/Sam.mk +include ../../Sam.mk diff --git a/examples/SerialPrint/Makefile b/examples/SerialPrint/Makefile index 5050232..f9d5cf4 100644 --- a/examples/SerialPrint/Makefile +++ b/examples/SerialPrint/Makefile @@ -2,4 +2,4 @@ BOARD_TAG = uno -include $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk diff --git a/examples/TinySoftWareSerial/Makefile b/examples/TinySoftWareSerial/Makefile index 7c60f3a..ffe3afc 100644 --- a/examples/TinySoftWareSerial/Makefile +++ b/examples/TinySoftWareSerial/Makefile @@ -17,4 +17,4 @@ F_CPU = 16000000L ARDUINO_LIBS = SoftwareSerial -include $(ARDMK_DIR)/Arduino.mk +include /usr/share/arduino/Arduino.mk diff --git a/examples/WebServer/Makefile b/examples/WebServer/Makefile index 83fbd4e..51b9ac2 100644 --- a/examples/WebServer/Makefile +++ b/examples/WebServer/Makefile @@ -3,4 +3,4 @@ BOARD_TAG = uno ARDUINO_LIBS = Ethernet SPI -include $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk diff --git a/examples/ZeroBlink/Makefile b/examples/ZeroBlink/Makefile index d0c30fb..60c8435 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 $(ARDMK_DIR)/Sam.mk +include ../../Sam.mk diff --git a/examples/master_reader/Makefile b/examples/master_reader/Makefile index c650a04..3030deb 100644 --- a/examples/master_reader/Makefile +++ b/examples/master_reader/Makefile @@ -3,4 +3,4 @@ BOARD_TAG = uno ARDUINO_LIBS = Wire -include $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk diff --git a/examples/toneMelody/Makefile b/examples/toneMelody/Makefile index 5db75de..3dea6c0 100644 --- a/examples/toneMelody/Makefile +++ b/examples/toneMelody/Makefile @@ -1,4 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include $(ARDMK_DIR)/Arduino.mk +include ../../Arduino.mk