Improved makefiles.

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

11 files changed, 145 insertions, 134 deletions

diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile
index 5a9a7a94a..fa6f56c8c 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@@ -43,20 +43,21 @@ PROJECT = ch
 LDSCRIPT= ch.ld

 

 # Imported source files

-include ../../os/ports/GCC/ARM7/port.mk

-include ../../os/kernel/kernel.mk

-include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk

+include ${CHIBIOS}/os/kernel/kernel.mk

+include ${CHIBIOS}/test/test.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

 CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ../../os/io/pal.c \

-       ../../os/io/serial.c \

-       ../../os/io/platforms/AT91SAM7X/pal_lld.c \

-       ../../os/io/platforms/AT91SAM7X/serial_lld.c \

-       ../../os/io/platforms/AT91SAM7X/at91lib/aic.c \

+       ${CHIBIOS}/os/io/pal.c \

+       ${CHIBIOS}/os/io/serial.c \

+       ${CHIBIOS}/os/io/platforms/AT91SAM7X/pal_lld.c \

+       ${CHIBIOS}/os/io/platforms/AT91SAM7X/serial_lld.c \

+       ${CHIBIOS}/os/io/platforms/AT91SAM7X/at91lib/aic.c \

        board.c main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -85,13 +86,13 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         ../../os/ports/GCC/ARM7/AT91SAM7X/vectors.s

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

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         ../../os/io \

-         ../../os/io/platforms/AT91SAM7X \

-         ../../os/various \

-         ../../os/ports/GCC/ARM7/AT91SAM7X

+         ${CHIBIOS}/os/io \

+         ${CHIBIOS}/os/io/platforms/AT91SAM7X \

+         ${CHIBIOS}/os/various \

+         ${CHIBIOS}/os/ports/GCC/ARM7/AT91SAM7X

 

 #

 # Project, sources and paths

@@ -179,4 +180,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../os/ports/GCC/ARM/rules.mk

+include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile b/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile
index 1484fefb2..9538d20d5 100644
--- a/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile
@@ -43,18 +43,19 @@ PROJECT = ch
 LDSCRIPT= ch.ld

 

 # Imported source files

-include ../../os/ports/GCC/ARM7/port.mk

-include ../../os/kernel/kernel.mk

-include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk

+include ${CHIBIOS}/os/kernel/kernel.mk

+include ${CHIBIOS}/test/test.mk

 

 # List of the required uIP source files.

-USRC = ../../ext/uip-1.0/uip/uip_arp.c \

-       ../../ext/uip-1.0/uip/psock.c \

-       ../../ext/uip-1.0/uip/uip.c \

-       ../../ext/uip-1.0/apps/webserver/httpd.c \

-       ../../ext/uip-1.0/apps/webserver/http-strings.c \

-       ../../ext/uip-1.0/apps/webserver/httpd-fs.c \

-       ../../ext/uip-1.0/apps/webserver/httpd-cgi.c

+USRC = ${CHIBIOS}/ext/uip-1.0/uip/uip_arp.c \

+       ${CHIBIOS}/ext/uip-1.0/uip/psock.c \

+       ${CHIBIOS}/ext/uip-1.0/uip/uip.c \

+       ${CHIBIOS}/ext/uip-1.0/apps/webserver/httpd.c \

+       ${CHIBIOS}/ext/uip-1.0/apps/webserver/http-strings.c \

+       ${CHIBIOS}/ext/uip-1.0/apps/webserver/httpd-fs.c \

+       ${CHIBIOS}/ext/uip-1.0/apps/webserver/httpd-cgi.c

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -62,13 +63,13 @@ CSRC = ${PORTSRC} \
        ${KERNSRC} \

        ${TESTSRC} \

        ${USRC} \

-       ../../os/io/pal.c \

-       ../../os/io/serial.c \

-       ../../os/io/platforms/AT91SAM7X/pal_lld.c \

-       ../../os/io/platforms/AT91SAM7X/serial_lld.c \

-       ../../os/io/platforms/AT91SAM7X/sam7x_emac.c \

-       ../../os/io/platforms/AT91SAM7X/at91lib/aic.c \

-       ../../os/various/evtimer.c \

+       ${CHIBIOS}/os/io/pal.c \

+       ${CHIBIOS}/os/io/serial.c \

