equal
deleted
inserted
replaced
232 |
232 |
233 nashorn-jar: |
233 nashorn-jar: |
234 +($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk all) |
234 +($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk all) |
235 |
235 |
236 # Creates the jar files (rt.jar resources.jar etc) |
236 # Creates the jar files (rt.jar resources.jar etc) |
237 # this depends on all modules built |
237 main-jars: |
238 main-jars: exploded-image |
|
239 +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJars.gmk) |
238 +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJars.gmk) |
240 |
239 |
241 # Creates the images (j2sdk-image j2re-image etc) |
240 # Creates the images (j2sdk-image j2re-image etc) |
242 images: |
241 images: |
243 +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk) |
242 +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk) |
353 |
352 |
354 $(LIB_TARGETS): import-hotspot |
353 $(LIB_TARGETS): import-hotspot |
355 |
354 |
356 $(LAUNCHER_TARGETS): java.base-libs |
355 $(LAUNCHER_TARGETS): java.base-libs |
357 |
356 |
|
357 # The demos are currently linking to libjvm and libjava, just like all other |
|
358 # jdk libs, even though they don't need to. To avoid warnings, make sure they |
|
359 # aren't built until after libjava and libjvm are available to link to. |
358 demos: $(JAVA_TARGETS) |
360 demos: $(JAVA_TARGETS) |
359 |
361 |
360 # Declare dependency from <module>-java to <module>-gensrc |
362 # Declare dependency from <module>-java to <module>-gensrc |
361 $(foreach m, $(GENSRC_MODULES), $(eval $m-java: $m-gensrc)) |
363 $(foreach m, $(GENSRC_MODULES), $(eval $m-java: $m-gensrc)) |
362 |
364 |
379 # links against libosxapp. |
381 # links against libosxapp. |
380 jdk.deploy.osx-libs: java.desktop-libs |
382 jdk.deploy.osx-libs: java.desktop-libs |
381 |
383 |
382 # This dependency needs to be explicitly declared. jdk.jdi-gensrc generates a |
384 # This dependency needs to be explicitly declared. jdk.jdi-gensrc generates a |
383 # header file used by jdk.jdwp libs. |
385 # header file used by jdk.jdwp libs. |
384 jdk.jdwp-libs: jdk.jdi-gensrc |
386 jdk.jdwp.agent-libs: jdk.jdi-gensrc |
385 |
387 |
386 # Explicitly add dependencies for special targets |
388 # Explicitly add dependencies for special targets |
387 java.base-java: unpack-sec |
389 java.base-java: unpack-sec |
388 |
390 |
389 security-jars: java |
391 security-jars: java |
390 |
392 |
391 nashorn-jar: jdk.scripting.nashorn-java |
393 nashorn-jar: jdk.scripting.nashorn-java |
392 |
394 |
393 main-jars: java rmic security-jars nashorn-jar policy-jars import-hotspot |
395 main-jars: java rmic security-jars nashorn-jar policy-jars import-hotspot gendata |
394 |
396 |
395 # On windows, the jars target needs to wait for jgss libs to be built. |
397 # On windows, the jars target needs to wait for jgss libs to be built. |
396 # Should ideally split out the sec-bin zip file generation to avoid |
398 # Should ideally split out the sec-bin zip file generation to avoid |
397 # this dependency. |
399 # this dependency. |
398 ifeq ($(OPENJDK_TARGET_OS), windows) |
400 ifeq ($(OPENJDK_TARGET_OS), windows) |