Merge pull request #4 from tsagi/master

updated all makefiles to match the correct makedefs

15 files changed, 51 insertions, 51 deletions

diff --git a/boards/ek-tm4c123gxl/bitband/Makefile b/boards/ek-tm4c123gxl/bitband/Makefile
index 77b33d7..c68e073 100644
--- a/boards/ek-tm4c123gxl/bitband/Makefile
+++ b/boards/ek-tm4c123gxl/bitband/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -40,13 +40,13 @@ include ${ROOT}/makedefs
 #

 # Where to find source files that do not live in this directory.

 #

-VPATH=../../../../utils

+VPATH=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

 IPATH=..

-IPATH+=../../../..

+IPATH+=../../..

 

 #

 # The default rule, which causes the bitband example to be built.

diff --git a/boards/ek-tm4c123gxl/blinky/Makefile b/boards/ek-tm4c123gxl/blinky/Makefile
index 3310806..55a81b0 100644
--- a/boards/ek-tm4c123gxl/blinky/Makefile
+++ b/boards/ek-tm4c123gxl/blinky/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -40,7 +40,7 @@ include ${ROOT}/makedefs
 #

 # Where to find header files that do not live in the source directory.

 #

-IPATH=../../../..

+IPATH=../../..

 

 #

 # The default rule, which causes the blinky example to be built.

diff --git a/boards/ek-tm4c123gxl/freertos_demo/Makefile b/boards/ek-tm4c123gxl/freertos_demo/Makefile
index 229f028..d1ea8fa 100644
--- a/boards/ek-tm4c123gxl/freertos_demo/Makefile
+++ b/boards/ek-tm4c123gxl/freertos_demo/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -40,22 +40,22 @@ include ${ROOT}/makedefs
 #

 # Where to find source files that do not live in this directory.

 #

-VPATH=../../../../third_party/FreeRTOS/Source/portable/GCC/ARM_CM4F

-VPATH+=../../../../third_party/FreeRTOS/Source/portable/MemMang/

-VPATH+=../../../../third_party/FreeRTOS/Source

+VPATH=../../../third_party/FreeRTOS/Source/portable/GCC/ARM_CM4F

+VPATH+=../../../third_party/FreeRTOS/Source/portable/MemMang/

+VPATH+=../../../third_party/FreeRTOS/Source

 VPATH+=../drivers

-VPATH+=../../../../utils

+VPATH+=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

 IPATH=.

 IPATH+=..

-IPATH+=../../../..

-IPATH+=../../../../third_party/FreeRTOS/Source/portable/GCC/ARM_CM4F

-IPATH+=../../../../third_party/FreeRTOS

-IPATH+=../../../../third_party/FreeRTOS/Source/include

-IPATH+=../../../../third_party

+IPATH+=../../..

+IPATH+=../../../third_party/FreeRTOS/Source/portable/GCC/ARM_CM4F

+IPATH+=../../../third_party/FreeRTOS

+IPATH+=../../../third_party/FreeRTOS/Source/include

+IPATH+=../../../third_party

 

 #

 # The default rule, which causes the FreeRTOS example to be built.

diff --git a/boards/ek-tm4c123gxl/gpio_jtag/Makefile b/boards/ek-tm4c123gxl/gpio_jtag/Makefile
index 1c0d29e..4375b81 100644
--- a/boards/ek-tm4c123gxl/gpio_jtag/Makefile
+++ b/boards/ek-tm4c123gxl/gpio_jtag/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -41,13 +41,13 @@ include ${ROOT}/makedefs
 # Where to find source files that do not live in this directory.

 #

 VPATH=../drivers

-VPATH+=../../../../utils

+VPATH+=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

 IPATH=..

-IPATH+=../../../..

+IPATH+=../../..

 

 #

 # The default rule, which causes the gpio_jtag example to be built.

diff --git a/boards/ek-tm4c123gxl/hello/Makefile b/boards/ek-tm4c123gxl/hello/Makefile
index 865cd2e..21e95c9 100644
--- a/boards/ek-tm4c123gxl/hello/Makefile
+++ b/boards/ek-tm4c123gxl/hello/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -40,12 +40,12 @@ include ${ROOT}/makedefs
 #

 # Where to find source files that do not live in this directory.

 #

-VPATH=../../../../utils

+VPATH=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

-IPATH=../../../..

+IPATH=../../..

 

 #

 # The default rule, which causes the hello example to be built.

diff --git a/boards/ek-tm4c123gxl/interrupts/Makefile b/boards/ek-tm4c123gxl/interrupts/Makefile
index 23f5ef6..70e916e 100644
--- a/boards/ek-tm4c123gxl/interrupts/Makefile
+++ b/boards/ek-tm4c123gxl/interrupts/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -40,12 +40,12 @@ include ${ROOT}/makedefs
 #

 # Where to find source files that do not live in this directory.

 #

-VPATH=../../../../utils

+VPATH=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

-IPATH=../../../..

+IPATH=../../..

 

 #

 # The default rule, which causes the interrupts example to be built.

diff --git a/boards/ek-tm4c123gxl/mpu_fault/Makefile b/boards/ek-tm4c123gxl/mpu_fault/Makefile
index bf2ea94..483c5e2 100644
--- a/boards/ek-tm4c123gxl/mpu_fault/Makefile
+++ b/boards/ek-tm4c123gxl/mpu_fault/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -40,13 +40,13 @@ include ${ROOT}/makedefs
 #

 # Where to find source files that do not live in this directory.

 #

-VPATH=../../../../utils

+VPATH=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

-IPATH=../../../..

-IPATH+=../../../..

+IPATH=../../..

+IPATH+=../../..

 

 #

 # The default rule, which causes the MPU example to be built.

