diff options
author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-02-07 11:20:32 +0000 |
---|---|---|
committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-02-07 11:20:32 +0000 |
commit | b53f19556cab7a52c0b252858936bec0c3408342 (patch) | |
tree | 6323fa8cece9ca7fe6e9d69c0293ab4417b0b870 /demos | |
parent | c0ed452308910d9c9748f1c15a369e0b173dafdb (diff) | |
download | ChibiOS-b53f19556cab7a52c0b252858936bec0c3408342.tar.gz ChibiOS-b53f19556cab7a52c0b252858936bec0c3408342.tar.bz2 ChibiOS-b53f19556cab7a52c0b252858936bec0c3408342.zip |
fixed some paths in makefiles
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7673 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
-rw-r--r-- | demos/STM32/RT-STM32F072-DISCOVERY/Makefile | 3 | ||||
-rw-r--r-- | demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile | 2 | ||||
-rw-r--r-- | demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile | 2 | ||||
-rw-r--r-- | demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile | 2 | ||||
-rw-r--r-- | demos/STM32/RT-STM32F429-DISCOVERY/Makefile | 3 | ||||
-rw-r--r-- | demos/various/RT-Win32-Simulator/Makefile | 2 |
6 files changed, 5 insertions, 9 deletions
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 =
|