Merge branch 'master' into feature/travis-test

This commit is contained in:
sheinz 2016-11-12 01:36:37 +02:00
commit f7bba2b386
91 changed files with 1491 additions and 239 deletions

View file

@ -138,7 +138,7 @@ $(1)_AR_IN_FILES = $$($(1)_OBJ_FILES)
# the component is shown to depend on both obj and source files so we get
# a meaningful error message for missing explicitly named source files
ifeq ($(INCLUDE_SRC_INTO_AR),1)
ifeq ($(INCLUDE_SRC_IN_AR),1)
$(1)_SRC_IN_AR_FILES = $$($(1)_SRC_FILES)
endif