equal
deleted
inserted
replaced
105 MULTIPLE_MAKEFILES := true)) |
105 MULTIPLE_MAKEFILES := true)) |
106 |
106 |
107 JDK_GENSRC_TARGETS := $(filter %-gensrc-jdk, $(GENSRC_TARGETS)) |
107 JDK_GENSRC_TARGETS := $(filter %-gensrc-jdk, $(GENSRC_TARGETS)) |
108 LANGTOOLS_GENSRC_TARGETS := $(filter %-gensrc-langtools, $(GENSRC_TARGETS)) |
108 LANGTOOLS_GENSRC_TARGETS := $(filter %-gensrc-langtools, $(GENSRC_TARGETS)) |
109 CORBA_GENSRC_TARGETS := $(filter %-gensrc-corba, $(GENSRC_TARGETS)) |
109 CORBA_GENSRC_TARGETS := $(filter %-gensrc-corba, $(GENSRC_TARGETS)) |
|
110 HOTSPOT_GENSRC_TARGETS := $(filter %-gensrc-hotspot, $(GENSRC_TARGETS)) |
110 |
111 |
111 ALL_TARGETS += $(GENSRC_TARGETS) |
112 ALL_TARGETS += $(GENSRC_TARGETS) |
112 |
113 |
113 ################################################################################ |
114 ################################################################################ |
114 # Generate data targets |
115 # Generate data targets |
126 $(eval $(call DeclareRecipesForPhase, COPY, \ |
127 $(eval $(call DeclareRecipesForPhase, COPY, \ |
127 TARGET_SUFFIX := copy, \ |
128 TARGET_SUFFIX := copy, \ |
128 FILE_PREFIX := Copy, \ |
129 FILE_PREFIX := Copy, \ |
129 MAKE_SUBDIR := copy, \ |
130 MAKE_SUBDIR := copy, \ |
130 CHECK_MODULES := $(ALL_MODULES), \ |
131 CHECK_MODULES := $(ALL_MODULES), \ |
131 USE_WRAPPER := true)) |
132 USE_WRAPPER := true, \ |
|
133 MULTIPLE_MAKEFILES := true)) |
132 |
134 |
133 ALL_TARGETS += $(COPY_TARGETS) |
135 ALL_TARGETS += $(COPY_TARGETS) |
134 |
136 |
135 ################################################################################ |
137 ################################################################################ |
136 # Targets for compiling all java modules. Nashorn is treated separately. |
138 # Targets for compiling all java modules. Nashorn is treated separately. |
350 |
352 |
351 buildtools-jdk: interim-langtools interim-cldrconverter |
353 buildtools-jdk: interim-langtools interim-cldrconverter |
352 |
354 |
353 $(CORBA_GENSRC_TARGETS): interim-langtools |
355 $(CORBA_GENSRC_TARGETS): interim-langtools |
354 |
356 |
|
357 $(HOTSPOT_GENSRC_TARGETS): interim-langtools |
|
358 |
355 $(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk |
359 $(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk |
356 |
360 |
357 $(GENDATA_TARGETS): interim-langtools buildtools-jdk |
361 $(GENDATA_TARGETS): interim-langtools buildtools-jdk |
358 |
362 |
359 interim-rmic: interim-langtools |
363 interim-rmic: interim-langtools |
412 # in javadoc. |
416 # in javadoc. |
413 java.desktop-gensrc-jdk: java.base-gensrc |
417 java.desktop-gensrc-jdk: java.base-gensrc |
414 |
418 |
415 # Explicitly add dependencies for special targets |
419 # Explicitly add dependencies for special targets |
416 java.base-java: unpack-sec |
420 java.base-java: unpack-sec |
|
421 |
|
422 # The copy target copies files generated by gensrc |
|
423 java.base-copy-hotspot: java.base-gensrc-hotspot |
417 |
424 |
418 jdk.jdeps-gendata: java rmic |
425 jdk.jdeps-gendata: java rmic |
419 |
426 |
420 zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \ |
427 zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \ |
421 $(filter jdk.crypto%, $(JAVA_TARGETS)) |
428 $(filter jdk.crypto%, $(JAVA_TARGETS)) |