+       ${CHIBIOS}/os/io/platforms/AT91SAM7X/pal_lld.c \

+       ${CHIBIOS}/os/io/platforms/AT91SAM7X/serial_lld.c \

+       ${CHIBIOS}/os/io/platforms/AT91SAM7X/sam7x_emac.c \

+       ${CHIBIOS}/os/io/platforms/AT91SAM7X/at91lib/aic.c \

+       ${CHIBIOS}/os/various/evtimer.c \

        web/webthread.c \

        board.c main.c

 

@@ -98,14 +99,14 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         ../../os/ports/GCC/ARM7/AT91SAM7X/vectors.s

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

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         ../../os/io \

-         ../../os/io/platforms/AT91SAM7X \

-         ../../os/various \

-         ../../os/ports/GCC/ARM7/AT91SAM7X \

-         ./web ../../ext/uip-1.0/uip ../../ext/uip-1.0/apps/webserver

+         ${CHIBIOS}/os/io \

+         ${CHIBIOS}/os/io/platforms/AT91SAM7X \

+         ${CHIBIOS}/os/various \

+         ${CHIBIOS}/os/ports/GCC/ARM7/AT91SAM7X \

+         ./web ${CHIBIOS}/ext/uip-1.0/uip ${CHIBIOS}/ext/uip-1.0/apps/webserver

 

 #

 # Project, sources and paths

@@ -193,4 +194,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../os/ports/GCC/ARM/rules.mk

+include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

diff --git a/demos/ARM7-LPC214x-G++/Makefile b/demos/ARM7-LPC214x-G++/Makefile
index 1940c8509..3b0a8bee3 100644
--- a/demos/ARM7-LPC214x-G++/Makefile
+++ b/demos/ARM7-LPC214x-G++/Makefile
@@ -43,26 +43,27 @@ PROJECT = ch
 LDSCRIPT = ch.ld

 

 # Imported source files

-include ../../os/ports/GCC/ARM7/port.mk

-include ../../os/kernel/kernel.mk

-include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk

+include ${CHIBIOS}/os/kernel/kernel.mk

+include ${CHIBIOS}/test/test.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

 CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ../../os/io/pal.c \

-       ../../os/io/serial.c \

-       ../../os/io/platforms/LPC214x/pal_lld.c \

-       ../../os/io/platforms/LPC214x/serial_lld.c \

-       ../../os/io/platforms/LPC214x/vic.c  \

-       ../../os/various/evtimer.c \

+       ${CHIBIOS}/os/io/pal.c \

+       ${CHIBIOS}/os/io/serial.c \

+       ${CHIBIOS}/os/io/platforms/LPC214x/pal_lld.c \

+       ${CHIBIOS}/os/io/platforms/LPC214x/serial_lld.c \

+       ${CHIBIOS}/os/io/platforms/LPC214x/vic.c  \

+       ${CHIBIOS}/os/various/evtimer.c \

        board.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-CPPSRC = ../../os/various/ch.cpp main.cpp

+CPPSRC = ${CHIBIOS}/os/various/ch.cpp main.cpp

 

 # C sources to be compiled in ARM mode regardless of the global setting.

 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

@@ -86,13 +87,13 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         ../../os/ports/GCC/ARM7/LPC214x/vectors.s

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

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         ../../os/io \

-         ../../os/io/platforms/LPC214x \

-         ../../os/various \

-         ../../os/ports/GCC/ARM7/LPC214x

+         ${CHIBIOS}/os/io \

+         ${CHIBIOS}/os/io/platforms/LPC214x \

+         ${CHIBIOS}/os/various \

+         ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x

 

 #

 # Project, sources and paths

@@ -180,4 +181,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../os/ports/GCC/ARM/rules.mk

+include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile b/demos/ARM7-LPC214x-GCC-minimal/Makefile
index 23b74db74..5315948af 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/Makefile
+++ b/demos/ARM7-LPC214x-GCC-minimal/Makefile
@@ -43,18 +43,19 @@ PROJECT = ch
 LDSCRIPT = ch.ld

 

 # Imported source files

-include ../../os/ports/GCC/ARM7/port.mk

-include ../../os/kernel/kernel.mk

-#include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk

+include ${CHIBIOS}/os/kernel/kernel.mk

+#include ${CHIBIOS}/test/test.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

 CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ../../os/io/pal.c \

