Remove arduino-mk folder from all examples

sudar · sudar · commit ce9c54848f4f · 2014-01-14T14:36:24.000+05:30
Fix #154
diff --git a/HISTORY.md b/HISTORY.md
@@ -3,8 +3,11 @@ A Makefile for Arduino Sketches
 
 The following is the rough list of changes that went into different versions.
 I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.
+
 ### 1.2.0 (2014-01-12)
+- Add: Add RPM SPECfile and new `package` directory to store package instructions and files (https://github.com/sej7278)
 - Fix: Remove use of arduino-mk subdirectory in git. Fix issue #151, #152 and #147 (https://github.com/sej7278)
+- Fix: Remove `arduino-mk` directory from all examples. Fix #154
 
 ### 1.2.0 (2014-01-12)
 - Add: Add RPM SPECfile and new `package` directory to store package instructions and files (https://github.com/sej7278)
diff --git a/examples/ATtinyBlink/Makefile b/examples/ATtinyBlink/Makefile
@@ -8,6 +8,6 @@ ALTERNATE_CORE = attiny
 BOARD_TAG    = attiny85-8
 ISP_PORT = /dev/ttyACM*
 
-include $(ARDMK_DIR)/arduino-mk/Arduino.mk
+include $(ARDMK_DIR)/Arduino.mk
 
 # !!! Important. You have to use make ispload to upload when using ISP programmer
diff --git a/examples/AnalogInOutSerial/Makefile b/examples/AnalogInOutSerial/Makefile
@@ -2,4 +2,4 @@ BOARD_TAG    = uno
 MONITOR_PORT = /dev/cu.usb*
 ARDUINO_LIBS = 
 
-include ../../arduino-mk/Arduino.mk
+include ../../Arduino.mk
diff --git a/examples/Blink/Makefile b/examples/Blink/Makefile
@@ -2,5 +2,5 @@ BOARD_TAG    = uno
 MONITOR_PORT = /dev/cu.usb*
 ARDUINO_LIBS = 
 
-include ../../arduino-mk/Arduino.mk
+include ../../Arduino.mk
 
diff --git a/examples/BlinkChipKIT/Makefile b/examples/BlinkChipKIT/Makefile
@@ -2,5 +2,5 @@ BOARD_TAG    = mega_pic32
 MONITOR_PORT = /dev/cu.usb*
 ARDUINO_LIBS =
 
-include ../../arduino-mk/chipKIT.mk
+include ../../chipKIT.mk
 
diff --git a/examples/BlinkInAVRC/Makefile b/examples/BlinkInAVRC/Makefile
@@ -12,6 +12,6 @@ ISP_PROG   = stk500v1
 AVRDUDE_ISP_BAUDRATE = 19200
 ISP_PORT = /dev/ttyACM*
 
-include $(ARDMK_DIR)/arduino-mk/Arduino.mk
+include $(ARDMK_DIR)/Arduino.mk
 
 # !!! Important. You have to use make ispload to upload when using ISP programmer
diff --git a/examples/BlinkWithoutDelay/Makefile b/examples/BlinkWithoutDelay/Makefile
@@ -2,4 +2,4 @@ BOARD_TAG    = uno
 MONITOR_PORT = /dev/cu.usb*
 ARDUINO_LIBS = 
 
-include ../../arduino-mk/Arduino.mk
+include ../../Arduino.mk
diff --git a/examples/Fade/Makefile b/examples/Fade/Makefile
@@ -2,4 +2,4 @@ BOARD_TAG    = uno
 MONITOR_PORT = /dev/cu.usb*
 ARDUINO_LIBS = 
 
-include ../../arduino-mk/Arduino.mk
+include ../../Arduino.mk
diff --git a/examples/HelloWorld/Makefile b/examples/HelloWorld/Makefile
@@ -2,4 +2,4 @@ BOARD_TAG    = uno
 MONITOR_PORT = /dev/cu.usb*
 ARDUINO_LIBS = LiquidCrystal
 
-include ../../arduino-mk/Arduino.mk
+include ../../Arduino.mk
diff --git a/examples/TinySoftWareSerial/Makefile b/examples/TinySoftWareSerial/Makefile
@@ -10,6 +10,6 @@ ISP_PORT = /dev/ttyACM*
 
 ARDUINO_LIBS = SoftwareSerial
 
-include $(ARDMK_DIR)/arduino-mk/Arduino.mk
+include $(ARDMK_DIR)/Arduino.mk
 
 # !!! Important. You have to use make ispload to upload when using ISP programmer
diff --git a/examples/WebServer/Makefile b/examples/WebServer/Makefile
@@ -4,4 +4,4 @@ BOARD_TAG    = uno
 MONITOR_PORT = /dev/cu.usb*
 ARDUINO_LIBS = Ethernet SPI
 
-include ../../arduino-mk/Arduino.mk
+include ../../Arduino.mk
diff --git a/examples/master_reader/Makefile b/examples/master_reader/Makefile
@@ -4,4 +4,4 @@ BOARD_TAG    = uno
 MONITOR_PORT = /dev/cu.usb*
 ARDUINO_LIBS = Wire
 
-include ../../arduino-mk/Arduino.mk
+include ../../Arduino.mk
diff --git a/examples/toneMelody/Makefile b/examples/toneMelody/Makefile
@@ -2,4 +2,4 @@ BOARD_TAG    = uno
 MONITOR_PORT = /dev/cu.usb*
 ARDUINO_LIBS = 
 
-include ../../arduino-mk/Arduino.mk
+include ../../Arduino.mk
