184 $(foreach m, $(IMPORT_COPY_MODULES), $(eval $(call DeclareImportCopyRecipe,$m))) |
184 $(foreach m, $(IMPORT_COPY_MODULES), $(eval $(call DeclareImportCopyRecipe,$m))) |
185 |
185 |
186 ALL_TARGETS += $(ALL_COPY_TARGETS) |
186 ALL_TARGETS += $(ALL_COPY_TARGETS) |
187 |
187 |
188 ################################################################################ |
188 ################################################################################ |
189 # Targets for compiling all java modules. Nashorn is treated separately. |
189 # Targets for compiling all java modules. |
190 JAVA_MODULES := $(ALL_MODULES) |
190 JAVA_MODULES := $(ALL_MODULES) |
191 JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES)) |
191 JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES)) |
192 |
192 |
193 define DeclareCompileJavaRecipe |
193 define DeclareCompileJavaRecipe |
194 $1-java: |
194 $1-java: |
195 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \ |
195 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \ |
196 -f CompileJavaModules.gmk MODULE=$1) |
196 -f CompileJavaModules.gmk MODULE=$1) |
197 endef |
197 endef |
198 |
198 |
199 $(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \ |
199 $(foreach m, $(JAVA_MODULES), $(eval $(call DeclareCompileJavaRecipe,$m))) |
200 $(eval $(call DeclareCompileJavaRecipe,$m))) |
|
201 |
|
202 # Build nashorn. Needs to be compiled separately from the rest of the modules |
|
203 # due to nasgen. |
|
204 jdk.scripting.nashorn-java: |
|
205 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \ |
|
206 -f BuildNashorn.gmk compile) |
|
207 |
200 |
208 ALL_TARGETS += $(JAVA_TARGETS) |
201 ALL_TARGETS += $(JAVA_TARGETS) |
209 |
202 |
210 ################################################################################ |
203 ################################################################################ |
211 # Targets for running rmic. |
204 # Targets for running rmic. |