-       ../../os/io/platforms/LPC214x/pal_lld.c \

-       ../../os/io/platforms/LPC214x/vic.c  \

+       ${CHIBIOS}/os/io/pal.c \

+       ${CHIBIOS}/os/io/platforms/LPC214x/pal_lld.c \

+       ${CHIBIOS}/os/io/platforms/LPC214x/vic.c  \

        board.c main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -83,13 +84,13 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         ../../os/ports/GCC/ARM7/LPC214x/vectors.s

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

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         ../../os/io \

-         ../../os/io/platforms/LPC214x \

-         ../../os/various \

-         ../../os/ports/GCC/ARM7/LPC214x

+         ${CHIBIOS}/os/io \

+         ${CHIBIOS}/os/io/platforms/LPC214x \

+         ${CHIBIOS}/os/various \

+         ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x

 

 #

 # Project, sources and paths

@@ -177,4 +178,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../os/ports/GCC/ARM/rules.mk

+include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

diff --git a/demos/ARM7-LPC214x-GCC/Makefile b/demos/ARM7-LPC214x-GCC/Makefile
index 67b082af3..54b1e0ffd 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/demos/ARM7-LPC214x-GCC/Makefile
@@ -43,22 +43,23 @@ PROJECT = ch
 LDSCRIPT = ch.ld

 

 # Imported source files

-include ../../os/ports/GCC/ARM7/port.mk

-include ../../os/kernel/kernel.mk

-include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk

+include ${CHIBIOS}/os/kernel/kernel.mk

+include ${CHIBIOS}/test/test.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

 CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ../../os/io/pal.c \

-       ../../os/io/serial.c \

-       ../../os/io/platforms/LPC214x/pal_lld.c \

-       ../../os/io/platforms/LPC214x/serial_lld.c \

-       ../../os/io/platforms/LPC214x/vic.c  \

-       ../../os/io/platforms/LPC214x/lpc214x_ssp.c \

-       ../../os/various/evtimer.c \

+       ${CHIBIOS}/os/io/pal.c \

+       ${CHIBIOS}/os/io/serial.c \

+       ${CHIBIOS}/os/io/platforms/LPC214x/pal_lld.c \

+       ${CHIBIOS}/os/io/platforms/LPC214x/serial_lld.c \

+       ${CHIBIOS}/os/io/platforms/LPC214x/vic.c  \

+       ${CHIBIOS}/os/io/platforms/LPC214x/lpc214x_ssp.c \

+       ${CHIBIOS}/os/various/evtimer.c \

        board.c buzzer.c mmcsd.c main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

@@ -87,13 +88,13 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         ../../os/ports/GCC/ARM7/LPC214x/vectors.s

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

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         ../../os/io \

-         ../../os/io/platforms/LPC214x \

-         ../../os/various \

-         ../../os/ports/GCC/ARM7/LPC214x

+         ${CHIBIOS}/os/io \

+         ${CHIBIOS}/os/io/platforms/LPC214x \

+         ${CHIBIOS}/os/various \

+         ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x

 

 #

 # Project, sources and paths

@@ -181,4 +182,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../os/ports/GCC/ARM/rules.mk

+include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

diff --git a/demos/ARMCM3-STM32F103-GCC/Makefile b/demos/ARMCM3-STM32F103-GCC/Makefile
index 99d5b065d..ca12fd05d 100644
--- a/demos/ARMCM3-STM32F103-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-GCC/Makefile
@@ -56,20 +56,21 @@ PROJECT = ch
 LDSCRIPT= ch.ld

 

 # Imported source files

-include ../../os/ports/GCC/ARMCM3/port.mk

-include ../../os/kernel/kernel.mk

-include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/os/ports/GCC/ARMCM3/port.mk

+include ${CHIBIOS}/os/kernel/kernel.mk

+include ${CHIBIOS}/test/test.mk

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

 CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ../../os/io/pal.c \

-       ../../os/io/serial.c \

-       ../../os/io/platforms/STM32/pal_lld.c \

-       ../../os/io/platforms/STM32/serial_lld.c \

-       ../../os/various/evtimer.c \

+       ${CHIBIOS}/os/io/pal.c \

+       ${CHIBIOS}/os/io/serial.c \

+       ${CHIBIOS}/os/io/platforms/STM32/pal_lld.c \

