equal
deleted
inserted
replaced
120 ifneq ($$($1_EXTRA_SRC), ) |
120 ifneq ($$($1_EXTRA_SRC), ) |
121 $1_SRC += $$(foreach dir, $$($1_EXTRA_SRC), $$(call ProcessDir, $$(dir))) |
121 $1_SRC += $$(foreach dir, $$($1_EXTRA_SRC), $$(call ProcessDir, $$(dir))) |
122 endif |
122 endif |
123 |
123 |
124 ifneq ($$($1_EXCLUDE_SRC_PATTERNS), ) |
124 ifneq ($$($1_EXCLUDE_SRC_PATTERNS), ) |
125 $1_EXCLUDE_SRC := $$(call containing, $$($1_EXCLUDE_SRC_PATTERNS), $$($1_SRC)) |
125 $1_SRC_WITHOUT_WORKSPACE_ROOT := $$(patsubst $$(WORKSPACE_ROOT)/%, %, $$($1_SRC)) |
|
126 $1_EXCLUDE_SRC := $$(addprefix %, $$(call containing, $$($1_EXCLUDE_SRC_PATTERNS), \ |
|
127 $$($1_SRC_WITHOUT_WORKSPACE_ROOT))) |
126 $1_SRC := $$(filter-out $$($1_EXCLUDE_SRC), $$($1_SRC)) |
128 $1_SRC := $$(filter-out $$($1_EXCLUDE_SRC), $$($1_SRC)) |
127 endif |
129 endif |
128 |
130 |
129 ifeq ($$($1_VERSIONINFO_RESOURCE), ) |
131 ifeq ($$($1_VERSIONINFO_RESOURCE), ) |
130 $1_VERSIONINFO_RESOURCE := $$(GLOBAL_VERSION_INFO_RESOURCE) |
132 $1_VERSIONINFO_RESOURCE := $$(GLOBAL_VERSION_INFO_RESOURCE) |