diff --git a/boards/ek-tm4c123gxl/project0/Makefile b/boards/ek-tm4c123gxl/project0/Makefile
index 2a65343..f1ef725 100644
--- a/boards/ek-tm4c123gxl/project0/Makefile
+++ b/boards/ek-tm4c123gxl/project0/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -41,13 +41,13 @@ include ${ROOT}/makedefs
 # Where to find source files that do not live in this directory.

 #

 VPATH=../drivers

-VPATH+=../../../../utils

+VPATH+=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

 IPATH=..

-IPATH+=../../../..

+IPATH+=../../..

 

 #

 # The default rule, which causes the Project Zero Example to be built.

diff --git a/boards/ek-tm4c123gxl/qs-rgb/Makefile b/boards/ek-tm4c123gxl/qs-rgb/Makefile
index 1b963f7..c59ede2 100644
--- a/boards/ek-tm4c123gxl/qs-rgb/Makefile
+++ b/boards/ek-tm4c123gxl/qs-rgb/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -41,13 +41,13 @@ include ${ROOT}/makedefs
 # Where to find source files that do not live in this directory.

 #

 VPATH=../drivers

-VPATH+=../../../../utils

+VPATH+=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

 IPATH=..

-IPATH+=../../../..

+IPATH+=../../..

 

 #

 # The default rule, which causes the Quickstart RGB to be built.

diff --git a/boards/ek-tm4c123gxl/timers/Makefile b/boards/ek-tm4c123gxl/timers/Makefile
index c076d9f..9a57b1e 100644
--- a/boards/ek-tm4c123gxl/timers/Makefile
+++ b/boards/ek-tm4c123gxl/timers/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -40,12 +40,12 @@ include ${ROOT}/makedefs
 #

 # Where to find source files that do not live in this directory.

 #

-VPATH=../../../../utils

+VPATH=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

-IPATH=../../../..

+IPATH=../../..

 

 #

 # The default rule, which causes the timers example to be built.

diff --git a/boards/ek-tm4c123gxl/uart_echo/Makefile b/boards/ek-tm4c123gxl/uart_echo/Makefile
index 7bcd0d4..b9c52f3 100644
--- a/boards/ek-tm4c123gxl/uart_echo/Makefile
+++ b/boards/ek-tm4c123gxl/uart_echo/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -40,7 +40,7 @@ include ${ROOT}/makedefs
 #

 # Where to find header files that do not live in the source directory.

 #

-IPATH=../../../..

+IPATH=../../..

 

 #

 # The default rule, which causes the uart_echo example to be built.

diff --git a/boards/ek-tm4c123gxl/udma_demo/Makefile b/boards/ek-tm4c123gxl/udma_demo/Makefile
index ba7ea5a..80c95dc 100644
--- a/boards/ek-tm4c123gxl/udma_demo/Makefile
+++ b/boards/ek-tm4c123gxl/udma_demo/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -40,12 +40,12 @@ include ${ROOT}/makedefs
 #

 # Where to find source files that do not live in this directory.

 #

-VPATH=../../../../utils

+VPATH=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

-IPATH=../../../..

+IPATH=../../..

 

 #

 # The default rule, which causes the uDMA example to be built.

diff --git a/boards/ek-tm4c123gxl/usb_dev_bulk/Makefile b/boards/ek-tm4c123gxl/usb_dev_bulk/Makefile
index 93eb252..a5e44ec 100644
--- a/boards/ek-tm4c123gxl/usb_dev_bulk/Makefile
+++ b/boards/ek-tm4c123gxl/usb_dev_bulk/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -41,12 +41,12 @@ include ${ROOT}/makedefs
 # Where to find source files that do not live in this directory.

 #

 VPATH=

-VPATH+=../../../../utils

+VPATH+=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

-IPATH=../../../..

+IPATH=../../..

 

 #

 # The default rule, which causes the USB device bulk example to be built.

diff --git a/boards/ek-tm4c123gxl/usb_dev_gamepad/Makefile b/boards/ek-tm4c123gxl/usb_dev_gamepad/Makefile
index 000763b..bf221f8 100644
--- a/boards/ek-tm4c123gxl/usb_dev_gamepad/Makefile
+++ b/boards/ek-tm4c123gxl/usb_dev_gamepad/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -41,13 +41,13 @@ include ${ROOT}/makedefs
 # Where to find source files that do not live in this directory.

 #

 VPATH=../drivers

-VPATH+=../../../../utils

+VPATH+=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

 IPATH=..

-IPATH+=../../../..

+IPATH+=../../..

 

 #

 # The default rule, which causes the USB device gamepad example to be built.

diff --git a/boards/ek-tm4c123gxl/usb_dev_serial/Makefile b/boards/ek-tm4c123gxl/usb_dev_serial/Makefile
index dc53270..fff4ece 100644
--- a/boards/ek-tm4c123gxl/usb_dev_serial/Makefile
+++ b/boards/ek-tm4c123gxl/usb_dev_serial/Makefile
@@ -30,7 +30,7 @@ PART=TM4C123GH6PM
 #

 # The base directory for TivaWare.

 #

-ROOT=../../../..

+ROOT=../../..

 

 #

 # Include the common make definitions.

@@ -41,13 +41,13 @@ include ${ROOT}/makedefs
 # Where to find source files that do not live in this directory.

 #

 VPATH=../drivers

-VPATH+=../../../../utils

+VPATH+=../../../utils

 

 #

 # Where to find header files that do not live in the source directory.

 #

 IPATH=..

-IPATH+=../../../..

+IPATH+=../../..

 

 #

 # The default rule, which causes the USB device serial example to be built.