Improved makefiles.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1166 35acf78f-673a-0410-8e92-d51de3d6d3f4

5 files changed, 33 insertions, 26 deletions

diff --git a/os/kernel/kernel.mk b/os/kernel/kernel.mk
index 85d6a00e8..adbe0af9c 100644
--- a/os/kernel/kernel.mk
+++ b/os/kernel/kernel.mk
@@ -1,13 +1,20 @@
 # List of all the ChibiOS/RT kernel files, there is no need to remove the files

 # from this list, you can disable parts of the kernel by editing chconf.h.

-KERNSRC = ../../os/kernel/src/chsys.c       ../../os/kernel/src/chdebug.c \

-          ../../os/kernel/src/chlists.c     ../../os/kernel/src/chvt.c \

-          ../../os/kernel/src/chschd.c      ../../os/kernel/src/chthreads.c \

-          ../../os/kernel/src/chsem.c       ../../os/kernel/src/chmtx.c \

-          ../../os/kernel/src/chcond.c      ../../os/kernel/src/chevents.c \

-          ../../os/kernel/src/chmsg.c       ../../os/kernel/src/chmboxes.c \

-          ../../os/kernel/src/chqueues.c    ../../os/kernel/src/chheap.c \

-          ../../os/kernel/src/chmempools.c

+KERNSRC = ${CHIBIOS}/os/kernel/src/chsys.c \

+          ${CHIBIOS}/os/kernel/src/chdebug.c \

+          ${CHIBIOS}/os/kernel/src/chlists.c \

+          ${CHIBIOS}/os/kernel/src/chvt.c \

+          ${CHIBIOS}/os/kernel/src/chschd.c \

+          ${CHIBIOS}/os/kernel/src/chthreads.c \

+          ${CHIBIOS}/os/kernel/src/chsem.c \

+          ${CHIBIOS}/os/kernel/src/chmtx.c \

+          ${CHIBIOS}/os/kernel/src/chcond.c \

+          ${CHIBIOS}/os/kernel/src/chevents.c \

+          ${CHIBIOS}/os/kernel/src/chmsg.c \

+          ${CHIBIOS}/os/kernel/src/chmboxes.c \

+          ${CHIBIOS}/os/kernel/src/chqueues.c \

+          ${CHIBIOS}/os/kernel/src/chheap.c \

+          ${CHIBIOS}/os/kernel/src/chmempools.c

 

 # Required include directories

-KERNINC = ../../os/kernel/include

+KERNINC = ${CHIBIOS}/os/kernel/include

diff --git a/os/ports/GCC/ARM7/port.mk b/os/ports/GCC/ARM7/port.mk
index d81135981..7ed810a9a 100644
--- a/os/ports/GCC/ARM7/port.mk
+++ b/os/ports/GCC/ARM7/port.mk
@@ -1,7 +1,7 @@
-# List of the ChibiOS/RT Cortex-M3 port files.

-PORTSRC = ../../os/ports/GCC/ARM7/chcore.c

+# List of the ChibiOS/RT ARM7 port files.

+PORTSRC = ${CHIBIOS}/os/ports/GCC/ARM7/chcore.c

 

-PORTASM = ../../os/ports/GCC/ARM7/crt0.s \

-          ../../os/ports/GCC/ARM7/chcoreasm.s

+PORTASM = ${CHIBIOS}/os/ports/GCC/ARM7/crt0.s \

+          ${CHIBIOS}/os/ports/GCC/ARM7/chcoreasm.s

 

-PORTINC = ../../os/ports/GCC/ARM7

+PORTINC = ${CHIBIOS}/os/ports/GCC/ARM7

diff --git a/os/ports/GCC/ARMCM3/port.mk b/os/ports/GCC/ARMCM3/port.mk
index 8afb815ef..ccb5ea62e 100644
--- a/os/ports/GCC/ARMCM3/port.mk
+++ b/os/ports/GCC/ARMCM3/port.mk
@@ -1,9 +1,9 @@
 # List of the ChibiOS/RT Cortex-M3 port files.

-PORTSRC = ../../os/ports/GCC/ARMCM3/chcore.c \

-          ../../os/ports/GCC/ARMCM3/nvic.c \

-          ../../os/ports/GCC/ARMCM3/cmsis/core_cm3.c

+PORTSRC = ${CHIBIOS}/os/ports/GCC/ARMCM3/chcore.c \

+          ${CHIBIOS}/os/ports/GCC/ARMCM3/nvic.c \

+          ${CHIBIOS}/os/ports/GCC/ARMCM3/cmsis/core_cm3.c

 

-PORTASM = ../../os/ports/GCC/ARMCM3/crt0.s

+PORTASM = ${CHIBIOS}/os/ports/GCC/ARMCM3/crt0.s

 

-PORTINC = ../../os/ports/GCC/ARMCM3 \

-          ../../os/ports/GCC/ARMCM3/cmsis

+PORTINC = ${CHIBIOS}/os/ports/GCC/ARMCM3 \

+          ${CHIBIOS}/os/ports/GCC/ARMCM3/cmsis

diff --git a/os/ports/GCC/AVR/port.mk b/os/ports/GCC/AVR/port.mk
index 63f6fa1a5..7cafb56b2 100644
--- a/os/ports/GCC/AVR/port.mk
+++ b/os/ports/GCC/AVR/port.mk
@@ -1,6 +1,6 @@
-# List of the ChibiOS/RT Cortex-M3 port files.

-PORTSRC = ../../os/ports/GCC/AVR/chcore.c

+# List of the ChibiOS/RT AVR port files.

+PORTSRC = ${CHIBIOS}/os/ports/GCC/AVR/chcore.c

 

 PORTASM = 

 

-PORTINC = ../../os/ports/GCC/AVR

+PORTINC = ${CHIBIOS}/os/ports/GCC/AVR

diff --git a/os/ports/GCC/MSP430/port.mk b/os/ports/GCC/MSP430/port.mk
index 14fe0d646..60b3f8add 100644
--- a/os/ports/GCC/MSP430/port.mk
+++ b/os/ports/GCC/MSP430/port.mk
@@ -1,6 +1,6 @@
-# List of the ChibiOS/RT Cortex-M3 port files.

-PORTSRC = ../../os/ports/GCC/MSP430/chcore.c

+# List of the ChibiOS/RT MSP430 port files.

+PORTSRC = ${CHIBIOS}/os/ports/GCC/MSP430/chcore.c

 

 PORTASM = 

 

-PORTINC = ../../os/ports/GCC/MSP430

+PORTINC = ${CHIBIOS}/os/ports/GCC/MSP430