From b53f19556cab7a52c0b252858936bec0c3408342 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 7 Feb 2015 11:20:32 +0000 Subject: fixed some paths in makefiles git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7673 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/RT-STM32F072-DISCOVERY/Makefile | 3 --- demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile | 2 +- demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile | 2 +- demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile | 2 +- demos/STM32/RT-STM32F429-DISCOVERY/Makefile | 3 +-- demos/various/RT-Win32-Simulator/Makefile | 2 +- 6 files changed, 5 insertions(+), 9 deletions(-) (limited to 'demos') diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile index b720144f4..48a66b249 100644 --- a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile @@ -96,9 +96,6 @@ CSRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(CHIBIOS)/os/various/shell.c \ - $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ - $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile index 4f20569a9..d6839bd05 100644 --- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile @@ -135,7 +135,7 @@ ASMSRC = $(PORTASM) INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \ - $(CHIBIOS)/os/various + $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various # # Project, sources and paths diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile index 8e87a7212..8653fa10e 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile +++ b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile @@ -137,7 +137,7 @@ ASMSRC = $(PORTASM) INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \ $(CHIBIOS)/os/various/devices_lib/accel \ - $(CHIBIOS)/os/various + $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various # # Project, sources and paths diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile index d8f029d0e..b5baf594a 100644 --- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile +++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile @@ -141,7 +141,7 @@ ASMSRC = $(PORTASM) INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \ $(LWINC) $(FATFSINC) \ - $(CHIBIOS)/os/various + $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various # # Project, sources and paths diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile index b9f550e11..f7f573db6 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile @@ -135,8 +135,7 @@ ASMSRC = $(PORTASM) INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \ - $(CHIBIOS)/os/various/devices_lib/accel \ - $(CHIBIOS)/os/various + $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various # # Project, sources and paths diff --git a/demos/various/RT-Win32-Simulator/Makefile b/demos/various/RT-Win32-Simulator/Makefile index 5723fb09f..8c6e0105b 100644 --- a/demos/various/RT-Win32-Simulator/Makefile +++ b/demos/various/RT-Win32-Simulator/Makefile @@ -84,7 +84,7 @@ ASRC = # List all user directories here UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \ - $(CHIBIOS)/os/various + $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various # List the user directory to look for the libraries here ULIBDIR = -- cgit v1.2.3