From b300b61ee0ba70abb293a3724993492625716f4f Mon Sep 17 00:00:00 2001 From: Theodore Ateba Date: Thu, 15 Mar 2018 08:03:58 +0000 Subject: =?UTF-8?q?Update=20testhal=20makefile=20to=20avoid=20comp=C3=AEla?= =?UTF-8?q?tion=20errors=20with=20chlib.h=20and=20chlicense=20files.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11760 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- demos/AVR/RT-ARDUINO-MEGA/Makefile | 2 ++ testhal/AVR/MEGA/ADC/Makefile | 22 ++++++++++------------ testhal/AVR/MEGA/EXT/Makefile | 22 ++++++++++------------ testhal/AVR/MEGA/GPT/Makefile | 22 ++++++++++------------ testhal/AVR/MEGA/I2C/Makefile | 22 ++++++++++------------ testhal/AVR/MEGA/ICU/Makefile | 22 ++++++++++------------ testhal/AVR/MEGA/PWM/Makefile | 22 ++++++++++------------ testhal/AVR/MEGA/SPI/Makefile | 22 ++++++++++------------ testhal/AVR/XMEGA/SERIAL/Makefile | 22 ++++++++++------------ testhal/AVR/XMEGA/TEST-SUITE-OSLIB/Makefile | 25 +++++++++++-------------- testhal/AVR/XMEGA/USART/Makefile | 20 +++++++++----------- testhal/AVR/XMEGA/WDT/Makefile | 22 ++++++++++------------ 12 files changed, 112 insertions(+), 133 deletions(-) diff --git a/demos/AVR/RT-ARDUINO-MEGA/Makefile b/demos/AVR/RT-ARDUINO-MEGA/Makefile index 0447265c5..cce661591 100644 --- a/demos/AVR/RT-ARDUINO-MEGA/Makefile +++ b/demos/AVR/RT-ARDUINO-MEGA/Makefile @@ -84,6 +84,8 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../.. + +# Licensing files. include $(CHIBIOS)/os/license/license.mk # HAL-OSAL files (optional). diff --git a/testhal/AVR/MEGA/ADC/Makefile b/testhal/AVR/MEGA/ADC/Makefile index 51bf14236..075764b0e 100644 --- a/testhal/AVR/MEGA/ADC/Makefile +++ b/testhal/AVR/MEGA/ADC/Makefile @@ -84,34 +84,32 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/os/hal/lib/streams/streams.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(STREAMSSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) $(STREAMSINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/testhal/AVR/MEGA/EXT/Makefile b/testhal/AVR/MEGA/EXT/Makefile index 51bf14236..075764b0e 100644 --- a/testhal/AVR/MEGA/EXT/Makefile +++ b/testhal/AVR/MEGA/EXT/Makefile @@ -84,34 +84,32 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/os/hal/lib/streams/streams.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(STREAMSSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) $(STREAMSINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/testhal/AVR/MEGA/GPT/Makefile b/testhal/AVR/MEGA/GPT/Makefile index 51bf14236..075764b0e 100644 --- a/testhal/AVR/MEGA/GPT/Makefile +++ b/testhal/AVR/MEGA/GPT/Makefile @@ -84,34 +84,32 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/os/hal/lib/streams/streams.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(STREAMSSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) $(STREAMSINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/testhal/AVR/MEGA/I2C/Makefile b/testhal/AVR/MEGA/I2C/Makefile index 51bf14236..075764b0e 100644 --- a/testhal/AVR/MEGA/I2C/Makefile +++ b/testhal/AVR/MEGA/I2C/Makefile @@ -84,34 +84,32 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/os/hal/lib/streams/streams.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(STREAMSSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) $(STREAMSINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/testhal/AVR/MEGA/ICU/Makefile b/testhal/AVR/MEGA/ICU/Makefile index 51bf14236..075764b0e 100644 --- a/testhal/AVR/MEGA/ICU/Makefile +++ b/testhal/AVR/MEGA/ICU/Makefile @@ -84,34 +84,32 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/os/hal/lib/streams/streams.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(STREAMSSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) $(STREAMSINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/testhal/AVR/MEGA/PWM/Makefile b/testhal/AVR/MEGA/PWM/Makefile index 51bf14236..075764b0e 100644 --- a/testhal/AVR/MEGA/PWM/Makefile +++ b/testhal/AVR/MEGA/PWM/Makefile @@ -84,34 +84,32 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/os/hal/lib/streams/streams.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(STREAMSSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) $(STREAMSINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/testhal/AVR/MEGA/SPI/Makefile b/testhal/AVR/MEGA/SPI/Makefile index 51bf14236..075764b0e 100644 --- a/testhal/AVR/MEGA/SPI/Makefile +++ b/testhal/AVR/MEGA/SPI/Makefile @@ -84,34 +84,32 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/ARDUINO_MEGA/board.mk include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ATMEGAxx/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/os/hal/lib/streams/streams.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(STREAMSSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) $(STREAMSINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/testhal/AVR/XMEGA/SERIAL/Makefile b/testhal/AVR/XMEGA/SERIAL/Makefile index 69d132212..9c6a5614e 100644 --- a/testhal/AVR/XMEGA/SERIAL/Makefile +++ b/testhal/AVR/XMEGA/SERIAL/Makefile @@ -85,34 +85,32 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/MT-DB-X4/board.mk include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/os/hal/lib/streams/streams.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(STREAMSSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(STREAMSINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/testhal/AVR/XMEGA/TEST-SUITE-OSLIB/Makefile b/testhal/AVR/XMEGA/TEST-SUITE-OSLIB/Makefile index 385c2e2b0..a0172e108 100644 --- a/testhal/AVR/XMEGA/TEST-SUITE-OSLIB/Makefile +++ b/testhal/AVR/XMEGA/TEST-SUITE-OSLIB/Makefile @@ -85,37 +85,34 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/MT-DB-X4/board.mk include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/oslib/oslib_test.mk -#include $(CHIBIOS)/os/hal/lib/streams/streams.mk - # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ + $(TESTSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) $(TESTINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) $(TESTINC) # # Project, sources and paths. diff --git a/testhal/AVR/XMEGA/USART/Makefile b/testhal/AVR/XMEGA/USART/Makefile index b53fbc8e5..00a5b960c 100644 --- a/testhal/AVR/XMEGA/USART/Makefile +++ b/testhal/AVR/XMEGA/USART/Makefile @@ -84,31 +84,29 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/MT-DB-X4/board.mk include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. diff --git a/testhal/AVR/XMEGA/WDT/Makefile b/testhal/AVR/XMEGA/WDT/Makefile index c32d1764c..fd3fcbff2 100644 --- a/testhal/AVR/XMEGA/WDT/Makefile +++ b/testhal/AVR/XMEGA/WDT/Makefile @@ -84,34 +84,32 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../.. + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk + # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/boards/MT-DB-X4/board.mk include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk + # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/AVR/compilers/GCC/mk/port.mk + # Other files (optional). include $(CHIBIOS)/os/hal/lib/streams/streams.mk # List C source files here. (C dependencies are automatically generated.) -CSRC = $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(STREAMSSRC) \ - $(CHIBIOS)/os/various/evtimer.c \ +CSRC = $(ALLCSRC) \ main.c # List C++ sources file here. -CPPSRC = +CPPSRC = $(ALLCPPSRC) -INCDIR = $(CHIBIOS)/os/license $(PORTINC) $(KERNINC) \ - $(HALINC) $(OSALINC) $(PLATFORMINC) \ - $(BOARDINC) $(STREAMSINC) $(CHIBIOS)/os/various +# Header files here. +INCDIR = $(ALLINC) # # Project, sources and paths. -- cgit v1.2.3