+       ${CHIBIOS}/os/io/platforms/STM32/serial_lld.c \

+       ${CHIBIOS}/os/various/evtimer.c \

        board.c main.c

 
 

@@ -99,12 +100,12 @@ TCPPSRC =
 

 # List ASM source files here

 ASMSRC = $(PORTASM) \

-         ../../os/ports/GCC/ARMCM3/STM32F103/vectors.s

+         ${CHIBIOS}/os/ports/GCC/ARMCM3/STM32F103/vectors.s

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         ../../os/io \

-         ../../os/io/platforms/STM32 \

-         ../../os/various \

+         ${CHIBIOS}/os/io \

+         ${CHIBIOS}/os/io/platforms/STM32 \

+         ${CHIBIOS}/os/various \

          ./stm32lib/inc

 

 #

@@ -199,4 +200,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include ../../os/ports/GCC/ARM/rules.mk

+include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

diff --git a/demos/AVR-AT90CANx-GCC/Makefile b/demos/AVR-AT90CANx-GCC/Makefile
index 30ae2aad0..5754a6371 100644
--- a/demos/AVR-AT90CANx-GCC/Makefile
+++ b/demos/AVR-AT90CANx-GCC/Makefile
@@ -80,18 +80,19 @@ OBJDIR = .
 

 

 # Imported source files

-include ../../os/ports/GCC/AVR/port.mk

-include ../../os/kernel/kernel.mk

-include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/os/ports/GCC/AVR/port.mk

+include ${CHIBIOS}/os/kernel/kernel.mk

+include ${CHIBIOS}/test/test.mk

 

 

 # List C source files here. (C dependencies are automatically generated.)

 SRC = ${PORTSRC} \

       ${KERNSRC} \

       ${TESTSRC} \

-      ../../os/io/serial.c \

-      ../../os/io/platforms/AVR/serial_lld.c \

-      ../../os/various/evtimer.c \

+      ${CHIBIOS}/os/io/serial.c \

+      ${CHIBIOS}/os/io/platforms/AVR/serial_lld.c \

+      ${CHIBIOS}/os/various/evtimer.c \

       board.c main.c

 

 

@@ -127,9 +128,9 @@ DEBUG = dwarf-2
 #     Use forward slashes for directory separators.

 #     For a directory that has spaces, enclose it in quotes.

 EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \

-               ../../os/io \

-               ../../os/io/platforms/AVR \

-               ../../os/various

+               ${CHIBIOS}/os/io \

+               ${CHIBIOS}/os/io/platforms/AVR \

+               ${CHIBIOS}/os/various

 

 

 # Compiler flag to set the C Standard level.

diff --git a/demos/AVR-ATmega128-GCC/Makefile b/demos/AVR-ATmega128-GCC/Makefile
index c56520b08..dcc7f7beb 100644
--- a/demos/AVR-ATmega128-GCC/Makefile
+++ b/demos/AVR-ATmega128-GCC/Makefile
@@ -80,18 +80,19 @@ OBJDIR = .
 

 

 # Imported source files

-include ../../os/ports/GCC/AVR/port.mk

-include ../../os/kernel/kernel.mk

-include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/os/ports/GCC/AVR/port.mk

+include ${CHIBIOS}/os/kernel/kernel.mk

+include ${CHIBIOS}/test/test.mk

 

 

 # List C source files here. (C dependencies are automatically generated.)

 SRC = ${PORTSRC} \

       ${KERNSRC} \

       ${TESTSRC} \

-      ../../os/io/serial.c \

-      ../../os/io/platforms/AVR/serial_lld.c \

-      ../../os/various/evtimer.c \

+      ${CHIBIOS}/os/io/serial.c \

+      ${CHIBIOS}/os/io/platforms/AVR/serial_lld.c \

+      ${CHIBIOS}/os/various/evtimer.c \

       lcd.c board.c main.c

 

 

@@ -127,9 +128,9 @@ DEBUG = dwarf-2
 #     Use forward slashes for directory separators.

 #     For a directory that has spaces, enclose it in quotes.

 EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \

-               ../../os/io \

-               ../../os/io/platforms/AVR \

-               ../../os/various

+               ${CHIBIOS}/os/io \

+               ${CHIBIOS}/os/io/platforms/AVR \

