Mercurial > hg > openjdk > lambda

changeset 949:e27dda53d4f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author erikj
date Mon, 21 Oct 2013 10:40:16 +0200
parents 17d195bd56fc (diff) 65c1752b4c38 (current diff)
children 1a853fac18ff
files
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/common/makefiles/JavaCompilation.gmk	Fri Oct 18 15:03:08 2013 -0700
+++ b/common/makefiles/JavaCompilation.gmk	Mon Oct 21 10:40:16 2013 +0200
@@ -266,8 +266,12 @@
   endif
 
   # Find all files in the source tree.
-  $1_ALL_SRCS := $$(call not-containing,_the., \
-      $$(filter $$(addprefix %,$$($1_SUFFIXES)),$$(call CacheFind,$$($1_FIND_LIST))))
+  $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
+
+  # Filter on suffixes if set
+  ifneq ($$($1_SUFFIXES),)
+    $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
+  endif
 
   ifneq ($$($1_INCLUDES),)
     ifneq ($$($1_SUFFIXES),)