diff options
| author | Doug Schaefer | 2016-06-17 14:59:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-06-18 03:34:50 +0000 |
| commit | 01845929c4e4cb890e16ecedd473fc7de66e14f8 (patch) | |
| tree | f0b087d247fff3dc1f11f8a360cd2b4bec0e22a3 | |
| parent | 0937af705b4457d1dd84cfd096cb0b7476e45489 (diff) | |
| download | org.eclipse.cdt-01845929c4e4cb890e16ecedd473fc7de66e14f8.tar.gz org.eclipse.cdt-01845929c4e4cb890e16ecedd473fc7de66e14f8.tar.xz org.eclipse.cdt-01845929c4e4cb890e16ecedd473fc7de66e14f8.zip | |
[Arduino] Fix Makefile template to use new libraries layout.
We removed the version from the file path and forgot to update the
Makefile template to take that into account.
Change-Id: I7ab74723554561f86674ef22e38fff6153526912
| -rw-r--r-- | toolchains/arduino/org.eclipse.cdt.arduino.core/templates/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/templates/Makefile b/toolchains/arduino/org.eclipse.cdt.arduino.core/templates/Makefile index 2c6c698af1d..8efa79cf7bd 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core/templates/Makefile +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/templates/Makefile @@ -49,21 +49,21 @@ PLATFORM_VARIANT_OBJS = \ LIBRARIES_OBJS = \ <#list libraries_srcs as file> -<#assign cpp = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.cpp")> +<#assign cpp = file?matches("${libraries_path}/(.*?)/(.*)\\.cpp")> <#if !cpp> <#assign cpp = file?matches("${platform_core_path}/libraries/(.*?)/(.*)\\.cpp")> </#if> <#if cpp> ${build_path}/libraries/${cpp?groups[1]}/${cpp?groups[2]}.cpp.o \ </#if> -<#assign c = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.c")> +<#assign c = file?matches("${libraries_path}/(.*?)/(.*)\\.c")> <#if !c> <#assign c = file?matches("${platform_core_path}/libraries/(.*?)/(.*)\\.c")> </#if> <#if c> ${build_path}/libraries/${c?groups[1]}/${c?groups[2]}.c.o \ </#if> -<#assign S = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.S")> +<#assign S = file?matches("${libraries_path}/(.*?)/(.*)\\.S")> <#if !S> <#assign S = file?matches("${platform_core_path}/libraries/(.*?)/(.*)\\.S")> </#if> @@ -196,7 +196,7 @@ ${build_path}/variant/${S?groups[1]}.S.o: ${file} </#list> <#list libraries_srcs as file> -<#assign cpp = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.cpp")> +<#assign cpp = file?matches("${libraries_path}/(.*?)/(.*)\\.cpp")> <#if !cpp> <#assign cpp = file?matches("${platform_core_path}/libraries/(.*?)/(.*)\\.cpp")> </#if> @@ -210,7 +210,7 @@ ${build_path}/libraries/${cpp?groups[1]}/${cpp?groups[2]}.cpp.d: ; -include ${build_path}/libraries/${cpp?groups[1]}/${cpp?groups[2]}.cpp.d </#if> -<#assign c = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.c")> +<#assign c = file?matches("${libraries_path}/(.*?)/(.*)\\.c")> <#if !c> <#assign c = file?matches("${platform_core_path}/libraries/(.*?)/(.*)\\.c")> </#if> @@ -224,7 +224,7 @@ ${build_path}/libraries/${c?groups[1]}/${c?groups[2]}.c.d: ; -include ${build_path}/libraries/${c?groups[1]}/${c?groups[2]}.c.d </#if> -<#assign S = file?matches("${libraries_path}/(.*?)/.*?/(.*)\\.S")> +<#assign S = file?matches("${libraries_path}/(.*?)/(.*)\\.S")> <#if !S> <#assign S = file?matches("${platform_core_path}/libraries/(.*?)/(.*)\\.S")> </#if> |