+               ${CHIBIOS}/os/various

 

 

 # Compiler flag to set the C Standard level.

diff --git a/demos/GNU-Linux-GCC/Makefile b/demos/GNU-Linux-GCC/Makefile
index 5483d4448..51a8b25db 100644
--- a/demos/GNU-Linux-GCC/Makefile
+++ b/demos/GNU-Linux-GCC/Makefile
@@ -56,8 +56,9 @@ UDEFS =
 UADEFS =

 

 # Imported source files

-include ../../src/kernel.mk

-include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/src/kernel.mk

+include ${CHIBIOS}/test/test.mk

 

 # List C source files here

 SRC  = chcore.c main.c \

@@ -68,7 +69,7 @@ SRC  = chcore.c main.c \
 ASRC =

 

 # List all user directories here

-UINCDIR = ../../src/include

+UINCDIR = ${CHIBIOS}/src/include

 

 # List the user directory to look for the libraries here

 ULIBDIR =

diff --git a/demos/MSP430-MSP430x1611-GCC/Makefile b/demos/MSP430-MSP430x1611-GCC/Makefile
index 98265abf8..dc3747875 100644
--- a/demos/MSP430-MSP430x1611-GCC/Makefile
+++ b/demos/MSP430-MSP430x1611-GCC/Makefile
@@ -39,19 +39,20 @@ PROJECT = ch
 LDSCRIPT = mspgcc/msp430x1611.x

 

 # Imported source files

-include ../../os/ports/GCC/MSP430/port.mk

-include ../../os/kernel/kernel.mk

-include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/os/ports/GCC/MSP430/port.mk

+include ${CHIBIOS}/os/kernel/kernel.mk

+include ${CHIBIOS}/test/test.mk

 

 # C sources here.

 CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

-       ../../os/io/pal.c \

-       ../../os/io/serial.c \

-       ../../os/io/platforms/MSP430/pal_lld.c \

-       ../../os/io/platforms/MSP430/serial_lld.c \

-       ../../os/various/evtimer.c \

+       ${CHIBIOS}/os/io/pal.c \

+       ${CHIBIOS}/os/io/serial.c \

+       ${CHIBIOS}/os/io/platforms/MSP430/pal_lld.c \

+       ${CHIBIOS}/os/io/platforms/MSP430/serial_lld.c \

+       ${CHIBIOS}/os/various/evtimer.c \

        board.c main.c

 

 # C++ sources here.

@@ -61,9 +62,9 @@ CPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         ../../os/io \

-         ../../os/io/platforms/MSP430 \

-         ../../os/various

+         ${CHIBIOS}/os/io \

+         ${CHIBIOS}/os/io/platforms/MSP430 \

+         ${CHIBIOS}/os/various

 

 #

 # Project, sources and paths

@@ -145,4 +146,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../os/ports/GCC/MSP430/rules.mk

+include ${CHIBIOS}/os/ports/GCC/MSP430/rules.mk

diff --git a/demos/Win32-MinGW/Makefile b/demos/Win32-MinGW/Makefile
index 50b2a0af2..f700ce159 100644
--- a/demos/Win32-MinGW/Makefile
+++ b/demos/Win32-MinGW/Makefile
@@ -56,15 +56,16 @@ UDEFS =
 UADEFS =

 

 # Imported source files

-include ../../os/kernel/kernel.mk

-include ../../test/test.mk

+CHIBIOS = ../..

+include ${CHIBIOS}/os/kernel/kernel.mk

+include ${CHIBIOS}/test/test.mk

 

 # List C source files here

 SRC  = ${KERNSRC} \

        ${TESTSRC} \

        chcore.c \

-       ../../os/io/serial.c \

-       ../../os/io/platforms/Win32/serial_lld.c \

+       ${CHIBIOS}/os/io/serial.c \

+       ${CHIBIOS}/os/io/platforms/Win32/serial_lld.c \

        main.c

 

 # List ASM source files here

@@ -72,8 +73,8 @@ ASRC =
 

 # List all user directories here

 UINCDIR = $(KERNINC) $(TESTINC) \

-          ../../os/io \

-          ../../os/io/platforms/Win32

+          ${CHIBIOS}/os/io \

+          ${CHIBIOS}/os/io/platforms/Win32

 

 # List the user directory to look for the libraries here

 ULIBDIR =