make/common/JavaCompilation.gmk
changeset 28601 de178dea78cd
parent 28600 09dd1740f176
child 28606 e4a5774f2ddd
child 28905 cbee1de9e3e7
equal deleted inserted replaced
28600:09dd1740f176 28601:de178dea78cd
   485   ifneq (,$$($1_COPY)$$($1_COPY_FILES))
   485   ifneq (,$$($1_COPY)$$($1_COPY_FILES))
   486     # Search for all files to be copied.
   486     # Search for all files to be copied.
   487     $1_ALL_COPIES += $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
   487     $1_ALL_COPIES += $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
   488     # Copy these explicitly
   488     # Copy these explicitly
   489     $1_ALL_COPIES += $$($1_COPY_FILES)
   489     $1_ALL_COPIES += $$($1_COPY_FILES)
   490     # Copy must also respect filters.
   490   endif
   491     ifneq (,$$($1_INCLUDES))
   491   # Copy must also respect filters.
   492       $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
   492   ifneq (,$$($1_INCLUDES))
   493     endif
   493     $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
   494     ifneq (,$$($1_EXCLUDES))
   494   endif
   495       $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
   495   ifneq (,$$($1_EXCLUDES))
   496     endif
   496     $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
   497     ifneq (,$$($1_EXCLUDE_FILES))
   497   endif
   498       $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
   498   ifneq (,$$($1_EXCLUDE_FILES))
   499     endif
   499     $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
   500   endif
   500   endif
   501     ifneq (,$$($1_ALL_COPIES))
   501   ifneq (,$$($1_ALL_COPIES))
   502       # Yep, there are files to be copied!
   502     # Yep, there are files to be copied!
   503       $1_ALL_COPY_TARGETS:=
   503     $1_ALL_COPY_TARGETS:=
   504           $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
   504         $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
   505       # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
   505     # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
   506     endif
   506   endif
   507 
   507 
   508   # Find all property files to be copied and cleaned from source to bin.
   508   # Find all property files to be copied and cleaned from source to bin.
   509   ifneq (,$$($1_CLEAN)$$($1_CLEAN_FILES))
   509   ifneq (,$$($1_CLEAN)$$($1_CLEAN_FILES))
   510     # Search for all files to be copied.
   510     # Search for all files to be copied.
   511     $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
   511     $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))